From: John L. <jr...@us...> - 2007-07-04 05:39:58
|
Update of /cvsroot/wxlua/wxLua/modules/luamodule/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv478/wxLua/modules/luamodule/src Modified Files: Makefile Log Message: Add wxAUI library and rebuild all build files Cleanup Makefiles using wx-config and include common bits to simplify them Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/luamodule/src/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile 23 May 2007 20:17:24 -0000 1.4 --- Makefile 4 Jul 2007 05:39:19 -0000 1.5 *************** *** 7,58 **** # Makefile for wxLua standalone sample using gmake - # --- wxLua parameters ------------------------------------------------------- - WXLUA_LIBVERSION_CURRENT = 2 - WXLUA_LIBVERSION_REVISION = 8 - WXLUA_LIBVERSION_AGE = 0 - - WXLUA_DIR = ../../.. - WXLUA_LIBDIR = $(WXPREFIX)/lib - WXLUA_WXLUASETUP_DIR = $(WXLUA_DIR)/modules/wxbind/setup - - LUA = $(WXLUA_DIR)/bin/lua - - # --- wxWidgets parameters from wx-config ------------------------------------ - WXCONFIG := wx-config - WXPREFIX = $(shell $(WXCONFIG) --prefix) - WXEXECDIR = $(shell $(WXCONFIG) --exec-prefix) - WXBASENAME = $(shell $(WXCONFIG) --basename) - WXVERSION = $(shell $(WXCONFIG) --version) - WXRELEASE = $(shell $(WXCONFIG) --release) - WXCXXFLAGS = $(shell $(WXCONFIG) --cxxflags) - WXLDLIBS = $(shell $(WXCONFIG) --libs) - WXCXX = $(shell $(WXCONFIG) --cxx) - WXLIB_DIR = $(WXEXECDIR)/lib # ---------------------------------------------------------------------------- ! CXXFLAGS = $(WXCXXFLAGS) -MMD -g -Wall -fPIC ! LDLIBS = $(WXLDLIBS) ! CXX = $(WXCXX) ! ! PROGRAM = wx.so ! ! LUA_LIBS = $(WXLUA_DIR)/lib/liblua.a ! WXLUA_LIB = $(WXBASENAME)_wxlua-$(WXRELEASE) ! WXLUADEBUG_LIB = $(WXBASENAME)_wxluadebug-$(WXRELEASE) ! WXLUASOCKET_LIB = $(WXBASENAME)_wxluasocket-$(WXRELEASE) ! WXLUABIND_LIB = $(WXBASENAME)_wxluabind-$(WXRELEASE) ! WXLUASTC_LIB = $(WXBASENAME)_wxluastc-$(WXRELEASE) ! WXSTC_LIB = $(WXBASENAME)_stc-$(WXRELEASE) ! WXXRC_LIB = $(WXBASENAME)_xrc-$(WXRELEASE) ! WXFL_LIB = $(WXBASENAME)_fl-$(WXRELEASE) ! ! APPEXTRADEFS = -I$(WXLUA_DIR) -I$(WXLUA_DIR)/modules -I$(WXLUA_DIR)/modules/lua/include -I$(WXPREFIX)/contrib/include -DLUACALL= ! # This will build a static wxLua app, staticly linked to .a libs ! #APPEXTRALIBS=-L$(WXLIB_DIR) $(WXLIB_DIR)/lib$(WXLUA_LIB).a $(WXLIB_DIR)/lib$(STC_LIB).a $(WXLIB_DIR)/lib$(WXXRC_LIB).a $(WXLIB_DIR)/lib$(WXFL_LIB).a $(LUA_LIBS) ! # This will build a shared wxLua app, dynamicly linked to .so libs ! # -l$(WXFL_LIB) ! APPEXTRALIBS=-L$(WXLIB_DIR) -L$(WXLUA_LIBDIR) -l$(WXSTC_LIB) -l$(WXXRC_LIB) -l$(WXLUABIND_LIB) -l$(WXLUASTC_LIB) -l$(WXLUA_LIB) -l$(WXLUADEBUG_LIB) -l$(WXLUASOCKET_LIB) #OBJECTS=luamodule.o --- 7,20 ---- # Makefile for wxLua standalone sample using gmake # ---------------------------------------------------------------------------- + # Set path to root of wxLua + WXLUA_DIR = ../../.. ! # ---------------------------------------------------------------------------- ! # Include wxLua settings using wx-config for wxWidgets parameters ! include $(WXLUA_DIR)/build/Makefile_wx-config.in ! # ---------------------------------------------------------------------------- #OBJECTS=luamodule.o *************** *** 71,117 **** $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $< ! all: lua wxLuaLib wxLuaDebugLib wxLuaSocketLib wxLuaBindings wxSTCBindings wx.so ! wx.so: luamodule.cpp $(OBJECTS) $(LUA_LIBS) wxLuaLib wxLuaDebugLib wxLuaSocketLib wxLuaBindings ! $(CXX) $(CXXFLAGS) $(APPEXTRADEFS) -g -O -shared -o wx.so -fpic \ $(LDLIBS) $(APPEXTRALIBS) \ luamodule.cpp - lua: - @(cd $(WXLUA_DIR)/modules/lua && make linux) - - wxwidgets_bindings: - @(cd $(WXLUA_DIR)/bindings/wxwidgets && make) - - wxstc_bindings: - @(cd $(WXLUA_DIR)/bindings/wxstc && make) - - wxLuaBindings: - @(cd $(WXLUA_DIR)/modules/wxbind/src && make) - - wxSTCBindings: - @(cd $(WXLUA_DIR)/modules/wxbindstc/src && make) - - wxLuaLib: - @(cd $(WXLUA_DIR)/modules/wxlua/src && make) - - wxLuaDebugLib: - @(cd $(WXLUA_DIR)/modules/wxluadebug/src && make) - - wxLuaSocketLib: - @(cd $(WXLUA_DIR)/modules/wxluasocket/src && make) - clean: rm -f $(OBJECTS) $(DEPFILES) $(PROGRAM) core ! cleanall: ! rm -f $(OBJECTS) $(DEPFILES) $(PROGRAM) core ! @(cd $(WXLUA_DIR)/modules/lua && make clean) ! @(cd $(WXLUA_DIR)/bindings/wxwidgets && make clean) ! @(cd $(WXLUA_DIR)/modules/wxbind/src && make clean) ! @(cd $(WXLUA_DIR)/modules/wxbindstc/src && make clean) ! @(cd $(WXLUA_DIR)/modules/wxlua/src && make clean) ! @(cd $(WXLUA_DIR)/modules/wxluadebug/src && make clean) ! @(cd $(WXLUA_DIR)/modules/wxluasocket/src && make clean) ! #-include $(DEPFILES) --- 33,50 ---- $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $< ! all: Lua wxLuaLib wxLuaDebugLib wxLuaSocketLib wxLuaBindLib wxSTCBindLib wxAUIBindLib wx.so ! wx.so: luamodule.cpp $(OBJECTS) $(LUA_LIBS) wxLuaLib wxLuaDebugLib wxLuaSocketLib wxLuaBindLib ! $(CXX) $(CXXFLAGS) $(APPEXTRADEFS) -g -O -shared -o wx.so -fPIC \ $(LDLIBS) $(APPEXTRALIBS) \ luamodule.cpp clean: rm -f $(OBJECTS) $(DEPFILES) $(PROGRAM) core ! # ---------------------------------------------------------------------------- ! # Include wxLua targets using wx-config for wxWidgets parameters ! include $(WXLUA_DIR)/build/Makefile_wx-config_targets.in ! ! -include $(DEPFILES) |