diff options
| -rw-r--r-- | Makefile | 15 | ||||
| -rw-r--r-- | Makefile.mingw32 | 4 | ||||
| -rw-r--r-- | src/lua-interface.cpp | 4 |
3 files changed, 17 insertions, 6 deletions
@@ -23,6 +23,10 @@ ifeq ($(MACHINE),x86_64) ifeq ($(DISTRIB),Debian) #LDFLAGS_READLINE=/usr/lib32/libreadline.a /usr/lib32/libncurses.a endif +ifeq ($(DISTRIB),Debian) +HAVES = -DHAVE_UCL +BASIC_LDFLAGS = /usr/lib/libucl.a +endif endif SHARED_FLAGS=-shared SHARED_EXT=so @@ -47,13 +51,13 @@ INCLUDES = \ -I /usr/include/oracle/11.1.0.1/client/ \ -I ../PSX-Bundle/includes -HAVES = -DHAVE_VSSCANF -DHAVE_LIBJPEG -DHAVE_FCNTL -DHAVE_MYSQL -DHAVE_UNISTD_H -DHAVE_FORK -DHAVE_PIPE -DHAVE_FSYNC -DHAVE_MALLOC_H -DHAVE_ASPRINTF -DHAVE_BYTESWAP_H +HAVES += -DHAVE_VSSCANF -DHAVE_LIBJPEG -DHAVE_FCNTL -DHAVE_MYSQL -DHAVE_UNISTD_H -DHAVE_FORK -DHAVE_PIPE -DHAVE_FSYNC -DHAVE_MALLOC_H -DHAVE_ASPRINTF -DHAVE_BYTESWAP_H LIBS += -lz -ldl -lpthread CPPFLAGS += $(INCLUDES) -g -DSTDC_HEADERS $(CPPFLAGS_READLINE) -DHOOK_STDS -fexceptions -DWORDS_LITTLEENDIAN -fexceptions $(ARCH_FLAGS) $(HAVES) -DUSE_MPQLIB -BASIC_LDFLAGS = $(ARCH_FLAGS) $(LIBS) +BASIC_LDFLAGS += $(ARCH_FLAGS) $(LIBS) LDFLAGS += $(BASIC_LDFLAGS) $(LDFLAGS_READLINE) -L/usr/lib/oracle/11.1.0.1/client/lib @@ -223,6 +227,11 @@ ALL_DEPS = $(addsuffix .dep, $(notdir $(basename $(WHOLE_SOURCES) $(DEBUG_SOURCE all: dep luac lua-interface +dist: luac lua-interface lua-interface-gl.$(SHARED_EXT) + mkdir -p ../lua-interface-dist + ln -sf lua-interface-mesa.$(SHARED_EXT) lua-interface.$(SHARED_EXT) + cp luac lua-interface lua-interface*.$(SHARED_EXT) ../lua-interface-dist + dep: $(ALL_DEPS) luac: $(LUAC_OBJECTS) @@ -269,3 +278,5 @@ gl-glue.s: src/generate-gl-glue.sh > gl-glue.s -include $(ALL_DEPS) + +.PHONY: dist diff --git a/Makefile.mingw32 b/Makefile.mingw32 index 0174c3b..7c7d219 100644 --- a/Makefile.mingw32 +++ b/Makefile.mingw32 @@ -28,12 +28,12 @@ INCLUDES = \ -I../pthreads-w32-2-8-0-release/ \ -I../gnuwin32/include -HAVES = -DHAVE_VSSCANF -DHAVE_LIBJPEG -DHAVE_MALLOC_H -DHAVE_BYTESWAP_H +HAVES = -DHAVE_VSSCANF -DHAVE_LIBJPEG -DHAVE_MALLOC_H -DHAVE_BYTESWAP_H -DHAVE_UCL CPPFLAGS += $(INCLUDES) -g -fexceptions -DLUATASK_OMIT_COMMAND -DSTDC_HEADERS -DLIBICONV_PLUG -DREADLINE_STATIC -fexceptions -DWORDS_LITTLEENDIAN -march=i686 $(HAVES) -DUSE_MPQLIB LDFLAGS += -L../gnuwin32/lib -g -fexceptions -Wl,--enable-auto-image-base -Wl,--export-dynamic --export-all-symbols -Wl,--enable-auto-import -fexceptions \ - ../libreadline-static.a -lz.dll -lwsock32 -lws2_32 ../pthreads-w32-2-8-0-release/libpthreadGC2.a --enable-stdcall-fixup + ../libreadline-static.a -lz.dll -lucl.dll -lwsock32 -lws2_32 ../pthreads-w32-2-8-0-release/libpthreadGC2.a --enable-stdcall-fixup vpath %.c ../Baltisot/lib:../Baltisot/src:../Baltisot/lib/zlib/src:../Baltisot/lib/lua/src:../Baltisot/lib/lua/src/LuaLib:src:../paperIdol/src:../mogltk/lib:../tinyxml:../lua-modules/src:../Baltisot/MSVC/iconv:../Baltisot/MSVC/regex vpath %.cc ../Baltisot/lib:../Baltisot/src:../Baltisot/lib/zlib/src:../Baltisot/lib/lua/src:../Baltisot/lib/lua/src/LuaLib:src:../paperIdol/src:../mogltk/lib:../tinyxml:../lua-modules/src:../Baltisot/MSVC/iconv:../Baltisot/MSVC/regex diff --git a/src/lua-interface.cpp b/src/lua-interface.cpp index 6a7a9fc..4b1e949 100644 --- a/src/lua-interface.cpp +++ b/src/lua-interface.cpp @@ -296,7 +296,7 @@ int sLua_baselua_interface::baselua_interface_proceed_statics(Lua * L, int n, in if (L->isstring(1)) { L->load(&Input(L->tostring(1))); } else { - Handle * t = (Handle *) LuaObject::getme(L, 1); + Handle * t = L->recast<Handle>(1); L->load(t); } } @@ -309,7 +309,7 @@ int sLua_baselua_interface::baselua_interface_proceed_statics(Lua * L, int n, in if (L->isstring(1)) { L->load(&Input(L->tostring(1)), false); } else { - Handle * t = (Handle *) LuaObject::getme(L, 1); + Handle * t = L->recast<Handle>(1); L->load(t, false); } } |