Menu
▾
▴
[Wxlua-commit] wxLua/apps Makefile.in,1.46,1.47
|
From: Francesco M. <fr...@us...> - 2006-12-19 21:12:31
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19847/apps Modified Files: Makefile.in Log Message: now BUILDDIR is set exactly like the wxWidgets builddir system LUA is now used if available on Unix or on Windows with USE_SYSTEM_LUA=1 changed the way the lua headers are included (removed the 'lua/include' prefix) to make it possible to use external lua Now when using built-in LUA the generated library is named lua5.1 and it overwrites any eventually preexisting lua library (when installed). Fixed the "samples" directory copy when srcdir==. Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** Makefile.in 12 Dec 2006 14:53:47 -0000 1.46 --- Makefile.in 19 Dec 2006 21:11:57 -0000 1.47 *************** *** 38,41 **** --- 38,42 ---- WX_VERSION_MINOR = @WX_VERSION_MINOR@ WX_GTKPORT_VERSION = @WX_GTKPORT_VERSION@ + LUA_DIR = @LUA_DIR@ LUA_PLATFORM_SPECIFIC_CFLAGS = @LUA_PLATFORM_SPECIFIC_CFLAGS@ LUA_PLATFORM_SPECIFIC_LDFLAGS = @LUA_PLATFORM_SPECIFIC_LDFLAGS@ *************** *** 45,54 **** DESTDIR = APP_VERBATIMLUA_CFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(top_srcdir)/modules/lua/include $(WX_CFLAGS) \ $(LUA_PLATFORM_SPECIFIC_CFLAGS) $(CPPFLAGS) $(CFLAGS) APP_VERBATIMLUA_OBJECTS = \ app_verbatimlua_lua.o ! APP_WXLUA_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) $(WX_CXXFLAGS) \ ! $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ app_wxlua_wxlua.o \ --- 46,55 ---- DESTDIR = APP_VERBATIMLUA_CFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(LUA_DIR)/include -I$(top_srcdir)/modules/lua/include $(WX_CFLAGS) \ $(LUA_PLATFORM_SPECIFIC_CFLAGS) $(CPPFLAGS) $(CFLAGS) APP_VERBATIMLUA_OBJECTS = \ app_verbatimlua_lua.o ! APP_WXLUA_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(LUA_DIR)/include $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ app_wxlua_wxlua.o \ *************** *** 56,60 **** $(__app_wxlua___win32rc) APP_WXLUAEDIT_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ app_wxluaedit_wxledit.o \ --- 57,61 ---- $(__app_wxlua___win32rc) APP_WXLUAEDIT_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(LUA_DIR)/include $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ app_wxluaedit_wxledit.o \ *************** *** 62,66 **** $(__app_wxluaedit___win32rc) APP_WXLUACAN_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(top_srcdir)/modules/wxbind/setup $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ app_wxluacan_wxluacan.o \ --- 63,68 ---- $(__app_wxluaedit___win32rc) APP_WXLUACAN_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(LUA_DIR)/include -I$(top_srcdir)/modules/wxbind/setup $(WX_CXXFLAGS) \ ! $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ app_wxluacan_wxluacan.o \ *************** *** 71,75 **** $(__app_wxluacan___win32rc) APP_WXLUAFREEZE_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ app_wxluafreeze_wxluafreeze.o \ --- 73,77 ---- $(__app_wxluacan___win32rc) APP_WXLUAFREEZE_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(LUA_DIR)/include $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ app_wxluafreeze_wxluafreeze.o \ *************** *** 180,184 **** $(top_builddir)/bin/wxlua-lua$(EXEEXT): $(APP_VERBATIMLUA_OBJECTS) ! $(CC) -o $@ $(APP_VERBATIMLUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) -lm -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(__app_verbatimlua___mac_setfilecmd) --- 182,186 ---- $(top_builddir)/bin/wxlua-lua$(EXEEXT): $(APP_VERBATIMLUA_OBJECTS) ! $(CC) -o $@ $(APP_VERBATIMLUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) -lm -llua5.1 $(__app_verbatimlua___mac_setfilecmd) *************** *** 192,196 **** @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@$(top_builddir)/bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc) ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(__app_wxlua___mac_setfilecmd) --- 194,198 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@$(top_builddir)/bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc) ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(__app_wxlua___mac_setfilecmd) *************** *** 205,209 **** @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@$(top_builddir)/bin/wxluaedit$(EXEEXT): $(APP_WXLUAEDIT_OBJECTS) $(__app_wxluaedit___win32rc) ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwx_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_stedit-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_setfilecmd) --- 207,211 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@$(top_builddir)/bin/wxluaedit$(EXEEXT): $(APP_WXLUAEDIT_OBJECTS) $(__app_wxluaedit___win32rc) ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 -lwx_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_stedit-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_setfilecmd) *************** *** 218,222 **** @COND_USE_WXLUACANAPP_1@$(top_builddir)/bin/wxluacan$(EXEEXT): $(APP_WXLUACAN_OBJECTS) $(__app_wxluacan___win32rc) ! @COND_USE_WXLUACANAPP_1@ $(CXX) -o $@ $(APP_WXLUACAN_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_USE_WXLUACANAPP_1@ @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_setfilecmd) --- 220,224 ---- @COND_USE_WXLUACANAPP_1@$(top_builddir)/bin/wxluacan$(EXEEXT): $(APP_WXLUACAN_OBJECTS) $(__app_wxluacan___win32rc) ! @COND_USE_WXLUACANAPP_1@ $(CXX) -o $@ $(APP_WXLUACAN_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_USE_WXLUACANAPP_1@ @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_setfilecmd) *************** *** 231,235 **** @COND_USE_WXLUAFREEZEAPP_1@$(top_builddir)/bin/wxluafreeze$(EXEEXT): $(APP_WXLUAFREEZE_OBJECTS) $(__app_wxluafreeze___win32rc) ! @COND_USE_WXLUAFREEZEAPP_1@ $(CXX) -o $@ $(APP_WXLUAFREEZE_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_USE_WXLUAFREEZEAPP_1@ @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_setfilecmd) --- 233,237 ---- @COND_USE_WXLUAFREEZEAPP_1@$(top_builddir)/bin/wxluafreeze$(EXEEXT): $(APP_WXLUAFREEZE_OBJECTS) $(__app_wxluafreeze___win32rc) ! @COND_USE_WXLUAFREEZEAPP_1@ $(CXX) -o $@ $(APP_WXLUAFREEZE_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_USE_WXLUAFREEZEAPP_1@ @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_setfilecmd) *************** *** 253,257 **** app_wxlua_wxlua_rc.o: $(srcdir)/wxlua/src/wxlua.rc ! $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) app_wxluaedit_wxledit.o: $(srcdir)/wxluaedit/src/wxledit.cpp --- 255,259 ---- app_wxlua_wxlua_rc.o: $(srcdir)/wxlua/src/wxlua.rc ! $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) --include-dir $(LUA_DIR)/include app_wxluaedit_wxledit.o: $(srcdir)/wxluaedit/src/wxledit.cpp *************** *** 262,266 **** app_wxluaedit_wxluaedit_rc.o: $(srcdir)/wxluaedit/src/wxluaedit.rc ! $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) app_wxluacan_wxluacan.o: $(srcdir)/wxluacan/src/wxluacan.cpp --- 264,268 ---- app_wxluaedit_wxluaedit_rc.o: $(srcdir)/wxluaedit/src/wxluaedit.rc ! $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) --include-dir $(LUA_DIR)/include app_wxluacan_wxluacan.o: $(srcdir)/wxluacan/src/wxluacan.cpp *************** *** 280,284 **** app_wxluacan_cansim_rc.o: $(srcdir)/wxluacan/src/cansim.rc ! $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) --include-dir $(top_srcdir)/modules/wxbind/setup app_wxluafreeze_wxluafreeze.o: $(srcdir)/wxluafreeze/src/wxluafreeze.cpp --- 282,286 ---- app_wxluacan_cansim_rc.o: $(srcdir)/wxluacan/src/cansim.rc ! $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) --include-dir $(LUA_DIR)/include --include-dir $(top_srcdir)/modules/wxbind/setup app_wxluafreeze_wxluafreeze.o: $(srcdir)/wxluafreeze/src/wxluafreeze.cpp *************** *** 286,290 **** app_wxluafreeze_wxluafreeze_rc.o: $(srcdir)/wxluafreeze/src/wxluafreeze.rc ! $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) --- 288,292 ---- app_wxluafreeze_wxluafreeze_rc.o: $(srcdir)/wxluafreeze/src/wxluafreeze.rc ! $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) --include-dir $(LUA_DIR)/include |
