From 0c9e73e5303e759e8765019bff707809c4cec536 Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Sun, 8 Nov 2009 01:23:50 +0100 Subject: Adjusting for LuaJIT. --- Makefile | 14 +++++--------- Makefile.mingw32 | 14 +++++--------- 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index 0132d23..4279f36 100644 --- a/Makefile +++ b/Makefile @@ -18,8 +18,7 @@ CXX = g++ INCLUDES = \ -I../Baltisot/include \ --I../Baltisot/lib/zlib/include \ --I../Baltisot/lib/lua/include -I../Baltisot/lib/lua/includes \ +-I../LuaJIT/src \ -I /sw/include \ -I../PSX-Bundle/includes -I../PSX-Bundle/psxdev \ @@ -29,9 +28,9 @@ CPPFLAGS += $(INCLUDES) -O4 -fexceptions -DSTDC_HEADERS -DREADLINE_STATIC -DHOOK LDFLAGS += $(ARCH_FLAGS) $(SHARED_FLAGS) ./lua-interface.$(SHARED_EXT) -vpath %.c ../Baltisot/lib:../Baltisot/src:../Baltisot/lib/zlib/src:../Baltisot/lib/lua/src:../Baltisot/lib/lua/src/LuaLib:src:../PSX-Bundle/lib:../PSX-Bundle/psxdev -vpath %.cc ../Baltisot/lib:../Baltisot/src:../Baltisot/lib/zlib/src:../Baltisot/lib/lua/src:../Baltisot/lib/lua/src/LuaLib:src:../PSX-Bundle/lib:../PSX-Bundle/psxdev -vpath %.cpp ../Baltisot/lib:../Baltisot/src:../Baltisot/lib/zlib/src:../Baltisot/lib/lua/src:../Baltisot/lib/lua/src/LuaLib:src:../PSX-Bundle/lib:../PSX-Bundle/psxdev +vpath %.c ../Baltisot/lib:../Baltisot/src:src:../PSX-Bundle/lib:../PSX-Bundle/psxdev +vpath %.cc ../Baltisot/lib:../Baltisot/src:src:../PSX-Bundle/lib:../PSX-Bundle/psxdev +vpath %.cpp ../Baltisot/lib:../Baltisot/src:src:../PSX-Bundle/lib:../PSX-Bundle/psxdev vpath %.lua ../Baltisot/lib:../Baltisot/src LUACD_SOURCES = \ @@ -93,12 +92,9 @@ clean: %.dep : %.cc $(CXX) $(CPPFLAGS) -M -MF $@ $< -%.c : %.clua +%.c : %.lua bin2c $< $@ $(basename $@) -%.clua : %.lua - ./luac -o $@ $< - -include $(ALL_DEPS) .PHONY: clean dist diff --git a/Makefile.mingw32 b/Makefile.mingw32 index cfd7652..8540872 100644 --- a/Makefile.mingw32 +++ b/Makefile.mingw32 @@ -29,8 +29,7 @@ endif INCLUDES = \ -I ../Mesa-7.0.3-win32/include \ -I../Baltisot/include \ --I../Baltisot/lib/zlib/include \ --I../Baltisot/lib/lua/include -I../Baltisot/lib/lua/includes \ +-I../LuaJIT/src \ -I../PSX-Bundle/includes -I../PSX-Bundle/psxdev \ HAVES = -DHAVE_VSSCANF -DHAVE_FCNTL -DHAVE_UNISTD_H -DHAVE_FORK -DHAVE_PIPE -DHAVE_FSYNC -DHAVE_MALLOC_H -DHAVE_ASPRINTF -DHAVE_BYTESWAP_H @@ -39,9 +38,9 @@ CPPFLAGS += $(INCLUDES) -g -DSTDC_HEADERS -DREADLINE_STATIC -DHOOK_STDS -DWORDS_ LDFLAGS += -g -fexception -shared -Wl,--export-dynamic ../lua-interface/lua-interface.a -Wl,--enable-auto-image-base --export-all-symbols -Wl,--enable-auto-import -vpath %.c ../Baltisot/lib:../Baltisot/src:../Baltisot/lib/zlib/src:../Baltisot/lib/lua/src:../Baltisot/lib/lua/src/LuaLib:src:../PSX-Bundle/lib:../PSX-Bundle/psxdev -vpath %.cc ../Baltisot/lib:../Baltisot/src:../Baltisot/lib/zlib/src:../Baltisot/lib/lua/src:../Baltisot/lib/lua/src/LuaLib:src:../PSX-Bundle/lib:../PSX-Bundle/psxdev -vpath %.cpp ../Baltisot/lib:../Baltisot/src:../Baltisot/lib/zlib/src:../Baltisot/lib/lua/src:../Baltisot/lib/lua/src/LuaLib:src:../PSX-Bundle/lib:../PSX-Bundle/psxdev +vpath %.c ../Baltisot/lib:../Baltisot/src:src:../PSX-Bundle/lib:../PSX-Bundle/psxdev +vpath %.cc ../Baltisot/lib:../Baltisot/src:src:../PSX-Bundle/lib:../PSX-Bundle/psxdev +vpath %.cpp ../Baltisot/lib:../Baltisot/src:src:../PSX-Bundle/lib:../PSX-Bundle/psxdev vpath %.lua ../Baltisot/lib:../Baltisot/src LUACD_SOURCES = \ @@ -103,10 +102,7 @@ clean: %.dep : %.cc $(CXX) $(CPPFLAGS) -M -MF $@ $< -%.c : %.clua +%.c : %.lua bin2c $< $@ $(basename $@) -%.clua : %.lua - ./luac -o $@ $< - -include $(ALL_DEPS) -- cgit v1.2.3