diff options
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 14 |
1 files changed, 2 insertions, 12 deletions
@@ -1,13 +1,6 @@ | |||
1 | LUA_VERSION = 5.1 | 1 | LUA_VERSION = 5.1 |
2 | 2 | ||
3 | ## Available Lua CJSON specific workarounds | 3 | ## Available defines for CJSON_CFLAGS |
4 | # | ||
5 | # To ensure JSON encoding/decoding works correctly for locales using | ||
6 | # comma decimal separators, Lua CJSON must be compiled with one of | ||
7 | # these options: | ||
8 | # USE_POSIX_USELOCALE: Linux, OSX. Thread safe. Recommended option. | ||
9 | # USE_POSIX_SETLOCALE: Works on all ANSI C platforms. May be used when | ||
10 | # thread-safety isn't required. | ||
11 | # | 4 | # |
12 | # USE_INTERNAL_ISINF: Workaround for Solaris platforms missing isinf(). | 5 | # USE_INTERNAL_ISINF: Workaround for Solaris platforms missing isinf(). |
13 | 6 | ||
@@ -15,7 +8,6 @@ LUA_VERSION = 5.1 | |||
15 | PREFIX = /usr/local | 8 | PREFIX = /usr/local |
16 | #CFLAGS = -g -Wall -pedantic -fno-inline | 9 | #CFLAGS = -g -Wall -pedantic -fno-inline |
17 | CFLAGS = -O3 -Wall -pedantic | 10 | CFLAGS = -O3 -Wall -pedantic |
18 | CJSON_CFLAGS = -DUSE_POSIX_SETLOCALE | ||
19 | CJSON_LDFLAGS = -shared | 11 | CJSON_LDFLAGS = -shared |
20 | LUA_INCLUDE_DIR = $(PREFIX)/include | 12 | LUA_INCLUDE_DIR = $(PREFIX)/include |
21 | LUA_MODULE_DIR = $(PREFIX)/lib/lua/$(LUA_VERSION) | 13 | LUA_MODULE_DIR = $(PREFIX)/lib/lua/$(LUA_VERSION) |
@@ -29,18 +21,16 @@ INSTALL_CMD = install | |||
29 | # specific details. | 21 | # specific details. |
30 | 22 | ||
31 | ## Linux | 23 | ## Linux |
32 | #CJSON_CFLAGS = -DUSE_POSIX_USELOCALE | ||
33 | 24 | ||
34 | ## FreeBSD | 25 | ## FreeBSD |
35 | #LUA_INCLUDE_DIR = $(PREFIX)/include/lua51 | 26 | #LUA_INCLUDE_DIR = $(PREFIX)/include/lua51 |
36 | 27 | ||
37 | ## MacOSX (Macports) | 28 | ## MacOSX (Macports) |
38 | #PREFIX = /opt/local | 29 | #PREFIX = /opt/local |
39 | #CJSON_CFLAGS = -DUSE_POSIX_USELOCALE | ||
40 | #CJSON_LDFLAGS = -bundle -undefined dynamic_lookup | 30 | #CJSON_LDFLAGS = -bundle -undefined dynamic_lookup |
41 | 31 | ||
42 | ## Solaris | 32 | ## Solaris |
43 | #CJSON_CFLAGS = -DUSE_POSIX_SETLOCALE -DUSE_INTERNAL_ISINF | 33 | #CJSON_CFLAGS = -DUSE_INTERNAL_ISINF |
44 | 34 | ||
45 | ## End platform specific section | 35 | ## End platform specific section |
46 | 36 | ||