Menu
▾
▴
[Wxlua-commit] wxLua/build Makefile_wx-config.in,1.5,1.6
|
From: John L. <jr...@us...> - 2008-05-15 04:10:14
|
Update of /cvsroot/wxlua/wxLua/build In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv29333/wxLua/build Modified Files: Makefile_wx-config.in Log Message: Use ":=" and not "=" for a huge speedup for the shell command used in the Makefiles. Index: Makefile_wx-config.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/Makefile_wx-config.in,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile_wx-config.in 11 Jan 2008 06:56:04 -0000 1.5 --- Makefile_wx-config.in 15 May 2008 04:10:09 -0000 1.6 *************** *** 42,46 **** ifeq (Apple, $(findstring Apple, $(shell gcc --version))) ! LUA_PLAT=macosx endif --- 42,46 ---- ifeq (Apple, $(findstring Apple, $(shell gcc --version))) ! LUA_PLAT=macosx endif *************** *** 52,94 **** @echo "Using these WXLIBS_NAMES = $(WXLIBS_NAMES)" ! 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 $(WXLIBS_NAMES)) ! WXCXX = $(shell $(WXCONFIG) --cxx) ! WXLIB_DIR = $(WXEXECDIR)/lib ! WXSTC_LIB = $(WXBASENAME)_stc-$(WXRELEASE) # ---------------------------------------------------------------------------- # The wxSTEditor library compiled from wxCode/components/wxstedit ! WXSTEDIT_DIR = $(WXCODE)/components/wxstedit ! WXSTEDIT_LIB = $(WXBASENAME)_stedit-$(WXRELEASE) WXSTEDIT_LIB := $(patsubst wx_%,wxcode_%,$(WXSTEDIT_LIB)) # ---------------------------------------------------------------------------- ! LUA_LIBS = $(WXLUA_DIR)/lib/liblua.a ! WXLUA_LIB = $(WXBASENAME)_wxlua-$(WXRELEASE) ! WXLUADEBUG_LIB = $(WXBASENAME)_wxluadebug-$(WXRELEASE) ! WXLUASOCKET_LIB = $(WXBASENAME)_wxluasocket-$(WXRELEASE) ! WXLUABINDADV_LIB = $(WXBASENAME)_wxbindadv-$(WXRELEASE) ! WXLUABINDAUI_LIB = $(WXBASENAME)_wxbindaui-$(WXRELEASE) ! WXLUABINDBASE_LIB = $(WXBASENAME)_wxbindbase-$(WXRELEASE) ! WXLUABINDCORE_LIB = $(WXBASENAME)_wxbindcore-$(WXRELEASE) ! WXLUABINDGL_LIB = $(WXBASENAME)_wxbindgl-$(WXRELEASE) ! WXLUABINDHTML_LIB = $(WXBASENAME)_wxbindhtml-$(WXRELEASE) ! WXLUABINDMEDIA_LIB = $(WXBASENAME)_wxbindmedia-$(WXRELEASE) ! WXLUABINDNET_LIB = $(WXBASENAME)_wxbindnet-$(WXRELEASE) ! WXLUABINDRICHTEXT_LIB = $(WXBASENAME)_wxbindrichtext-$(WXRELEASE) ! WXLUABINDSTC_LIB = $(WXBASENAME)_wxbindstc-$(WXRELEASE) ! WXLUABINDXML_LIB = $(WXBASENAME)_wxbindxml-$(WXRELEASE) ! WXLUABINDXRC_LIB = $(WXBASENAME)_wxbindxrc-$(WXRELEASE) WXLUA_LIB := $(patsubst wx_%,wxlua_%,$(WXLUA_LIB)) --- 52,94 ---- @echo "Using these WXLIBS_NAMES = $(WXLIBS_NAMES)" ! 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 $(WXLIBS_NAMES)) ! WXCXX := $(shell $(WXCONFIG) --cxx) ! WXLIB_DIR := $(WXEXECDIR)/lib ! WXSTC_LIB := $(WXBASENAME)_stc-$(WXRELEASE) # ---------------------------------------------------------------------------- # The wxSTEditor library compiled from wxCode/components/wxstedit ! WXSTEDIT_DIR := $(WXCODE)/components/wxstedit ! WXSTEDIT_LIB := $(WXBASENAME)_stedit-$(WXRELEASE) WXSTEDIT_LIB := $(patsubst wx_%,wxcode_%,$(WXSTEDIT_LIB)) # ---------------------------------------------------------------------------- ! LUA_LIBS := $(WXLUA_DIR)/lib/liblua.a ! WXLUA_LIB := $(WXBASENAME)_wxlua-$(WXRELEASE) ! WXLUADEBUG_LIB := $(WXBASENAME)_wxluadebug-$(WXRELEASE) ! WXLUASOCKET_LIB := $(WXBASENAME)_wxluasocket-$(WXRELEASE) ! WXLUABINDADV_LIB := $(WXBASENAME)_wxbindadv-$(WXRELEASE) ! WXLUABINDAUI_LIB := $(WXBASENAME)_wxbindaui-$(WXRELEASE) ! WXLUABINDBASE_LIB := $(WXBASENAME)_wxbindbase-$(WXRELEASE) ! WXLUABINDCORE_LIB := $(WXBASENAME)_wxbindcore-$(WXRELEASE) ! WXLUABINDGL_LIB := $(WXBASENAME)_wxbindgl-$(WXRELEASE) ! WXLUABINDHTML_LIB := $(WXBASENAME)_wxbindhtml-$(WXRELEASE) ! WXLUABINDMEDIA_LIB := $(WXBASENAME)_wxbindmedia-$(WXRELEASE) ! WXLUABINDNET_LIB := $(WXBASENAME)_wxbindnet-$(WXRELEASE) ! WXLUABINDRICHTEXT_LIB := $(WXBASENAME)_wxbindrichtext-$(WXRELEASE) ! WXLUABINDSTC_LIB := $(WXBASENAME)_wxbindstc-$(WXRELEASE) ! WXLUABINDXML_LIB := $(WXBASENAME)_wxbindxml-$(WXRELEASE) ! WXLUABINDXRC_LIB := $(WXBASENAME)_wxbindxrc-$(WXRELEASE) WXLUA_LIB := $(patsubst wx_%,wxlua_%,$(WXLUA_LIB)) *************** *** 111,122 **** ! 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) ! WXLUABINDSTD_LIBS = -l$(WXLUABINDNET_LIB) -l$(WXLUABINDCORE_LIB) -l$(WXLUABINDBASE_LIB) -l$(WXLUABINDADV_LIB) # ---------------------------------------------------------------------------- ! CXXFLAGS = $(WXCXXFLAGS) -MMD -g -Wall -fPIC ! LDLIBS = $(WXLDLIBS) ! CXX = $(WXCXX) RM = rm -f --- 111,122 ---- ! 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) ! WXLUABINDSTD_LIBS := -l$(WXLUABINDNET_LIB) -l$(WXLUABINDCORE_LIB) -l$(WXLUABINDBASE_LIB) -l$(WXLUABINDADV_LIB) # ---------------------------------------------------------------------------- ! CXXFLAGS := $(WXCXXFLAGS) -MMD -g -Wall -fPIC ! LDLIBS := $(WXLDLIBS) ! CXX := $(WXCXX) RM = rm -f *************** *** 128,150 **** # ---------------------------------------------------------------------------- ! 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) # for lib targets, these are extra linker args ! LIBEXTRALIBS = $(GCC_PROFILE) # ---------------------------------------------------------------------------- --- 128,150 ---- # ---------------------------------------------------------------------------- ! 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) # for lib targets, these are extra linker args ! LIBEXTRALIBS := $(GCC_PROFILE) # ---------------------------------------------------------------------------- |
