Menu
▾
▴
[Wxlua-commit] wxLua/modules Makefile.in,1.63,1.64
|
From: John L. <jr...@us...> - 2008-01-10 17:04:36
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15167/wxLua/modules Modified Files: Makefile.in Log Message: Updated bakefiles and autoconf to find the wxWidgets libs that exist on the system and link to those Also create only the wxLua bind libs for the existing wxWidgets libs Done by using $(WXLUA_LIBS) for autoconf like $(WX_LIBS) for the wxlua-lib tag and adding wxluamodule-lib to allow explicitly specifying the wxLua libs to link to for the modules. Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** Makefile.in 9 Jan 2008 04:59:57 -0000 1.63 --- Makefile.in 10 Jan 2008 17:04:25 -0000 1.64 *************** *** 51,54 **** --- 51,55 ---- WX_PORT = @WX_PORT@ LUA_DIR = @LUA_DIR@ + WXLUA_LIBS = @WXLUA_LIBS@ LUA_PLATFORM_SPECIFIC_CFLAGS = @LUA_PLATFORM_SPECIFIC_CFLAGS@ LUA_PLATFORM_SPECIFIC_LDFLAGS = @LUA_PLATFORM_SPECIFIC_LDFLAGS@ *************** *** 1627,1636 **** @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__wx \ @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \ ! @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.0.4 ! @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__wx = .0.0.4.$(SO_SUFFIX) @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__wx = -0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__wx = .$(SO_SUFFIX) @COND_PLATFORM_MACOSX_1@__wx_13 = \ ! @COND_PLATFORM_MACOSX_1@ -compatibility_version 5 -current_version 5 ### Targets: ### --- 1628,1637 ---- @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__wx \ @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \ ! @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.0.7 ! @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__wx = .0.0.7.$(SO_SUFFIX) @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__wx = -0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__wx = .$(SO_SUFFIX) @COND_PLATFORM_MACOSX_1@__wx_13 = \ ! @COND_PLATFORM_MACOSX_1@ -compatibility_version 8 -current_version 8 ### Targets: ### *************** *** 2720,2724 **** @COND_SHARED_1_USE_LUAMODULE_1@../lib/$(DLLPREFIX_MODULE)wx.$(SO_SUFFIX_MODULE): $(MOD_LUAMODULE_OBJECTS) ! @COND_SHARED_1_USE_LUAMODULE_1@ $(SHARED_LD_MODULE_CXX) $@ $(MOD_LUAMODULE_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LIBS) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindaui-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindxrc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindnet-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindmedia-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindhtml-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindgl-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindadv-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindxml-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindcore-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindbase-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_SHARED_1_USE_LUAMODULE_1@install_mod_luamodule: --- 2721,2725 ---- @COND_SHARED_1_USE_LUAMODULE_1@../lib/$(DLLPREFIX_MODULE)wx.$(SO_SUFFIX_MODULE): $(MOD_LUAMODULE_OBJECTS) ! @COND_SHARED_1_USE_LUAMODULE_1@ $(SHARED_LD_MODULE_CXX) $@ $(MOD_LUAMODULE_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LIBS) $(WXLUA_LIBS) $(WX_LIBS) @COND_SHARED_1_USE_LUAMODULE_1@install_mod_luamodule: |
