| |
| |
| @@ -72,6 +72,12 @@ |
| #endif |
| |
| |
| +#if defined(LUA_USE_MIDIPIX) |
| +#define LUA_USE_POSIX |
| +#define LUA_USE_DLOPEN /* needs an extra library: -ldl */ |
| +#endif |
| + |
| + |
| /* |
| @@ LUA_C89_NUMBERS ensures that Lua uses the largest types available for |
| ** C89 ('long' and 'double'); Windows always has '__int64', so it does |
| @@ -188,7 +194,7 @@ |
| |
| #else /* }{ */ |
| |
| -#define LUA_ROOT "/usr/local/" |
| +#define LUA_ROOT "/usr/" |
| #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/" |
| #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/" |
| #define LUA_PATH_DEFAULT \ |
| |
| |
| @@ -26,9 +26,10 @@ |
| |
| # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE |
| |
| -PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris |
| +PLATS= aix bsd c89 freebsd generic linux macosx midipix mingw posix solaris |
| |
| LUA_A= liblua.a |
| +LUA_SO= liblua.so |
| 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 |
| @@ -36,14 +37,14 @@ |
| lmathlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o loadlib.o linit.o |
| BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS) |
| |
| -LUA_T= lua |
| +LUA_T= lua$(V) |
| LUA_O= lua.o |
| |
| -LUAC_T= luac |
| +LUAC_T= luac$(V) |
| LUAC_O= luac.o |
| |
| ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) |
| -ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) |
| +ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO) |
| ALL_A= $(LUA_A) |
| |
| # Targets start here. |
| @@ -56,9 +57,14 @@ |
| a: $(ALL_A) |
| |
| $(LUA_A): $(BASE_O) |
| - $(AR) $@ $(BASE_O) |
| + $(AR) rcs $@ $(BASE_O) |
| $(RANLIB) $@ |
| |
| +$(LUA_SO): $(CORE_O) $(LIB_O) |
| + $(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS) |
| + ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V) |
| + ln -sf $(LUA_SO).$(R) $(LUA_SO) |
| + |
| $(LUA_T): $(LUA_O) $(LUA_A) |
| $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) |
| |
| @@ -112,6 +118,9 @@ |
| macosx: |
| $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX" SYSLIBS="-lreadline" CC=cc |
| |
| +midipix: |
| + $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MIDIPIX" SYSLIBS="-Wl,-E -ldl" |
| + |
| mingw: |
| $(MAKE) "LUA_A=lua53.dll" "LUA_T=lua.exe" \ |
| "AR=$(CC) -shared -o" "RANLIB=strip --strip-unneeded" \ |
| |
| |
| @@ -36,23 +36,25 @@ |
| # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE |
| |
| # Convenience platforms targets. |
| -PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris |
| +PLATS= aix bsd c89 freebsd generic linux macosx midipix mingw posix solaris |
| + |
| +# Lua version and release. |
| +V= 5.3 |
| +R= $V.3 |
| |
| # What to install. |
| -TO_BIN= lua luac |
| +TO_BIN= lua$(V) luac$(V) |
| +TO_BIN_LINKS= lua$(V):lua luac$(V):luac |
| TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp |
| TO_LIB= liblua.a |
| +TO_LIBSO= liblua.so liblua.so.$V |
| TO_MAN= lua.1 luac.1 |
| |
| -# Lua version and release. |
| -V= 5.3 |
| -R= $V.3 |
| - |
| # Targets start here. |
| all: $(PLAT) |
| |
| $(PLATS) clean: |
| - cd src && $(MAKE) $@ |
| + cd src && $(MAKE) $@ V=$(V) R=$(R) |
| |
| test: dummy |
| src/lua -v |
| @@ -60,8 +62,10 @@ |
| install: dummy |
| cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD) |
| cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN) |
| + cd src && for FNAME in $(TO_BIN_LINKS); do echo ln -fs $${FNAME%:*} $(INSTALL_BIN)/$${FNAME#*:}; ln -fs $${FNAME%:*} $(INSTALL_BIN)/$${FNAME#*:}; done |
| cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) |
| cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB) |
| + cd src && $(INSTALL_EXEC) $(TO_LIBSO) $(INSTALL_LIB) |
| cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN) |
| |
| uninstall: |