Menu
▾
▴
[Wxlua-commit] wxLua/build Makefile_wx-config.in, 1.1, 1.2 Makefile_wx-config_targets.in, 1.1, 1.2
|
From: John L. <jr...@us...> - 2007-07-16 19:36:04
|
Update of /cvsroot/wxlua/wxLua/build In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15684/wxLua/build Modified Files: Makefile_wx-config.in Makefile_wx-config_targets.in Log Message: Separate wxWidgets bindings into wxadv, wxaui, wxbase, wxcore, etc... Allow bool = 1/0 and 1/0 = bool in wxlua_getboolean/integer/number Index: Makefile_wx-config.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/Makefile_wx-config.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile_wx-config.in 4 Jul 2007 05:39:14 -0000 1.1 --- Makefile_wx-config.in 16 Jul 2007 19:34:28 -0000 1.2 *************** *** 18,26 **** WXLUA_LIBVERSION_AGE = 0 ! # we just use the wxWidgets lib dir ! WXLUA_LIBDIR = $(WXLIB_DIR) WXLUA_WXLUASETUP_DIR = $(WXLUA_DIR)/modules/wxbind/setup LUA = $(WXLUA_DIR)/bin/lua --- 18,30 ---- WXLUA_LIBVERSION_AGE = 0 ! # We use the wxWidgets lib dir to put our libs into (it must be writeable) ! WXLUA_LIBDIR = $(WXLIB_DIR) ! WXLUA_TARGET_LIBDIR = $(WXLUA_LIBDIR) + # Path to the "wxluasetup.h" file that specifies what to include in the bindings WXLUA_WXLUASETUP_DIR = $(WXLUA_DIR)/modules/wxbind/setup + # ---------------------------------------------------------------------------- + # Path to the lua executable LUA = $(WXLUA_DIR)/bin/lua *************** *** 35,38 **** --- 39,46 ---- # --- wxWidgets parameters from wx-config ------------------------------------ + WXLIBS_NAMES = stc,gl,media,aui,xrc,qa,html,adv,core,xml,net,base + + @echo "Using these WXLIBS_NAMES = $(WXLIBS_NAMES)" + WXCONFIG := wx-config WXPREFIX = $(shell $(WXCONFIG) --prefix) *************** *** 42,54 **** WXRELEASE = $(shell $(WXCONFIG) --release) WXCXXFLAGS = $(shell $(WXCONFIG) --cxxflags) ! WXLDLIBS = $(shell $(WXCONFIG) --libs) WXCXX = $(shell $(WXCONFIG) --cxx) WXLIB_DIR = $(WXEXECDIR)/lib WXSTC_LIB = $(WXBASENAME)_stc-$(WXRELEASE) - WXXRC_LIB = $(WXBASENAME)_xrc-$(WXRELEASE) # ---------------------------------------------------------------------------- ! # The wxSTEditor library name compiled from wxCode/components/wxstedit WXSTEDIT_LIB = $(WXBASENAME)_stedit-$(WXRELEASE) --- 50,61 ---- WXRELEASE = $(shell $(WXCONFIG) --release) WXCXXFLAGS = $(shell $(WXCONFIG) --cxxflags) ! WXLDLIBS = $(shell $(WXCONFIG) --libs $(WXLIBS_NAMES)) WXCXX = $(shell $(WXCONFIG) --cxx) WXLIB_DIR = $(WXEXECDIR)/lib WXSTC_LIB = $(WXBASENAME)_stc-$(WXRELEASE) # ---------------------------------------------------------------------------- ! # The wxSTEditor library compiled from wxCode/components/wxstedit WXSTEDIT_LIB = $(WXBASENAME)_stedit-$(WXRELEASE) *************** *** 57,74 **** # ---------------------------------------------------------------------------- CXXFLAGS = $(WXCXXFLAGS) -MMD -g -Wall -fPIC LDLIBS = $(WXLDLIBS) CXX = $(WXCXX) GCC_PROFILE = #-pg APPEXTRADEFS = $(GCC_PROFILE) -I$(WXLUA_DIR) -I$(WXLUA_DIR)/modules -I$(WXLUA_DIR)/modules/lua/include -I$(WXLUA_WXLUASETUP_DIR) -I$(WXSTEDIT_DIR)/include -I$(WXPREFIX)/contrib/include -DLUACALL= # This will build a shared wxLua app, dynamicly linked to .so libs ! APPEXTRALIBS=$(GCC_PROFILE) -L$(WXLIB_DIR) -L$(WXLUA_LIBDIR) -l$(WXXRC_LIB) -l$(WXLUAAUI_LIB) -l$(WXLUABIND_LIB) -l$(WXLUA_LIB) -l$(WXLUADEBUG_LIB) -l$(WXLUASOCKET_LIB) $(LUA_LIBS) ! ! # This will build a shared wxLua app, dynamicly linked to .so libs # 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) --- 64,117 ---- # ---------------------------------------------------------------------------- + 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) + WXLUABINDADV_LIB = $(WXBASENAME)_wxluaadv-$(WXRELEASE) + WXLUABINDAUI_LIB = $(WXBASENAME)_wxluaaui-$(WXRELEASE) + WXLUABINDBASE_LIB = $(WXBASENAME)_wxluabase-$(WXRELEASE) + WXLUABINDCORE_LIB = $(WXBASENAME)_wxluacore-$(WXRELEASE) + WXLUABINDGL_LIB = $(WXBASENAME)_wxluagl-$(WXRELEASE) + WXLUABINDHTML_LIB = $(WXBASENAME)_wxluahtml-$(WXRELEASE) + WXLUABINDMEDIA_LIB = $(WXBASENAME)_wxluamedia-$(WXRELEASE) + WXLUABINDNET_LIB = $(WXBASENAME)_wxluanet-$(WXRELEASE) + WXLUABINDRICHTEXT_LIB = $(WXBASENAME)_wxluarichtext-$(WXRELEASE) + WXLUABINDSTC_LIB = $(WXBASENAME)_wxluastc-$(WXRELEASE) + WXLUABINDXML_LIB = $(WXBASENAME)_wxluaxml-$(WXRELEASE) + WXLUABINDXRC_LIB = $(WXBASENAME)_wxluaxrc-$(WXRELEASE) + + WXLUABINDALL_LIBS = -l$(WXLUABINDXRC_LIB) -l$(WXLUABINDXML_LIB) -l$(WXLUABINDSTC_LIB) -l$(WXLUABINDRICHTEXT_LIB) -l$(WXLUABINDNET_LIB) -l$(WXLUABINDMEDIA_LIB) -l$(WXLUABINDHTML_LIB) -l$(WXLUABINDGL_LIB) -l$(WXLUABINDCORE_LIB) -l$(WXLUABINDBASE_LIB) -l$(WXLUABINDAUI_LIB) -l$(WXLUABINDADV_LIB) + + # ---------------------------------------------------------------------------- + CXXFLAGS = $(WXCXXFLAGS) -MMD -g -Wall -fPIC LDLIBS = $(WXLDLIBS) CXX = $(WXCXX) + RM = rm -f + AR = ar + AROPTIONS = rcu + RANLIB = ranlib + LN_S = ln -s + + # ---------------------------------------------------------------------------- + + WXLUA_TARGET_LIB_STATIC = $(WXLUA_TARGET_LIBDIR)/$(WXLUA_TARGET_LIBNAME).a + WXLUA_TARGET_LIB_SHARED = $(WXLUA_TARGET_LIBDIR)/$(WXLUA_TARGET_LIBNAME).so.$(WXLUA_LIBVERSION_CURRENT).$(WXLUA_LIBVERSION_REVISION).$(WXLUA_LIBVERSION_AGE) + WXLUA_TARGET_LIB_LINK1 = $(WXLUA_TARGET_LIBNAME).so.$(WXLUA_LIBVERSION_CURRENT) + WXLUA_TARGET_LIB_LINK2 = $(WXLUA_TARGET_LIBNAME).so + + # ---------------------------------------------------------------------------- + GCC_PROFILE = #-pg APPEXTRADEFS = $(GCC_PROFILE) -I$(WXLUA_DIR) -I$(WXLUA_DIR)/modules -I$(WXLUA_DIR)/modules/lua/include -I$(WXLUA_WXLUASETUP_DIR) -I$(WXSTEDIT_DIR)/include -I$(WXPREFIX)/contrib/include -DLUACALL= # This will build a shared wxLua app, dynamicly linked to .so libs ! APPEXTRALIBS= $(GCC_PROFILE) -L$(WXLUA_LIBDIR) $(WXLUABINDALL_LIBS) -l$(WXLUA_LIB) -l$(WXLUADEBUG_LIB) -l$(WXLUASOCKET_LIB) $(LUA_LIBS) # 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 $(LUA_LIBS) *************** *** 76,93 **** LIBEXTRALIBS = $(GCC_PROFILE) - - RM = rm -f - AR = ar - AROPTIONS = rcu - RANLIB = ranlib - LN_S = ln -s - # ---------------------------------------------------------------------------- ! 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) ! WXLUAAUI_LIB = $(WXBASENAME)_wxluaaui-$(WXRELEASE) --- 119,140 ---- LIBEXTRALIBS = $(GCC_PROFILE) # ---------------------------------------------------------------------------- + # These are targets that we can build, we have to declare them before we use them ! wxLuaALL_TARGETS = \ ! Lua \ ! wxLuaLib \ ! wxLuaDebugLib \ ! wxLuaSocketLib \ ! wxLuaBindAdvLib \ ! wxLuaBindAUILib \ ! wxLuaBindBaseLib \ ! wxLuaBindCoreLib \ ! wxLuaBindGLLib \ ! wxLuaBindHTMLLib \ ! wxLuaBindMediaLib \ ! wxLuaBindNetLib \ ! wxLuaBindRichTextLib \ ! wxLuaBindSTCLib \ ! wxLuaBindXMLLib \ ! wxLuaBindXRCLib Index: Makefile_wx-config_targets.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/Makefile_wx-config_targets.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile_wx-config_targets.in 4 Jul 2007 05:39:14 -0000 1.1 --- Makefile_wx-config_targets.in 16 Jul 2007 19:34:28 -0000 1.2 *************** *** 7,11 **** # Base Makefile for wxLua using wx-config to get settings - # ---------------------------------------------------------------------------- # Some targets that we may like to build --- 7,10 ---- *************** *** 23,38 **** @(cd $(WXLUA_DIR)/modules/wxluasocket/src && make) ! wxLuaBindLib: ! @(cd $(WXLUA_DIR)/modules/wxbind/src && make) ! wxSTCBindLib: ! @(cd $(WXLUA_DIR)/modules/wxbindstc/src && make) ! wxAUIBindLib: ! @(cd $(WXLUA_DIR)/modules/wxbindaui/src && make) wxStEdit: @(cd $(WXSTEDIT_DIR)/src && make) cleanall: @(cd $(WXLUA_DIR)/modules/lua && make clean) --- 22,94 ---- @(cd $(WXLUA_DIR)/modules/wxluasocket/src && make) ! LuaModule: ! @(cd $(WXLUA_DIR)/modules/luamodule/src && make) ! # ---------------------------------------------------------------------------- ! wxLuaBindAdvLib: ! @(cd $(WXLUA_DIR)/modules/wxbind/src && make -f Makefile_wxadv) ! ! wxLuaBindAUILib: ! @(cd $(WXLUA_DIR)/modules/wxbind/src && make -f Makefile_wxaui) ! ! wxLuaBindBaseLib: ! @(cd $(WXLUA_DIR)/modules/wxbind/src && make -f Makefile_wxbase) ! ! wxLuaBindCoreLib: ! @(cd $(WXLUA_DIR)/modules/wxbind/src && make -f Makefile_wxcore) ! ! wxLuaBindGLLib: ! @(cd $(WXLUA_DIR)/modules/wxbind/src && make -f Makefile_wxgl) ! ! wxLuaBindHTMLLib: ! @(cd $(WXLUA_DIR)/modules/wxbind/src && make -f Makefile_wxhtml) ! ! wxLuaBindMediaLib: ! @(cd $(WXLUA_DIR)/modules/wxbind/src && make -f Makefile_wxmedia) ! ! wxLuaBindNetLib: ! @(cd $(WXLUA_DIR)/modules/wxbind/src && make -f Makefile_wxnet) ! ! wxLuaBindRichTextLib: ! @(cd $(WXLUA_DIR)/modules/wxbind/src && make -f Makefile_wxrichtext) ! ! wxLuaBindSTCLib: ! @(cd $(WXLUA_DIR)/modules/wxbind/src && make -f Makefile_wxstc) ! ! wxLuaBindXMLLib: ! @(cd $(WXLUA_DIR)/modules/wxbind/src && make -f Makefile_wxxml) ! ! wxLuaBindXRCLib: ! @(cd $(WXLUA_DIR)/modules/wxbind/src && make -f Makefile_wxxrc) ! ! # ---------------------------------------------------------------------------- wxStEdit: @(cd $(WXSTEDIT_DIR)/src && make) + # ---------------------------------------------------------------------------- + # These are the targets when building the libs + + $(WXLUA_TARGET_LIB_STATIC) : $(OBJECTS) + @$(RM) $@ + $(AR) $(AROPTIONS) $@ $(OBJECTS) + $(RANLIB) $@ + + $(WXLUA_TARGET_LIB_SHARED): $(OBJECTS) + $(CXX) -shared -o $@ $(OBJECTS) $(LIBEXTRALIBS) + cd $(WXLUA_TARGET_LIBDIR) \ + && $(RM) $(WXLUA_TARGET_LIB_LINK1) $(WXLUA_TARGET_LIB_LINK2) \ + && $(LN_S) $(WXLUA_TARGET_LIB_SHARED) $(WXLUA_TARGET_LIB_LINK1) \ + && $(LN_S) $(WXLUA_TARGET_LIB_SHARED) $(WXLUA_TARGET_LIB_LINK2) + + # ---------------------------------------------------------------------------- + + cleanlib: + rm -f core $(OBJECTS) $(DEPFILES) \ + $(WXLUA_TARGET_LIB_STATIC) $(WXLUA_TARGET_LIB_SHARED) \ + $(WXLUA_TARGET_LIBDIR)/$(WXLUA_TARGET_LIB_LINK1) \ + $(WXLUA_TARGET_LIBDIR)/$(WXLUA_TARGET_LIB_LINK2) + cleanall: @(cd $(WXLUA_DIR)/modules/lua && make clean) *************** *** 40,46 **** @(cd $(WXLUA_DIR)/modules/wxluadebug/src && make clean) @(cd $(WXLUA_DIR)/modules/wxluasocket/src && make clean) - @(cd $(WXLUA_DIR)/modules/wxbind/src && make clean) - @(cd $(WXLUA_DIR)/modules/wxbindstc/src && make clean) - @(cd $(WXLUA_DIR)/modules/wxbindaui/src && make clean) @(cd $(WXLUA_DIR)/modules/luamodule/src && make clean) --- 96,100 ---- @(cd $(WXLUA_DIR)/modules/wxluadebug/src && make clean) @(cd $(WXLUA_DIR)/modules/wxluasocket/src && make clean) @(cd $(WXLUA_DIR)/modules/luamodule/src && make clean) + @(cd $(WXLUA_DIR)/modules/wxbind/src && make -f Makefile cleanwxbind) |
