diff options
| -rw-r--r-- | tolua/config | 9 | ||||
| -rw-r--r-- | tolua/src/bin/GNUmakefile | 2 | ||||
| -rw-r--r-- | tolua/src/tests/Makefile | 24 |
3 files changed, 19 insertions, 16 deletions
diff --git a/tolua/config b/tolua/config index d69bfaf..4b7d7b8 100644 --- a/tolua/config +++ b/tolua/config @@ -21,9 +21,12 @@ RANLIB= ranlib AR= ar rcu # set lua path -LUA=/usr/local -LUAINC=$(LUA)/include -LUALIB=$(LUA)/lib +#LUA=/usr/local +LUA=../../../lua/src +#LUAINC=$(LUA)/include +LUAINC=$(LUA) +#LUALIB=$(LUA)/lib +LUALIB=$(LUA) # == END OF USER SETTINGS. DO NOT CHANGE ANYTHING BELOW THIS LINE ============ diff --git a/tolua/src/bin/GNUmakefile b/tolua/src/bin/GNUmakefile index 93daf77..96d0143 100644 --- a/tolua/src/bin/GNUmakefile +++ b/tolua/src/bin/GNUmakefile @@ -20,7 +20,7 @@ $(T): $(OBJS) $(CC) -o $@ $(OBJS) $(LIB) -ltolua -llua -lm toluabind.c: $(T_D) - $(T_D) -o toluabind.c tolua.pkg + LD_LIBRARY_PATH=$(LUALIB) $(T_D) -o toluabind.c tolua.pkg $(T_D): $(OBJS_D) $(CC) -o $@ $(OBJS_D) $(LIB) -ltolua -llua -lm diff --git a/tolua/src/tests/Makefile b/tolua/src/tests/Makefile index b572365..ebd5721 100644 --- a/tolua/src/tests/Makefile +++ b/tolua/src/tests/Makefile @@ -17,63 +17,63 @@ test: all tarray: tarray.o tarraybind.o $(CC) $(CFLAGS) -o $@ tarray.o tarraybind.o $(TLIB) $(LIB) $(LIBS) tarraybind.c: tarray.pkg - $(TOLUA)/bin/$(TOLUAEXE) -o $@ $< + LD_LIBRARY_PATH=$(LUALIB) $(TOLUA)/bin/$(TOLUAEXE) -o $@ $< tvariable: tvariable.o tvariablebind.o $(CC) $(CFLAGS) -o $@ tvariable.o tvariablebind.o $(TLIB) $(LIB) $(LIBS) tvariablebind.c: tvariable.pkg - $(TOLUA)/bin/$(TOLUAEXE) -o $@ $< + LD_LIBRARY_PATH=$(LUALIB) $(TOLUA)/bin/$(TOLUAEXE) -o $@ $< tmodule: tmodule.o tmodulebind.o $(CC) $(CFLAGS) -o $@ tmodule.o tmodulebind.o $(TLIB) $(LIB) $(LIBS) tmodulebind.c: tmodule.pkg - $(TOLUA)/bin/$(TOLUAEXE) -o $@ $< + LD_LIBRARY_PATH=$(LUALIB) $(TOLUA)/bin/$(TOLUAEXE) -o $@ $< tnamespace: tnamespace.o tnamespacebind.o $(CCPP) $(CFLAGS) -o $@ tnamespace.o tnamespacebind.o $(TLIB) $(LIB) $(LIBS) tnamespacebind.cpp: tnamespace.pkg - $(TOLUA)/bin/$(TOLUAEXE) -o $@ $< + LD_LIBRARY_PATH=$(LUALIB) $(TOLUA)/bin/$(TOLUAEXE) -o $@ $< tdirective: tdirectivebind.o $(CC) $(CFLAGS) -o $@ tdirectivebind.o $(TLIB) $(LIB) $(LIBS) tdirectivebind.c: tdirective.pkg - $(TOLUA)/bin/$(TOLUAEXE) -o $@ $< + LD_LIBRARY_PATH=$(LUALIB) $(TOLUA)/bin/$(TOLUAEXE) -o $@ $< tfunction: tfunction.o tfunctionbind.o $(CCPP) $(CPPFLAGS) -o $@ tfunction.o tfunctionbind.o $(TLIB) $(LIB) $(LIBS) tfunctionbind.cpp: tfunction.pkg - $(TOLUA)/bin/$(TOLUAEXE) -o $@ $< + LD_LIBRARY_PATH=$(LUALIB) $(TOLUA)/bin/$(TOLUAEXE) -o $@ $< tconstant: tconstant.o tconstantbind.o $(CCPP) $(CPPFLAGS) -o $@ tconstant.o tconstantbind.o $(TLIB) $(LIB) $(LIBS) tconstantbind.cpp: tconstant.pkg - $(TOLUA)/bin/$(TOLUAEXE) -o $@ $< + LD_LIBRARY_PATH=$(LUALIB) $(TOLUA)/bin/$(TOLUAEXE) -o $@ $< tclass: tclass.o tclassbind.o $(CCPP) $(CPPFLAGS) -o $@ tclass.o tclassbind.o $(TLIB) $(LIB) $(LIBS) tclassbind.cpp: tclass.pkg - $(TOLUA)/bin/$(TOLUAEXE) -o $@ $< + LD_LIBRARY_PATH=$(LUALIB) $(TOLUA)/bin/$(TOLUAEXE) -o $@ $< tinheritance: tinheritance.o tinheritancebind.o $(CCPP) $(CPPFLAGS) -o $@ tinheritance.o tinheritancebind.o $(TLIB) $(LIB) $(LIBS) tinheritancebind.cpp: tinheritance.pkg - $(TOLUA)/bin/$(TOLUAEXE) -o $@ $< + LD_LIBRARY_PATH=$(LUALIB) $(TOLUA)/bin/$(TOLUAEXE) -o $@ $< tenum: tenum.o tenumbind.o $(CC) $(CPPFLAGS) -o $@ tenum.o tenumbind.o $(TLIB) $(LIB) $(LIBS) tenumbind.c: tenum.pkg - $(TOLUA)/bin/$(TOLUAEXE) -o $@ $< + LD_LIBRARY_PATH=$(LUALIB) $(TOLUA)/bin/$(TOLUAEXE) -o $@ $< tvararg: tvararg.o tvarargbind.o $(CCPP) $(CPPFLAGS) -o $@ tvararg.o tvarargbind.o $(TLIB) $(LIB) $(LIBS) tvarargbind.cpp: tvararg.pkg - $(TOLUA)/bin/$(TOLUAEXE) -o $@ $< + LD_LIBRARY_PATH=$(LUALIB) $(TOLUA)/bin/$(TOLUAEXE) -o $@ $< .cpp.o: $(CCPP) -c $(CPPFLAGS) -o $@ $< .pkg.cpp: - $(TOLUA)/bin/$(TOLUAEXE) -o $@ $< + LD_LIBRARY_PATH=$(LUALIB) $(TOLUA)/bin/$(TOLUAEXE) -o $@ $< clean: rm -f t*bind.* |