@@ -7,32 +7,35 @@ index b771196..227243a 100644
77 PLAT= guess
88
99- CC= gcc -std=gnu99
10- - CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_3 $(SYSCFLAGS) $(MYCFLAGS)
10+ - CFLAGS= -O2 -Wall -Wextra $(SYSCFLAGS) $(MYCFLAGS)
1111+ CC?= gcc -std=gnu99
12- + CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_3 $(SYSCFLAGS) $(MYCFLAGS) -fPIC
12+ + CFLAGS= -O2 -Wall -Wextra $(SYSCFLAGS) $(MYCFLAGS) -fPIC
1313 LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
1414 LIBS= -lm $(SYSLIBS) $(MYLIBS)
1515
16- @@ -28,11 +28,18 @@ MYOBJS=
17- # Special flags for compiler modules; -Os reduces code size.
18- CMCFLAGS=
16+ @@ -26,13 +26,20 @@
17+ MYOBJS=
1918
19+ # Special flags for compiler modules; -Os reduces code size.
20+ - CMCFLAGS=
21+ + CMCFLAGS=
22+ +
2023+ ifeq ($(DLEXT),dylib)
2124+ SOFLAGS := -dynamiclib
2225+ else
2326+ SOFLAGS := -shared
2427+ endif
25- +
28+
2629 # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE =======
2730
28- PLATS= guess aix bsd c89 freebsd generic ios linux linux-readline macosx mingw posix solaris
31+ PLATS= guess aix bsd c89 freebsd generic ios linux macosx mingw posix solaris
2932
3033 LUA_A= liblua.a
3134+ LUA_SO= liblua.$(DLEXT)
3235 CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o lundump.o lvm.o lzio.o
3336 LIB_O= lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o linit.o
3437 BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS)
35- @@ -44,7 +51,7 @@ LUAC_T= luac
38+ @@ -44,7 +51,7 @@
3639 LUAC_O= luac.o
3740
3841 ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
@@ -41,7 +44,7 @@ index b771196..227243a 100644
4144 ALL_A= $(LUA_A)
4245
4346 # Targets start here.
44- @@ -60,6 +67,9 @@ $(LUA_A): $(BASE_O)
47+ @@ -60,6 +67,9 @@
4548 $(AR) $@ $(BASE_O)
4649 $(RANLIB) $@
4750
@@ -51,12 +54,12 @@ index b771196..227243a 100644
5154 $(LUA_T): $(LUA_O) $(LUA_A)
5255 $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
5356
54- @@ -129 ,7 +139 ,7 @@ linux-readline:
55- $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX -DLUA_USE_READLINE " SYSLIBS="-Wl,-E -ldl -lreadline "
57+ @@ -124 ,7 +134 ,7 @@
58+ $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -ldl"
5659
5760 Darwin macos macosx:
5861- $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX -DLUA_USE_READLINE" SYSLIBS="-lreadline"
5962+ $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX -DLUA_USE_READLINE -fno-common" SYSLIBS="-lreadline"
6063
6164 mingw:
62- $(MAKE) "LUA_A=lua54 .dll" "LUA_T=lua.exe" \
65+ $(MAKE) "LUA_A=lua55 .dll" "LUA_T=lua.exe" \
0 commit comments