From e8b8c133fbd0d46cefebc248f7712a57268e8a96 Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Sun, 8 Nov 2009 01:20:10 +0100 Subject: Adjusting for LuaJIT. --- Makefile | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 38428d3..5fc92a9 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ INCLUDES = \ -I../mogltk/include \ -I../Baltisot/include \ -I../Baltisot/lib/zlib/include \ --I../Baltisot/lib/lua/include -I../Baltisot/lib/lua/includes \ +-I../LuaJIT/src \ -I ../tinyxml \ -I /sw/include/mysql \ -I /usr/include/mysql \ @@ -47,9 +47,9 @@ CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS) LDFLAGS += $(ARCH_FLAGS) $(SHARED_FLAGS) -L/usr/lib/oracle/11.1.0.1/client/lib -L/usr/X11/lib -L/sw/lib -L/usr/local/instantclient ./lua-interface.$(SHARED_EXT) -vpath %.c ../Baltisot/lib:../Baltisot/src:../Baltisot/lib/zlib/src:../Baltisot/lib/lua/src:../Baltisot/lib/lua/src/LuaLib:src:../mogltk/lib:../tinyxml -vpath %.cc ../Baltisot/lib:../Baltisot/src:../Baltisot/lib/zlib/src:../Baltisot/lib/lua/src:../Baltisot/lib/lua/src/LuaLib:src:../mogltk/lib:../tinyxml -vpath %.cpp ../Baltisot/lib:../Baltisot/src:../Baltisot/lib/zlib/src:../Baltisot/lib/lua/src:../Baltisot/lib/lua/src/LuaLib:src:../mogltk/lib:../tinyxml +vpath %.c ../Baltisot/lib:../Baltisot/src:src:../mogltk/lib:../tinyxml +vpath %.cc ../Baltisot/lib:../Baltisot/src:src:../mogltk/lib:../tinyxml +vpath %.cpp ../Baltisot/lib:../Baltisot/src:src:../mogltk/lib:../tinyxml vpath %.lua ../Baltisot/lib:../Baltisot/src CONFIGFILES_SOURCES = \ @@ -234,12 +234,9 @@ clean: %.dep : %.cc $(CXX) $(CPPFLAGS_NO_ARCH) -M -MF $@ $< -%.c : %.clua +%.c : %.lua bin2c $< $@ $(basename $@) -%.clua : %.lua - ./luac -o $@ $< - -include $(ALL_DEPS) .PHONY: dist clean -- cgit v1.2.3