aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMark Pulford <mark@kyne.com.au>2011-12-30 17:48:12 +1030
committerMark Pulford <mark@kyne.com.au>2011-12-30 17:48:12 +1030
commit85bf3b798f6d52c374c35f7fbe47df132891d3b2 (patch)
tree39b0da8e6d6536cdd90038547a985559102962de /Makefile
parent2416b145073211b840781da6abf4b6d97f4657a6 (diff)
downloadlua-cjson-85bf3b798f6d52c374c35f7fbe47df132891d3b2.tar.gz
lua-cjson-85bf3b798f6d52c374c35f7fbe47df132891d3b2.tar.bz2
lua-cjson-85bf3b798f6d52c374c35f7fbe47df132891d3b2.zip
Add support for Lua 5.2 and cjson.new
Update all Lua scripts to use new module init style everywhere: local json = require "cjson" Lua CJSON does not register a global table under Lua 5.2. The global table can be disabled under Lua 5.1 with DISABLE_CJSON_GLOBAL. Other changes: - Store CJSON configuration as an upvalue for each function. - Add "cjson.new" function to create another module table with a separate configuration. - Add _NAME and _VERSION variables.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index fb63d99..c9343f9 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,8 @@ LUA_VERSION = 5.1
2 2
3## Available defines for CJSON_CFLAGS 3## Available defines for CJSON_CFLAGS
4# 4#
5# USE_INTERNAL_ISINF: Workaround for Solaris platforms missing isinf(). 5# USE_INTERNAL_ISINF: Workaround for Solaris platforms missing isinf().
6# DISABLE_CJSON_GLOBAL: Do not store module is "cjson" global
6 7
7## Build defaults 8## Build defaults
8PREFIX = /usr/local 9PREFIX = /usr/local