Menu
▾
▴
wxlua-commit — CVS commits of wxLua
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(191) |
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(238) |
Dec
(68) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(104) |
Feb
(518) |
Mar
(302) |
Apr
(211) |
May
(311) |
Jun
(55) |
Jul
(6) |
Aug
(35) |
Sep
(76) |
Oct
(50) |
Nov
(37) |
Dec
(340) |
| 2007 |
Jan
(23) |
Feb
(107) |
Mar
(98) |
Apr
(60) |
May
(136) |
Jun
(371) |
Jul
(175) |
Aug
(74) |
Sep
(3) |
Oct
(2) |
Nov
(53) |
Dec
(129) |
| 2008 |
Jan
(337) |
Feb
(23) |
Mar
(18) |
Apr
(4) |
May
(3) |
Jun
|
Jul
|
Aug
(4) |
Sep
|
Oct
(33) |
Nov
|
Dec
(26) |
| 2009 |
Jan
(4) |
Feb
(1) |
Mar
(15) |
Apr
|
May
(35) |
Jun
(11) |
Jul
|
Aug
|
Sep
(19) |
Oct
(26) |
Nov
(11) |
Dec
(11) |
| 2010 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(8) |
Sep
|
Oct
|
Nov
(8) |
Dec
(7) |
| 2011 |
Jan
|
Feb
|
Mar
(4) |
Apr
(8) |
May
(5) |
Jun
(8) |
Jul
(1) |
Aug
|
Sep
|
Oct
(5) |
Nov
(13) |
Dec
|
|
From: John L. <jr...@us...> - 2007-07-04 05:39:52
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv478/wxLua/bindings Modified Files: Makefile genwxbind.lua 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/bindings/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile 17 Jun 2007 17:17:36 -0000 1.4 --- Makefile 4 Jul 2007 05:39:13 -0000 1.5 *************** *** 16,20 **** endif ! all: wxwidgets wxstc wxlua wxluasocket wxluacan wxwidgets: --- 16,20 ---- endif ! all: wxwidgets wxstc wxaui wxlua wxluasocket wxluacan wxwidgets: *************** *** 27,30 **** --- 27,34 ---- @($(LUA) -e"rulesFilename=\"wxstc/wxstc_rules.lua\"" genwxbind.lua > wxstc/error.txt) + wxaui: + @echo Building wxAui + @($(LUA) -e"rulesFilename=\"wxaui/wxaui_rules.lua\"" genwxbind.lua > wxaui/error.txt) + wxlua: @echo Building wxLua Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.141 retrieving revision 1.142 diff -C2 -d -r1.141 -r1.142 *** genwxbind.lua 2 Jul 2007 17:06:03 -0000 1.141 --- genwxbind.lua 4 Jul 2007 05:39:13 -0000 1.142 *************** *** 719,722 **** --- 719,723 ---- preprocConditionTable["wxUSE_ANIMATIONCTRL"] = "wxUSE_ANIMATIONCTRL" preprocConditionTable["wxUSE_APPLE_IEEE"] = "wxUSE_APPLE_IEEE" + preprocConditionTable["wxUSE_AUI"] = "wxUSE_AUI" preprocConditionTable["wxUSE_BITMAPCOMBOBOX"] = "wxUSE_BITMAPCOMBOBOX" preprocConditionTable["wxUSE_BMPBUTTON"] = "wxUSE_BMPBUTTON" *************** *** 918,921 **** --- 919,923 ---- preprocConditionTable["wxLUA_USE_wxArrayString"] = "wxLUA_USE_wxArrayString" preprocConditionTable["wxLUA_USE_wxArtProvider"] = "wxLUA_USE_wxArtProvider" + preprocConditionTable["wxLUA_USE_wxAUI"] = "wxLUA_USE_wxAUI" preprocConditionTable["wxLUA_USE_wxBitmap"] = "wxLUA_USE_wxBitmap" preprocConditionTable["wxLUA_USE_wxBitmapComboBox"] = "wxLUA_USE_wxBitmapComboBox" *************** *** 3305,3308 **** --- 3307,3313 ---- overload_argList = overload_argList.."&s_wxluaarg_Integer, " argItem = "("..argType..")wxlua_getintegertype(L, "..argNum..")" + elseif not numeric then + overload_argList = overload_argList.."&s_wxluatag_"..MakeClassVar(argType)..", " + argItem = "*("..argTypeWithAttrib.."*)wxlState.GetUserDataType("..argNum..", s_wxluatag_"..MakeClassVar(argType)..")" else overload_argList = overload_argList.."&s_wxluaarg_Number, " |
|
From: John L. <jr...@us...> - 2007-07-04 05:39:51
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv478/wxLua/build/autoconf Modified Files: autoconf_inc.m4 Log Message: Add wxAUI library and rebuild all build files Cleanup Makefiles using wx-config and include common bits to simplify them Index: autoconf_inc.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/autoconf_inc.m4,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** autoconf_inc.m4 6 May 2007 10:52:51 -0000 1.25 --- autoconf_inc.m4 4 Jul 2007 05:39:14 -0000 1.26 *************** *** 123,126 **** --- 123,132 ---- fi AC_SUBST(COND_SHARED_0_USE_SYSTEM_LUA_0) + dnl ### begin block 20_COND_SHARED_0_USE_WXBINDAUI_1[../../modules/build/bakefiles/modules.bkl] ### + COND_SHARED_0_USE_WXBINDAUI_1="#" + if test "x$SHARED" = "x0" -a "x$USE_WXBINDAUI" = "x1" ; then + COND_SHARED_0_USE_WXBINDAUI_1="" + fi + AC_SUBST(COND_SHARED_0_USE_WXBINDAUI_1) dnl ### begin block 20_COND_SHARED_0_USE_WXBINDSTC_1[../../modules/build/bakefiles/modules.bkl] ### COND_SHARED_0_USE_WXBINDSTC_1="#" *************** *** 159,162 **** --- 165,174 ---- fi AC_SUBST(COND_SHARED_1_USE_SYSTEM_LUA_0) + dnl ### begin block 20_COND_SHARED_1_USE_WXBINDAUI_1[../../modules/build/bakefiles/modules.bkl] ### + COND_SHARED_1_USE_WXBINDAUI_1="#" + if test "x$SHARED" = "x1" -a "x$USE_WXBINDAUI" = "x1" ; then + COND_SHARED_1_USE_WXBINDAUI_1="" + fi + AC_SUBST(COND_SHARED_1_USE_WXBINDAUI_1) dnl ### begin block 20_COND_SHARED_1_USE_WXBINDSTC_1[../../modules/build/bakefiles/modules.bkl] ### COND_SHARED_1_USE_WXBINDSTC_1="#" |
|
From: John L. <jr...@us...> - 2007-07-04 05:39:51
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv478/wxLua/build/bakefiles Modified Files: wxluabase.bkl Log Message: Add wxAUI library and rebuild all build files Cleanup Makefiles using wx-config and include common bits to simplify them Index: wxluabase.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxluabase.bkl,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** wxluabase.bkl 6 May 2007 10:16:33 -0000 1.39 --- wxluabase.bkl 4 Jul 2007 05:39:14 -0000 1.40 *************** *** 40,44 **** --> ! <set var="WXLUA_RELEASE">0</set> <!-- The default version of wxWidgets which is used by wxLua; --- 40,44 ---- --> ! <set var="WXLUA_RELEASE">4</set> <!-- The default version of wxWidgets which is used by wxLua; *************** *** 111,115 **** --> <define-tag name="wxlua-lib" rules="exe,dll,module"> ! <if cond="value not in [ 'wxluasocket', 'wxluadebug', 'wxlua', 'wxbindstc', 'wxbind', 'lua' ]"> <error>Invalid wxlua-lib value !</error> </if> --- 111,115 ---- --> <define-tag name="wxlua-lib" rules="exe,dll,module"> ! <if cond="value not in [ 'wxluasocket', 'wxluadebug', 'wxlua', 'wxbindstc', 'wxbindaui', 'wxbind', 'lua' ]"> <error>Invalid wxlua-lib value !</error> </if> *************** *** 126,129 **** --- 126,130 ---- <wxlua-lib>wxluasocket</wxlua-lib> <wxlua-lib>wxluadebug</wxlua-lib> + <wxlua-lib>wxbindaui</wxlua-lib> <wxlua-lib>wxbindstc</wxlua-lib> <wxlua-lib>wxbind</wxlua-lib> *************** *** 136,139 **** --- 137,141 ---- <wxlua-lib>wxluasocket</wxlua-lib> <wxlua-lib>wxluadebug</wxlua-lib> + <wxlua-lib>wxbindaui</wxlua-lib> <!-- <wxlua-lib>wxbindstc</wxlua-lib> --> <wxlua-lib>wxbind</wxlua-lib> *************** *** 146,149 **** --- 148,152 ---- <wx-lib>xrc</wx-lib> <wx-lib>html</wx-lib> + <wx-lib>aui</wx-lib> <wx-lib>media</wx-lib> <wx-lib>adv</wx-lib> |
|
From: John L. <jr...@us...> - 2007-07-04 05:39:51
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv478/wxLua/modules Modified Files: Makefile.in Log Message: Add wxAUI library and rebuild all build files Cleanup Makefiles using wx-config and include common bits to simplify them Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** Makefile.in 17 Jun 2007 18:36:08 -0000 1.58 --- Makefile.in 4 Jul 2007 05:39:16 -0000 1.59 *************** *** 240,243 **** --- 240,263 ---- WXBINDSTC_DLL_ODEP = \ $(___pch_wxprec_wxbindstc_dll_wx_wxprec_h_gch___depname) + WXBINDAUI_LIB_CXXFLAGS = $(__wxbindaui_lib_PCH_INC) \ + -I$(top_srcdir)/modules/wxbind/setup -I$(top_srcdir)/modules \ + -I./$(top_srcdir) -I$(LUA_DIR)/include $(WX_CXXFLAGS) $(CPPFLAGS) \ + $(CXXFLAGS) + WXBINDAUI_LIB_OBJECTS = \ + wxbindaui_lib_aui.o \ + wxbindaui_lib_wxaui_bind.o \ + wxbindaui_lib_dummy.o + WXBINDAUI_LIB_ODEP = \ + $(___pch_wxprec_wxbindaui_lib_wx_wxprec_h_gch___depname) + WXBINDAUI_DLL_CXXFLAGS = $(__wxbindaui_dll_PCH_INC) \ + -I$(top_srcdir)/modules/wxbind/setup -I$(top_srcdir)/modules \ + -I./$(top_srcdir) -I$(LUA_DIR)/include -DWXMAKINGDLL_WXBINDAUI $(PIC_FLAG) \ + $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) + WXBINDAUI_DLL_OBJECTS = \ + wxbindaui_dll_aui.o \ + wxbindaui_dll_wxaui_bind.o \ + wxbindaui_dll_dummy.o + WXBINDAUI_DLL_ODEP = \ + $(___pch_wxprec_wxbindaui_dll_wx_wxprec_h_gch___depname) WXLUADEBUG_LIB_CXXFLAGS = $(__wxluadebug_lib_PCH_INC) \ -I$(top_srcdir)/modules/wxbind/setup -I$(top_srcdir)/modules \ *************** *** 313,330 **** @COND_SHARED_1_USE_SYSTEM_LUA_0@__lua_dll___depname \ @COND_SHARED_1_USE_SYSTEM_LUA_0@ = \ ! @COND_SHARED_1_USE_SYSTEM_LUA_0@ ../lib/$(DLLPREFIX)lua5.1$(dll___targetsuf3) @COND_PLATFORM_OS2_1@__lua_dll___importlib = -import \ @COND_PLATFORM_OS2_1@ ../lib/$(LIBPREFIX)lua5.1.$(DLLIMP_SUFFIX) @COND_WINDOWS_IMPLIB_1@__lua_dll___importlib = \ @COND_WINDOWS_IMPLIB_1@ -Wl,--out-implib=../lib/$(LIBPREFIX)lua5.1.$(DLLIMP_SUFFIX) @COND_USE_SOVERLINUX_1@__lua_dll___soname_flags = \ @COND_USE_SOVERLINUX_1@ $(SONAME_FLAG)$(DLLPREFIX)lua5.1$(dll___targetsuf2) @COND_USE_SOVERSOLARIS_1@__lua_dll___soname_flags \ @COND_USE_SOVERSOLARIS_1@ = \ ! @COND_USE_SOVERSOLARIS_1@ $(SONAME_FLAG)$(DLLPREFIX)lua5.1$(dll___targetsuf3) COND_USE_SOSYMLINKS_1___lua_dll___so_symlinks_cmd = (cd ../lib/; rm -f \ $(LIBPREFIX)lua5.1.$(DLLIMP_SUFFIX) \ $(DLLPREFIX)lua5.1$(dll___targetsuf2); $(LN_S) \ ! $(DLLPREFIX)lua5.1$(dll___targetsuf3) \ $(DLLPREFIX)lua5.1$(dll___targetsuf2); $(LN_S) \ $(DLLPREFIX)lua5.1$(dll___targetsuf2) \ --- 333,358 ---- @COND_SHARED_1_USE_SYSTEM_LUA_0@__lua_dll___depname \ @COND_SHARED_1_USE_SYSTEM_LUA_0@ = \ ! @COND_SHARED_1_USE_SYSTEM_LUA_0@ ../lib/$(DLLPREFIX)lua5.1$(__lua_dll___targetsuf3) @COND_PLATFORM_OS2_1@__lua_dll___importlib = -import \ @COND_PLATFORM_OS2_1@ ../lib/$(LIBPREFIX)lua5.1.$(DLLIMP_SUFFIX) @COND_WINDOWS_IMPLIB_1@__lua_dll___importlib = \ @COND_WINDOWS_IMPLIB_1@ -Wl,--out-implib=../lib/$(LIBPREFIX)lua5.1.$(DLLIMP_SUFFIX) + @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__lua_dll___targetsuf3 \ + @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \ + @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.0.0 + @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__lua_dll___targetsuf3 \ + @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) + @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__lua_dll___targetsuf3 \ + @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@ = -0.$(SO_SUFFIX) + @COND_USE_SOVERSION_0@__lua_dll___targetsuf3 = .$(SO_SUFFIX) @COND_USE_SOVERLINUX_1@__lua_dll___soname_flags = \ @COND_USE_SOVERLINUX_1@ $(SONAME_FLAG)$(DLLPREFIX)lua5.1$(dll___targetsuf2) @COND_USE_SOVERSOLARIS_1@__lua_dll___soname_flags \ @COND_USE_SOVERSOLARIS_1@ = \ ! @COND_USE_SOVERSOLARIS_1@ $(SONAME_FLAG)$(DLLPREFIX)lua5.1$(__lua_dll___targetsuf3) COND_USE_SOSYMLINKS_1___lua_dll___so_symlinks_cmd = (cd ../lib/; rm -f \ $(LIBPREFIX)lua5.1.$(DLLIMP_SUFFIX) \ $(DLLPREFIX)lua5.1$(dll___targetsuf2); $(LN_S) \ ! $(DLLPREFIX)lua5.1$(__lua_dll___targetsuf3) \ $(DLLPREFIX)lua5.1$(dll___targetsuf2); $(LN_S) \ $(DLLPREFIX)lua5.1$(dll___targetsuf2) \ *************** *** 334,338 **** $(LIBPREFIX)lua5.1.$(DLLIMP_SUFFIX) \ $(DLLPREFIX)lua5.1$(dll___targetsuf2); $(LN_S) \ ! $(DLLPREFIX)lua5.1$(dll___targetsuf3) \ $(DLLPREFIX)lua5.1$(dll___targetsuf2); $(LN_S) \ $(DLLPREFIX)lua5.1$(dll___targetsuf2) $(LIBPREFIX)lua5.1.$(DLLIMP_SUFFIX) --- 362,366 ---- $(LIBPREFIX)lua5.1.$(DLLIMP_SUFFIX) \ $(DLLPREFIX)lua5.1$(dll___targetsuf2); $(LN_S) \ ! $(DLLPREFIX)lua5.1$(__lua_dll___targetsuf3) \ $(DLLPREFIX)lua5.1$(dll___targetsuf2); $(LN_S) \ $(DLLPREFIX)lua5.1$(dll___targetsuf2) $(LIBPREFIX)lua5.1.$(DLLIMP_SUFFIX) *************** *** 369,373 **** @COND_SHARED_0@ uninstall_wxlua_lib_headers COND_SHARED_1___wxlua_dll___depname = \ ! ../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) @COND_SHARED_1@__wxlua_dll___depname = $(COND_SHARED_1___wxlua_dll___depname) COND_USE_SOVERLINUX_1___wxlua_dll___soname_flags = \ --- 397,401 ---- @COND_SHARED_0@ uninstall_wxlua_lib_headers COND_SHARED_1___wxlua_dll___depname = \ ! ../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx) @COND_SHARED_1@__wxlua_dll___depname = $(COND_SHARED_1___wxlua_dll___depname) COND_USE_SOVERLINUX_1___wxlua_dll___soname_flags = \ *************** *** 375,379 **** @COND_USE_SOVERLINUX_1@__wxlua_dll___soname_flags = $(COND_USE_SOVERLINUX_1___wxlua_dll___soname_flags) COND_USE_SOVERSOLARIS_1___wxlua_dll___soname_flags = \ ! $(SONAME_FLAG)$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) @COND_USE_SOVERSOLARIS_1@__wxlua_dll___soname_flags = $(COND_USE_SOVERSOLARIS_1___wxlua_dll___soname_flags) COND_USE_SOSYMLINKS_1___wxlua_dll___so_symlinks_cmd = (cd ../lib/; rm -f \ --- 403,407 ---- @COND_USE_SOVERLINUX_1@__wxlua_dll___soname_flags = $(COND_USE_SOVERLINUX_1___wxlua_dll___soname_flags) COND_USE_SOVERSOLARIS_1___wxlua_dll___soname_flags = \ ! $(SONAME_FLAG)$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx) @COND_USE_SOVERSOLARIS_1@__wxlua_dll___soname_flags = $(COND_USE_SOVERSOLARIS_1___wxlua_dll___soname_flags) COND_USE_SOSYMLINKS_1___wxlua_dll___so_symlinks_cmd = (cd ../lib/; rm -f \ *************** *** 381,385 **** $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ $(LN_S) \ ! $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) \ $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ $(LN_S) \ --- 409,413 ---- $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ $(LN_S) \ ! $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx) \ $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ $(LN_S) \ *************** *** 391,395 **** $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ $(LN_S) \ ! $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) \ $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ $(LN_S) \ --- 419,423 ---- $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ $(LN_S) \ ! $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx) \ $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ $(LN_S) \ *************** *** 436,440 **** @COND_SHARED_0@ uninstall_wxbind_lib_headers COND_SHARED_1___wxbind_dll___depname = \ ! ../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) @COND_SHARED_1@__wxbind_dll___depname = $(COND_SHARED_1___wxbind_dll___depname) COND_USE_SOVERLINUX_1___wxbind_dll___soname_flags = \ --- 464,468 ---- @COND_SHARED_0@ uninstall_wxbind_lib_headers COND_SHARED_1___wxbind_dll___depname = \ ! ../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx) @COND_SHARED_1@__wxbind_dll___depname = $(COND_SHARED_1___wxbind_dll___depname) COND_USE_SOVERLINUX_1___wxbind_dll___soname_flags = \ *************** *** 442,446 **** @COND_USE_SOVERLINUX_1@__wxbind_dll___soname_flags = $(COND_USE_SOVERLINUX_1___wxbind_dll___soname_flags) COND_USE_SOVERSOLARIS_1___wxbind_dll___soname_flags = \ ! $(SONAME_FLAG)$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) @COND_USE_SOVERSOLARIS_1@__wxbind_dll___soname_flags = $(COND_USE_SOVERSOLARIS_1___wxbind_dll___soname_flags) COND_USE_SOSYMLINKS_1___wxbind_dll___so_symlinks_cmd = (cd ../lib/; rm -f \ --- 470,474 ---- @COND_USE_SOVERLINUX_1@__wxbind_dll___soname_flags = $(COND_USE_SOVERLINUX_1___wxbind_dll___soname_flags) COND_USE_SOVERSOLARIS_1___wxbind_dll___soname_flags = \ ! $(SONAME_FLAG)$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx) @COND_USE_SOVERSOLARIS_1@__wxbind_dll___soname_flags = $(COND_USE_SOVERSOLARIS_1___wxbind_dll___soname_flags) COND_USE_SOSYMLINKS_1___wxbind_dll___so_symlinks_cmd = (cd ../lib/; rm -f \ *************** *** 448,452 **** $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ $(LN_S) \ ! $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) \ $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ $(LN_S) \ --- 476,480 ---- $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ $(LN_S) \ ! $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx) \ $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ $(LN_S) \ *************** *** 458,462 **** $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ $(LN_S) \ ! $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) \ $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ $(LN_S) \ --- 486,490 ---- $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ $(LN_S) \ ! $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx) \ $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ $(LN_S) \ *************** *** 505,509 **** @COND_SHARED_0_USE_WXBINDSTC_1@ = uninstall_wxbindstc_lib_headers COND_SHARED_1_USE_WXBINDSTC_1___wxbindstc_dll___depname = \ ! ../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) @COND_SHARED_1_USE_WXBINDSTC_1@__wxbindstc_dll___depname = $(COND_SHARED_1_USE_WXBINDSTC_1___wxbindstc_dll___depname) COND_USE_SOVERLINUX_1___wxbindstc_dll___soname_flags = \ --- 533,537 ---- @COND_SHARED_0_USE_WXBINDSTC_1@ = uninstall_wxbindstc_lib_headers COND_SHARED_1_USE_WXBINDSTC_1___wxbindstc_dll___depname = \ ! ../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx) @COND_SHARED_1_USE_WXBINDSTC_1@__wxbindstc_dll___depname = $(COND_SHARED_1_USE_WXBINDSTC_1___wxbindstc_dll___depname) COND_USE_SOVERLINUX_1___wxbindstc_dll___soname_flags = \ *************** *** 511,515 **** @COND_USE_SOVERLINUX_1@__wxbindstc_dll___soname_flags = $(COND_USE_SOVERLINUX_1___wxbindstc_dll___soname_flags) COND_USE_SOVERSOLARIS_1___wxbindstc_dll___soname_flags = \ ! $(SONAME_FLAG)$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) @COND_USE_SOVERSOLARIS_1@__wxbindstc_dll___soname_flags = $(COND_USE_SOVERSOLARIS_1___wxbindstc_dll___soname_flags) COND_USE_SOSYMLINKS_1___wxbindstc_dll___so_symlinks_cmd = (cd ../lib/; rm -f \ --- 539,543 ---- @COND_USE_SOVERLINUX_1@__wxbindstc_dll___soname_flags = $(COND_USE_SOVERLINUX_1___wxbindstc_dll___soname_flags) COND_USE_SOVERSOLARIS_1___wxbindstc_dll___soname_flags = \ ! $(SONAME_FLAG)$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx) @COND_USE_SOVERSOLARIS_1@__wxbindstc_dll___soname_flags = $(COND_USE_SOVERSOLARIS_1___wxbindstc_dll___soname_flags) COND_USE_SOSYMLINKS_1___wxbindstc_dll___so_symlinks_cmd = (cd ../lib/; rm -f \ *************** *** 517,521 **** $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ $(LN_S) \ ! $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) \ $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ $(LN_S) \ --- 545,549 ---- $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ $(LN_S) \ ! $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx) \ $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ $(LN_S) \ *************** *** 527,531 **** $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ $(LN_S) \ ! $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) \ $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ $(LN_S) \ --- 555,559 ---- $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ $(LN_S) \ ! $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx) \ $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ $(LN_S) \ *************** *** 559,562 **** --- 587,661 ---- @COND_SHARED_1_USE_WXBINDSTC_1@__uninstall_wxbindstc_dll_headers___depname \ @COND_SHARED_1_USE_WXBINDSTC_1@ = uninstall_wxbindstc_dll_headers + COND_SHARED_0_USE_WXBINDAUI_1___wxbindaui_lib___depname = \ + ../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindaui-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) + @COND_SHARED_0_USE_WXBINDAUI_1@__wxbindaui_lib___depname = $(COND_SHARED_0_USE_WXBINDAUI_1___wxbindaui_lib___depname) + @COND_GCC_PCH_1@__wxbindaui_lib_PCH_INC = -I.pch/wxprec_wxbindaui_lib + @COND_ICC_PCH_1@__wxbindaui_lib_PCH_INC = -use_pch \ + @COND_ICC_PCH_1@ .pch/wxprec_wxbindaui_lib/wx/wxprec.h.gch + @COND_USE_PCH_1@___pch_wxprec_wxbindaui_lib_wx_wxprec_h_gch___depname \ + @COND_USE_PCH_1@ = .pch/wxprec_wxbindaui_lib/wx/wxprec.h.gch + @COND_SHARED_0_USE_WXBINDAUI_1@__install_wxbindaui_lib___depname \ + @COND_SHARED_0_USE_WXBINDAUI_1@ = install_wxbindaui_lib + @COND_SHARED_0_USE_WXBINDAUI_1@__uninstall_wxbindaui_lib___depname \ + @COND_SHARED_0_USE_WXBINDAUI_1@ = uninstall_wxbindaui_lib + @COND_SHARED_0_USE_WXBINDAUI_1@__install_wxbindaui_lib_headers___depname \ + @COND_SHARED_0_USE_WXBINDAUI_1@ = install_wxbindaui_lib_headers + @COND_SHARED_0_USE_WXBINDAUI_1@__uninstall_wxbindaui_lib_headers___depname \ + @COND_SHARED_0_USE_WXBINDAUI_1@ = uninstall_wxbindaui_lib_headers + COND_SHARED_1_USE_WXBINDAUI_1___wxbindaui_dll___depname = \ + ../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindaui-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx) + @COND_SHARED_1_USE_WXBINDAUI_1@__wxbindaui_dll___depname = $(COND_SHARED_1_USE_WXBINDAUI_1___wxbindaui_dll___depname) + COND_USE_SOVERLINUX_1___wxbindaui_dll___soname_flags = \ + $(SONAME_FLAG)$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindaui-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2) + @COND_USE_SOVERLINUX_1@__wxbindaui_dll___soname_flags = $(COND_USE_SOVERLINUX_1___wxbindaui_dll___soname_flags) + COND_USE_SOVERSOLARIS_1___wxbindaui_dll___soname_flags = \ + $(SONAME_FLAG)$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindaui-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx) + @COND_USE_SOVERSOLARIS_1@__wxbindaui_dll___soname_flags = $(COND_USE_SOVERSOLARIS_1___wxbindaui_dll___soname_flags) + COND_USE_SOSYMLINKS_1___wxbindaui_dll___so_symlinks_cmd = (cd ../lib/; rm -f \ + $(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindaui-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) \ + $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindaui-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindaui-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx) \ + $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindaui-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindaui-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2) \ + $(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindaui-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX)) + @COND_USE_SOSYMLINKS_1@__wxbindaui_dll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___wxbindaui_dll___so_symlinks_cmd) + COND_USE_SOSYMLINKS_1___wxbindaui_dll___so_symlinks_inst_cmd = rm -f \ + $(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindaui-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) \ + $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindaui-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindaui-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx) \ + $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindaui-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindaui-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2) \ + $(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindaui-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) + @COND_USE_SOSYMLINKS_1@__wxbindaui_dll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___wxbindaui_dll___so_symlinks_inst_cmd) + COND_USE_SOSYMLINKS_1___wxbindaui_dll___so_symlinks_uninst_cmd = rm -f \ + $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindaui-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2) \ + $(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindaui-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) + @COND_USE_SOSYMLINKS_1@__wxbindaui_dll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___wxbindaui_dll___so_symlinks_uninst_cmd) + COND_PLATFORM_OS2_1___wxbindaui_dll___importlib = -import \ + ../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindaui-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) + @COND_PLATFORM_OS2_1@__wxbindaui_dll___importlib = $(COND_PLATFORM_OS2_1___wxbindaui_dll___importlib) + COND_WINDOWS_IMPLIB_1___wxbindaui_dll___importlib = \ + -Wl,--out-implib=../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindaui-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) + @COND_WINDOWS_IMPLIB_1@__wxbindaui_dll___importlib = $(COND_WINDOWS_IMPLIB_1___wxbindaui_dll___importlib) + @COND_GCC_PCH_1@__wxbindaui_dll_PCH_INC = -I.pch/wxprec_wxbindaui_dll + @COND_ICC_PCH_1@__wxbindaui_dll_PCH_INC = -use_pch \ + @COND_ICC_PCH_1@ .pch/wxprec_wxbindaui_dll/wx/wxprec.h.gch + @COND_USE_PCH_1@___pch_wxprec_wxbindaui_dll_wx_wxprec_h_gch___depname \ + @COND_USE_PCH_1@ = .pch/wxprec_wxbindaui_dll/wx/wxprec.h.gch + @COND_SHARED_1_USE_WXBINDAUI_1@__install_wxbindaui_dll___depname \ + @COND_SHARED_1_USE_WXBINDAUI_1@ = install_wxbindaui_dll + @COND_SHARED_1_USE_WXBINDAUI_1@__uninstall_wxbindaui_dll___depname \ + @COND_SHARED_1_USE_WXBINDAUI_1@ = uninstall_wxbindaui_dll + COND_PLATFORM_MACOSX_1___wxbindaui_dll___macinstnamecmd = -install_name \ + $(libdir)/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindaui-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2) + @COND_PLATFORM_MACOSX_1@__wxbindaui_dll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___wxbindaui_dll___macinstnamecmd) + @COND_SHARED_1_USE_WXBINDAUI_1@__install_wxbindaui_dll_headers___depname \ + @COND_SHARED_1_USE_WXBINDAUI_1@ = install_wxbindaui_dll_headers + @COND_SHARED_1_USE_WXBINDAUI_1@__uninstall_wxbindaui_dll_headers___depname \ + @COND_SHARED_1_USE_WXBINDAUI_1@ = uninstall_wxbindaui_dll_headers COND_SHARED_0_USE_WXLUADEBUG_1___wxluadebug_lib___depname = \ ../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) *************** *** 576,580 **** @COND_SHARED_0_USE_WXLUADEBUG_1@ = uninstall_wxluadebug_lib_headers COND_SHARED_1_USE_WXLUADEBUG_1___wxluadebug_dll___depname = \ ! ../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) @COND_SHARED_1_USE_WXLUADEBUG_1@__wxluadebug_dll___depname = $(COND_SHARED_1_USE_WXLUADEBUG_1___wxluadebug_dll___depname) COND_USE_SOVERLINUX_1___wxluadebug_dll___soname_flags = \ --- 675,679 ---- @COND_SHARED_0_USE_WXLUADEBUG_1@ = uninstall_wxluadebug_lib_headers COND_SHARED_1_USE_WXLUADEBUG_1___wxluadebug_dll___depname = \ ! ../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx) @COND_SHARED_1_USE_WXLUADEBUG_1@__wxluadebug_dll___depname = $(COND_SHARED_1_USE_WXLUADEBUG_1___wxluadebug_dll___depname) COND_USE_SOVERLINUX_1___wxluadebug_dll___soname_flags = \ *************** *** 582,586 **** @COND_USE_SOVERLINUX_1@__wxluadebug_dll___soname_flags = $(COND_USE_SOVERLINUX_1___wxluadebug_dll___soname_flags) COND_USE_SOVERSOLARIS_1___wxluadebug_dll___soname_flags = \ ! $(SONAME_FLAG)$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) @COND_USE_SOVERSOLARIS_1@__wxluadebug_dll___soname_flags = $(COND_USE_SOVERSOLARIS_1___wxluadebug_dll___soname_flags) COND_USE_SOSYMLINKS_1___wxluadebug_dll___so_symlinks_cmd = (cd ../lib/; rm -f \ --- 681,685 ---- @COND_USE_SOVERLINUX_1@__wxluadebug_dll___soname_flags = $(COND_USE_SOVERLINUX_1___wxluadebug_dll___soname_flags) COND_USE_SOVERSOLARIS_1___wxluadebug_dll___soname_flags = \ ! $(SONAME_FLAG)$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx) @COND_USE_SOVERSOLARIS_1@__wxluadebug_dll___soname_flags = $(COND_USE_SOVERSOLARIS_1___wxluadebug_dll___soname_flags) COND_USE_SOSYMLINKS_1___wxluadebug_dll___so_symlinks_cmd = (cd ../lib/; rm -f \ *************** *** 588,592 **** $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ $(LN_S) \ ! $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) \ $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ $(LN_S) \ --- 687,691 ---- $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ $(LN_S) \ ! $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx) \ $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ $(LN_S) \ *************** *** 598,602 **** $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ $(LN_S) \ ! $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) \ $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ $(LN_S) \ --- 697,701 ---- $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ $(LN_S) \ ! $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx) \ $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ $(LN_S) \ *************** *** 647,651 **** @COND_SHARED_0_USE_WXLUASOCKET_1@ = uninstall_wxluasocket_lib_headers COND_SHARED_1_USE_WXLUASOCKET_1___wxluasocket_dll___depname = \ ! ../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) @COND_SHARED_1_USE_WXLUASOCKET_1@__wxluasocket_dll___depname = $(COND_SHARED_1_USE_WXLUASOCKET_1___wxluasocket_dll___depname) COND_USE_SOVERLINUX_1___wxluasocket_dll___soname_flags = \ --- 746,750 ---- @COND_SHARED_0_USE_WXLUASOCKET_1@ = uninstall_wxluasocket_lib_headers COND_SHARED_1_USE_WXLUASOCKET_1___wxluasocket_dll___depname = \ ! ../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx) @COND_SHARED_1_USE_WXLUASOCKET_1@__wxluasocket_dll___depname = $(COND_SHARED_1_USE_WXLUASOCKET_1___wxluasocket_dll___depname) COND_USE_SOVERLINUX_1___wxluasocket_dll___soname_flags = \ *************** *** 653,657 **** @COND_USE_SOVERLINUX_1@__wxluasocket_dll___soname_flags = $(COND_USE_SOVERLINUX_1___wxluasocket_dll___soname_flags) COND_USE_SOVERSOLARIS_1___wxluasocket_dll___soname_flags = \ ! $(SONAME_FLAG)$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) @COND_USE_SOVERSOLARIS_1@__wxluasocket_dll___soname_flags = $(COND_USE_SOVERSOLARIS_1___wxluasocket_dll___soname_flags) COND_USE_SOSYMLINKS_1___wxluasocket_dll___so_symlinks_cmd = (cd ../lib/; rm -f \ --- 752,756 ---- @COND_USE_SOVERLINUX_1@__wxluasocket_dll___soname_flags = $(COND_USE_SOVERLINUX_1___wxluasocket_dll___soname_flags) COND_USE_SOVERSOLARIS_1___wxluasocket_dll___soname_flags = \ ! $(SONAME_FLAG)$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx) @COND_USE_SOVERSOLARIS_1@__wxluasocket_dll___soname_flags = $(COND_USE_SOVERSOLARIS_1___wxluasocket_dll___soname_flags) COND_USE_SOSYMLINKS_1___wxluasocket_dll___so_symlinks_cmd = (cd ../lib/; rm -f \ *************** *** 659,663 **** $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ $(LN_S) \ ! $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) \ $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ $(LN_S) \ --- 758,762 ---- $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ $(LN_S) \ ! $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx) \ $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ $(LN_S) \ *************** *** 669,673 **** $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ $(LN_S) \ ! $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) \ $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ $(LN_S) \ --- 768,772 ---- $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ $(LN_S) \ ! $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx) \ $(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ $(LN_S) \ *************** *** 714,741 **** @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf2 = .0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@dll___targetsuf2 = .$(SO_SUFFIX) ! @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@dll___targetsuf3 \ @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \ ! @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.0.0 ! @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf3 \ ! @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) ! @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -0.$(SO_SUFFIX) ! @COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX) ! @COND_PLATFORM_MACOSX_1@__wx = -compatibility_version 1 -current_version 1 ### Targets: ### ! all: $(__lua_lib___depname) $(__lua_dll___depname) $(__wxlua_lib___depname) $(__wxlua_dll___depname) $(__wxbind_lib___depname) $(__wxbind_dll___depname) $(__wxbindstc_lib___depname) $(__wxbindstc_dll___depname) $(__wxluadebug_lib___depname) $(__wxluadebug_dll___depname) $(__wxluasocket_lib___depname) $(__wxluasocket_dll___depname) $(__mod_luamodule___depname) ! install: all $(__install_lua_lib___depname) $(__install_lua_lib_headers___depname) $(__install_lua_dll___depname) $(__install_lua_dll_headers___depname) $(__install_wxlua_lib___depname) $(__install_wxlua_lib_headers___depname) $(__install_wxlua_dll___depname) $(__install_wxlua_dll_headers___depname) $(__install_wxbind_lib___depname) $(__install_wxbind_lib_headers___depname) $(__install_wxbind_dll___depname) $(__install_wxbind_dll_headers___depname) $(__install_wxbindstc_lib___depname) $(__install_wxbindstc_lib_headers___depname) $(__install_wxbindstc_dll___depname) $(__install_wxbindstc_dll_headers___depname) $(__install_wxluadebug_lib___depname) $(__install_wxluadebug_lib_headers___depname) $(__install_wxluadebug_dll___depname) $(__install_wxluadebug_dll_headers___depname) $(__install_wxluasocket_lib___depname) $(__install_wxluasocket_lib_headers___depname) $(__install_wxluasocket_dll___depname) $(__install_wxluasocket_dll_headers___depname) $(__install_mod_luamodule___depname) $(__wxbindsrc___depname) $(__wxbindmake___depname) $(__wxbindsetup___depname) ! uninstall: $(__uninstall_lua_lib___depname) $(__uninstall_lua_lib_headers___depname) $(__uninstall_lua_dll___depname) $(__uninstall_lua_dll_headers___depname) $(__uninstall_wxlua_lib___depname) $(__uninstall_wxlua_lib_headers___depname) $(__uninstall_wxlua_dll___depname) $(__uninstall_wxlua_dll_headers___depname) $(__uninstall_wxbind_lib___depname) $(__uninstall_wxbind_lib_headers___depname) $(__uninstall_wxbind_dll___depname) $(__uninstall_wxbind_dll_headers___depname) $(__uninstall_wxbindstc_lib___depname) $(__uninstall_wxbindstc_lib_headers___depname) $(__uninstall_wxbindstc_dll___depname) $(__uninstall_wxbindstc_dll_headers___depname) $(__uninstall_wxluadebug_lib___depname) $(__uninstall_wxluadebug_lib_headers___depname) $(__uninstall_wxluadebug_dll___depname) $(__uninstall_wxluadebug_dll_headers___depname) $(__uninstall_wxluasocket_lib___depname) $(__uninstall_wxluasocket_lib_headers___depname) $(__uninstall_wxluasocket_dll___depname) $(__uninstall_wxluasocket_dll_headers___depname) $(__uninstall_mod_luamodule___depname) install-strip: install ! $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)lua5.1$(dll___targetsuf3) ! $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) ! $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) ! $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) ! $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) ! $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) $(STRIP) $(DESTDIR)$(libdir)/lua/5.1/$(DLLPREFIX_MODULE)wx.$(SO_SUFFIX_MODULE) --- 813,841 ---- @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf2 = .0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@dll___targetsuf2 = .$(SO_SUFFIX) ! @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_4 = \ ! @COND_PLATFORM_MACOSX_1@ -compatibility_version 5 -current_version 5 ### Targets: ### ! all: $(__lua_lib___depname) $(__lua_dll___depname) $(__wxlua_lib___depname) $(__wxlua_dll___depname) $(__wxbind_lib___depname) $(__wxbind_dll___depname) $(__wxbindstc_lib___depname) $(__wxbindstc_dll___depname) $(__wxbindaui_lib___depname) $(__wxbindaui_dll___depname) $(__wxluadebug_lib___depname) $(__wxluadebug_dll___depname) $(__wxluasocket_lib___depname) $(__wxluasocket_dll___depname) $(__mod_luamodule___depname) ! install: all $(__install_lua_lib___depname) $(__install_lua_lib_headers___depname) $(__install_lua_dll___depname) $(__install_lua_dll_headers___depname) $(__install_wxlua_lib___depname) $(__install_wxlua_lib_headers___depname) $(__install_wxlua_dll___depname) $(__install_wxlua_dll_headers___depname) $(__install_wxbind_lib___depname) $(__install_wxbind_lib_headers___depname) $(__install_wxbind_dll___depname) $(__install_wxbind_dll_headers___depname) $(__install_wxbindstc_lib___depname) $(__install_wxbindstc_lib_headers___depname) $(__install_wxbindstc_dll___depname) $(__install_wxbindstc_dll_headers___depname) $(__install_wxbindaui_lib___depname) $(__install_wxbindaui_lib_headers___depname) $(__install_wxbindaui_dll___depname) $(__install_wxbindaui_dll_headers___depname) $(__install_wxluadebug_lib___depname) $(__install_wxluadebug_lib_headers___depname) $(__install_wxluadebug_dll___depname) $(__install_wxluadebug_dll_headers___depname) $(__install_wxluasocket_lib___depname) $(__install_wxluasocket_lib_headers___depname) $(__install_wxluasocket_dll___depname) $(__install_wxluasocket_dll_headers___depname) $(__install_mod_luamodule___depname) $(__wxbindsrc___depname) $(__wxbindmake___depname) $(__wxbindsetup___depname) ! uninstall: $(__uninstall_lua_lib___depname) $(__uninstall_lua_lib_headers___depname) $(__uninstall_lua_dll___depname) $(__uninstall_lua_dll_headers___depname) $(__uninstall_wxlua_lib___depname) $(__uninstall_wxlua_lib_headers___depname) $(__uninstall_wxlua_dll___depname) $(__uninstall_wxlua_dll_headers___depname) $(__uninstall_wxbind_lib___depname) $(__uninstall_wxbind_lib_headers___depname) $(__uninstall_wxbind_dll___depname) $(__uninstall_wxbind_dll_headers___depname) $(__uninstall_wxbindstc_lib___depname) $(__uninstall_wxbindstc_lib_headers___depname) $(__uninstall_wxbindstc_dll___depname) $(__uninstall_wxbindstc_dll_headers___depname) $(__uninstall_wxbindaui_lib___depname) $(__uninstall_wxbindaui_lib_headers___depname) $(__uninstall_wxbindaui_dll___depname) $(__uninstall_wxbindaui_dll_headers___depname) $(__uninstall_wxluadebug_lib___depname) $(__uninstall_wxluadebug_lib_headers___depname) $(__uninstall_wxluadebug_dll___depname) $(__uninstall_wxluadebug_dll_headers___depname) $(__uninstall_wxluasocket_lib___depname) $(__uninstall_wxluasocket_lib_headers___depname) $(__uninstall_wxluasocket_dll___depname) $(__uninstall_wxluasocket_dll_headers___depname) $(__uninstall_mod_luamodule___depname) install-strip: install ! $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)lua5.1$(__lua_dll___targetsuf3) ! $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx) ! $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx) ! $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx) ! $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindaui-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx) ! $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx) ! $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx) $(STRIP) $(DESTDIR)$(libdir)/lua/5.1/$(DLLPREFIX_MODULE)wx.$(SO_SUFFIX_MODULE) *************** *** 744,768 **** rm -f ./*.o rm -f ../lib/$(LIBPREFIX)lua5.1$(LIBEXT) ! rm -f ../lib/$(DLLPREFIX)lua5.1$(dll___targetsuf3) rm -f ../lib/$(LIBPREFIX)lua5.1.$(DLLIMP_SUFFIX) rm -f ../lib/$(LIBPREFIX)lua5.1.$(DLLIMP_SUFFIX) ../lib/$(DLLPREFIX)lua5.1$(dll___targetsuf2) rm -f ../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) ! rm -f ../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) rm -f ../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) rm -f ../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2) rm -f ../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) ! rm -f ../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) rm -f ../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) rm -f ../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2) rm -f ../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) ! rm -f ../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) rm -f ../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) rm -f ../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2) rm -f ../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) ! rm -f ../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) rm -f ../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) rm -f ../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2) rm -f ../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) ! rm -f ../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) rm -f ../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) rm -f ../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2) --- 844,872 ---- rm -f ./*.o rm -f ../lib/$(LIBPREFIX)lua5.1$(LIBEXT) ! rm -f ../lib/$(DLLPREFIX)lua5.1$(__lua_dll___targetsuf3) rm -f ../lib/$(LIBPREFIX)lua5.1.$(DLLIMP_SUFFIX) rm -f ../lib/$(LIBPREFIX)lua5.1.$(DLLIMP_SUFFIX) ../lib/$(DLLPREFIX)lua5.1$(dll___targetsuf2) rm -f ../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) ! rm -f ../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx) rm -f ../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) rm -f ../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2) rm -f ../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) ! rm -f ../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx) rm -f ../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) rm -f ../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2) rm -f ../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) ! rm -f ../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx) rm -f ../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) rm -f ../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2) + rm -f ../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindaui-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) + rm -f ../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindaui-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx) + rm -f ../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindaui-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) + rm -f ../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindaui-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindaui-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2) rm -f ../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) ! rm -f ../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx) rm -f ../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) rm -f ../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2) rm -f ../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) ! rm -f ../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx) rm -f ../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) rm -f ../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2) *************** *** 798,802 **** @COND_SHARED_0_USE_SYSTEM_LUA_0@ done ! @COND_SHARED_1_USE_SYSTEM_LUA_0@../lib/$(DLLPREFIX)lua5.1$(dll___targetsuf3): $(LUA_DLL_OBJECTS) @COND_SHARED_1_USE_SYSTEM_LUA_0@ $(SHARED_LD_CC) $@ $(LUA_DLL_OBJECTS) $(LDFLAGS) $(__lua_dll___importlib) $(__lua_dll___soname_flags) $(__lua_dll___macver) $(__lua_dll___macinstnamecmd) $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) @COND_SHARED_1_USE_SYSTEM_LUA_0@ --- 902,906 ---- @COND_SHARED_0_USE_SYSTEM_LUA_0@ done ! @COND_SHARED_1_USE_SYSTEM_LUA_0@../lib/$(DLLPREFIX)lua5.1$(__lua_dll___targetsuf3): $(LUA_DLL_OBJECTS) @COND_SHARED_1_USE_SYSTEM_LUA_0@ $(SHARED_LD_CC) $@ $(LUA_DLL_OBJECTS) $(LDFLAGS) $(__lua_dll___importlib) $(__lua_dll___soname_flags) $(__lua_dll___macver) $(__lua_dll___macinstnamecmd) $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) @COND_SHARED_1_USE_SYSTEM_LUA_0@ *************** *** 806,815 **** @COND_SHARED_1_USE_SYSTEM_LUA_0@ $(INSTALL_DIR) $(DESTDIR)$(libdir) @COND_SHARED_1_USE_SYSTEM_LUA_0@ $(INSTALL_DATA) ../lib/$(LIBPREFIX)lua5.1.$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) ! @COND_SHARED_1_USE_SYSTEM_LUA_0@ $(INSTALL_PROGRAM) ../lib/$(DLLPREFIX)lua5.1$(dll___targetsuf3) $(DESTDIR)$(libdir) @COND_SHARED_1_USE_SYSTEM_LUA_0@ (cd $(DESTDIR)$(libdir) ; $(__lua_dll___so_symlinks_inst_cmd)) @COND_SHARED_1_USE_SYSTEM_LUA_0@uninstall_lua_dll: @COND_SHARED_1_USE_SYSTEM_LUA_0@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)lua5.1.$(DLLIMP_SUFFIX) ! @COND_SHARED_1_USE_SYSTEM_LUA_0@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)lua5.1$(dll___targetsuf3) @COND_SHARED_1_USE_SYSTEM_LUA_0@ (cd $(DESTDIR)$(libdir) ; $(__lua_dll___so_symlinks_uninst_cmd)) --- 910,919 ---- @COND_SHARED_1_USE_SYSTEM_LUA_0@ $(INSTALL_DIR) $(DESTDIR)$(libdir) @COND_SHARED_1_USE_SYSTEM_LUA_0@ $(INSTALL_DATA) ../lib/$(LIBPREFIX)lua5.1.$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) ! @COND_SHARED_1_USE_SYSTEM_LUA_0@ $(INSTALL_PROGRAM) ../lib/$(DLLPREFIX)lua5.1$(__lua_dll___targetsuf3) $(DESTDIR)$(libdir) @COND_SHARED_1_USE_SYSTEM_LUA_0@ (cd $(DESTDIR)$(libdir) ; $(__lua_dll___so_symlinks_inst_cmd)) @COND_SHARED_1_USE_SYSTEM_LUA_0@uninstall_lua_dll: @COND_SHARED_1_USE_SYSTEM_LUA_0@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)lua5.1.$(DLLIMP_SUFFIX) ! @COND_SHARED_1_USE_SYSTEM_LUA_0@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)lua5.1$(__lua_dll___targetsuf3) @COND_SHARED_1_USE_SYSTEM_LUA_0@ (cd $(DESTDIR)$(libdir) ; $(__lua_dll___so_symlinks_uninst_cmd)) *************** *** 857,862 **** @COND_SHARED_0@ done ! @COND_SHARED_1@../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3): $(WXLUA_DLL_OBJECTS) ! @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(WXLUA_DLL_OBJECTS) $(LDFLAGS) $(__wxlua_dll___soname_flags) $(__wx) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(__wxlua_dll___importlib) $(__wxlua_dll___macinstnamecmd) $(LIBS) -llua5.1 $(WX_LIBS) @COND_SHARED_1@ @COND_SHARED_1@ $(__wxlua_dll___so_symlinks_cmd) --- 961,966 ---- @COND_SHARED_0@ done ! @COND_SHARED_1@../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx): $(WXLUA_DLL_OBJECTS) ! @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(WXLUA_DLL_OBJECTS) $(LDFLAGS) $(__wxlua_dll___soname_flags) $(__wx_4) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(__wxlua_dll___importlib) $(__wxlua_dll___macinstnamecmd) $(LIBS) -llua5.1 $(WX_LIBS) @COND_SHARED_1@ @COND_SHARED_1@ $(__wxlua_dll___so_symlinks_cmd) *************** *** 868,877 **** @COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) @COND_SHARED_1@ $(INSTALL_DATA) ../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) ! @COND_SHARED_1@ $(INSTALL_PROGRAM) ../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) $(DESTDIR)$(libdir) @COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__wxlua_dll___so_symlinks_inst_cmd)) @COND_SHARED_1@uninstall_wxlua_dll: @COND_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ! @COND_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) @COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__wxlua_dll___so_symlinks_uninst_cmd)) --- 972,981 ---- @COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) @COND_SHARED_1@ $(INSTALL_DATA) ../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) ! @COND_SHARED_1@ $(INSTALL_PROGRAM) ../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx) $(DESTDIR)$(libdir) @COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__wxlua_dll___so_symlinks_inst_cmd)) @COND_SHARED_1@uninstall_wxlua_dll: @COND_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ! @COND_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx) @COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__wxlua_dll___so_symlinks_uninst_cmd)) *************** *** 919,924 **** @COND_SHARED_0@ done ! @COND_SHARED_1@../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3): $(WXBIND_DLL_OBJECTS) ! @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(WXBIND_DLL_OBJECTS) $(LDFLAGS) $(__wxbind_dll___soname_flags) $(__wx) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(__wxbind_dll___importlib) $(__wxbind_dll___macinstnamecmd) $(LIBS) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_SHARED_1@ @COND_SHARED_1@ $(__wxbind_dll___so_symlinks_cmd) --- 1023,1028 ---- @COND_SHARED_0@ done ! @COND_SHARED_1@../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx): $(WXBIND_DLL_OBJECTS) ! @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(WXBIND_DLL_OBJECTS) $(LDFLAGS) $(__wxbind_dll___soname_flags) $(__wx_4) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(__wxbind_dll___importlib) $(__wxbind_dll___macinstnamecmd) $(LIBS) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_SHARED_1@ @COND_SHARED_1@ $(__wxbind_dll___so_symlinks_cmd) *************** *** 930,939 **** @COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) @COND_SHARED_1@ $(INSTALL_DATA) ../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) ! @COND_SHARED_1@ $(INSTALL_PROGRAM) ../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) $(DESTDIR)$(libdir) @COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__wxbind_dll___so_symlinks_inst_cmd)) @COND_SHARED_1@uninstall_wxbind_dll: @COND_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ! @COND_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) @COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__wxbind_dll___so_symlinks_uninst_cmd)) --- 1034,1043 ---- @COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) @COND_SHARED_1@ $(INSTALL_DATA) ../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) ! @COND_SHARED_1@ $(INSTALL_PROGRAM) ../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx) $(DESTDIR)$(libdir) @COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__wxbind_dll___so_symlinks_inst_cmd)) @COND_SHARED_1@uninstall_wxbind_dll: @COND_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ! @COND_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx) @COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__wxbind_dll___so_symlinks_uninst_cmd)) *************** *** 981,986 **** @COND_SHARED_0_USE_WXBINDSTC_1@ done ! @COND_SHARED_1_USE_WXBINDSTC_1@../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3): $(WXBINDSTC_DLL_OBJECTS) ! @COND_SHARED_1_USE_WXBINDSTC_1@ $(SHARED_LD_CXX) $@ $(WXBINDSTC_DLL_OBJECTS) $(LDFLAGS) $(__wxbindstc_dll___soname_flags) $(__wx) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(__wxbindstc_dll___importlib) $(__wxbindstc_dll___macinstnamecmd) $(LIBS) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(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_WXBINDSTC_1@ @COND_SHARED_1_USE_WXBINDSTC_1@ $(__wxbindstc_dll___so_symlinks_cmd) --- 1085,1090 ---- @COND_SHARED_0_USE_WXBINDSTC_1@ done ! @COND_SHARED_1_USE_WXBINDSTC_1@../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx): $(WXBINDSTC_DLL_OBJECTS) ! @COND_SHARED_1_USE_WXBINDSTC_1@ $(SHARED_LD_CXX) $@ $(WXBINDSTC_DLL_OBJECTS) $(LDFLAGS) $(__wxbindstc_dll___soname_flags) $(__wx_4) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(__wxbindstc_dll___importlib) $(__wxbindstc_dll___macinstnamecmd) $(LIBS) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(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_WXBINDSTC_1@ @COND_SHARED_1_USE_WXBINDSTC_1@ $(__wxbindstc_dll___so_symlinks_cmd) *************** *** 992,1001 **** @COND_SHARED_1_USE_WXBINDSTC_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) @COND_SHARED_1_USE_WXBINDSTC_1@ $(INSTALL_DATA) ../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) ! @COND_SHARED_1_USE_WXBINDSTC_1@ $(INSTALL_PROGRAM) ../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) $(DESTDIR)$(libdir) @COND_SHARED_1_USE_WXBINDSTC_1@ (cd $(DESTDIR)$(libdir) ; $(__wxbindstc_dll___so_symlinks_inst_cmd)) @COND_SHARED_1_USE_WXBINDSTC_1@uninstall_wxbindstc_dll: @COND_SHARED_1_USE_WXBINDSTC_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ! @COND_SHARED_1_USE_WXBINDSTC_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) @COND_SHARED_1_USE_WXBINDSTC_1@ (cd $(DESTDIR)$(libdir) ; $(__wxbindstc_dll___so_symlinks_uninst_cmd)) --- 1096,1105 ---- @COND_SHARED_1_USE_WXBINDSTC_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) @COND_SHARED_1_USE_WXBINDSTC_1@ $(INSTALL_DATA) ../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) ! @COND_SHARED_1_USE_WXBINDSTC_1@ $(INSTALL_PROGRAM) ../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx) $(DESTDIR)$(libdir) @COND_SHARED_1_USE_WXBINDSTC_1@ (cd $(DESTDIR)$(libdir) ; $(__wxbindstc_dll___so_symlinks_inst_cmd)) @COND_SHARED_1_USE_WXBINDSTC_1@uninstall_wxbindstc_dll: @COND_SHARED_1_USE_WXBINDSTC_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ! @COND_SHARED_1_USE_WXBINDSTC_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx) @COND_SHARED_1_USE_WXBINDSTC_1@ (cd $(DESTDIR)$(libdir) ; $(__wxbindstc_dll___so_symlinks_uninst_cmd)) *************** *** 1014,1017 **** --- 1118,1183 ---- @COND_SHARED_1_USE_WXBINDSTC_1@ done + @COND_SHARED_0_USE_WXBINDAUI_1@../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindaui-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT): $(WXBINDAUI_LIB_OBJECTS) + @COND_SHARED_0_USE_WXBINDAUI_1@ rm -f $@ + @COND_SHARED_0_USE_WXBINDAUI_1@ $(AR) $(AROPTIONS) $@ $(WXBINDAUI_LIB_OBJECTS) + @COND_SHARED_0_USE_WXBINDAUI_1@ $(RANLIB) $@ + + @COND_USE_PCH_1@.pch/wxprec_wxbindaui_lib/wx/wxprec.h.gch: + @COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_wxbindaui_lib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(WXBINDAUI_LIB_CXXFLAGS) + + @COND_SHARED_0_USE_WXBINDAUI_1@install_wxbindaui_lib: + @COND_SHARED_0_USE_WXBINDAUI_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) + @COND_SHARED_0_USE_WXBINDAUI_1@ $(INSTALL_DATA) ../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindaui-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) $(DESTDIR)$(libdir) + + @COND_SHARED_0_USE_WXBINDAUI_1@uninstall_wxbindaui_lib: + @COND_SHARED_0_USE_WXBINDAUI_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindaui-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) + + @COND_SHARED_0_USE_WXBINDAUI_1@install_wxbindaui_lib_headers: + @COND_SHARED_0_USE_WXBINDAUI_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir) + @COND_SHARED_0_USE_WXBINDAUI_1@ for f in wxbindaui/include/wxbindauidefs.h wxbindaui/include/wxbind.h; do \ + @COND_SHARED_0_USE_WXBINDAUI_1@ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ + @COND_SHARED_0_USE_WXBINDAUI_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ + @COND_SHARED_0_USE_WXBINDAUI_1@ fi; \ + @COND_SHARED_0_USE_WXBINDAUI_1@ $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(includedir)/$$f; \ + @COND_SHARED_0_USE_WXBINDAUI_1@ done + + @COND_SHARED_0_USE_WXBINDAUI_1@uninstall_wxbindaui_lib_headers: + @COND_SHARED_0_USE_WXBINDAUI_1@ for f in wxbindaui/include/wxbindauidefs.h wxbindaui/include/wxbind.h; do \ + @COND_SHARED_0_USE_WXBINDAUI_1@ rm -f $(DESTDIR)$(includedir)/$$f; \ + @COND_SHARED_0_USE_WXBINDAUI_1@ done + + @COND_SHARED_1_USE_WXBINDAUI_1@../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindaui-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx): $(WXBINDAUI_DLL_OBJECTS) + @COND_SHARED_1_USE_WXBINDAUI_1@ $(SHARED_LD_CXX) $@ $(WXBINDAUI_DLL_OBJECTS) $(LDFLAGS) $(__wxbindaui_dll___soname_flags) $(__wx_4) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(__wxbindaui_dll___importlib) $(__wxbindaui_dll___macinstnamecmd) $(LIBS) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(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_WXBINDAUI_1@ + @COND_SHARED_1_USE_WXBINDAUI_1@ $(__wxbindaui_dll___so_symlinks_cmd) + + @COND_USE_PCH_1@.pch/wxprec_wxbindaui_dll/wx/wxprec.h.gch: + @COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_wxbindaui_dll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(WXBINDAUI_DLL_CXXFLAGS) + + @COND_SHARED_1_USE_WXBINDAUI_1@install_wxbindaui_dll: + @COND_SHARED_1_USE_WXBINDAUI_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) + @COND_SHARED_1_USE_WXBINDAUI_1@ $(INSTALL_DATA) ../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindaui-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) + @COND_SHARED_1_USE_WXBINDAUI_1@ $(INSTALL_PROGRAM) ../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindaui-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx) $(DESTDIR)$(libdir) + @COND_SHARED_1_USE_WXBINDAUI_1@ (cd $(DESTDIR)$(libdir) ; $(__wxbindaui_dll___so_symlinks_inst_cmd)) + + @COND_SHARED_1_USE_WXBINDAUI_1@uninstall_wxbindaui_dll: + @COND_SHARED_1_USE_WXBINDAUI_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindaui-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) + @COND_SHARE... [truncated message content] |
|
From: John L. <jr...@us...> - 2007-07-04 05:39:50
|
Update of /cvsroot/wxlua/wxLua/apps/wxluafreeze/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv478/wxLua/apps/wxluafreeze/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/apps/wxluafreeze/src/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile 12 Jun 2007 05:03:16 -0000 1.6 --- Makefile 4 Jul 2007 05:39:13 -0000 1.7 *************** *** 7,108 **** # Makefile for wxLuaFreeze 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 = wxLuaFreeze ! 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) ! GCC_PROFILE = #-pg ! APPEXTRADEFS = $(GCC_PROFILE) -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=$(GCC_PROFILE) -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) $(LUA_LIBS) ! OBJECTS=wxluafreeze.o ! DEPFILES=$(OBJECTS:.o=.d) .cpp.o: $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $< ! all: lua wxLuaLib wxLuaDebugLib wxLuaSocketLib wxLuaBindings wxSTCBindings $(PROGRAM) ! $(PROGRAM): $(OBJECTS) $(LUA_LIBS) wxLuaLib wxLuaDebugLib wxLuaSocketLib wxLuaBindings $(CXX) -o $@ $(OBJECTS) $(LDLIBS) $(APPEXTRALIBS) - 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) --- 7,48 ---- # Makefile for wxLuaFreeze sample using gmake ! PROGRAM = wxLuaFreeze # ---------------------------------------------------------------------------- + # 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 ! # ---------------------------------------------------------------------------- ! HEADERS = ! SOURCES = wxluafreeze.cpp ! OBJECTS=$(SOURCES:.cpp=.o) ! DEPFILES=$(OBJECTS:.o=.d) ! APPEXTRALIBS := -l$(WXLUASTC_LIB) -l$(WXSTC_LIB) $(APPEXTRALIBS) ! # ---------------------------------------------------------------------------- .cpp.o: $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $< ! all: Lua wxLuaLib wxLuaDebugLib wxLuaSocketLib wxLuaBindLib wxSTCBindLib wxAUIBindLib $(PROGRAM) ! $(PROGRAM): $(OBJECTS) $(LUA_LIBS) wxLuaLib wxLuaDebugLib wxLuaSocketLib wxLuaBindLib wxSTCBindLib wxAUIBindLib $(CXX) -o $@ $(OBJECTS) $(LDLIBS) $(APPEXTRALIBS) 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) |
|
From: John L. <jr...@us...> - 2007-07-04 05:39:50
|
Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv478/wxLua/apps/wxluacan/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/apps/wxluacan/src/Makefile,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Makefile 1 Jun 2007 18:19:45 -0000 1.12 --- Makefile 4 Jul 2007 05:39:12 -0000 1.13 *************** *** 7,107 **** # Makefile for wxLuaCan app using gmake - # --- wxLua parameters ------------------------------------------------------- - WXLUA_LIBVERSION_CURRENT = 2 - WXLUA_LIBVERSION_REVISION = 8 - WXLUA_LIBVERSION_AGE = 0 - - WXLUA_DIR = ../../.. - WXLUA_LIBDIR = $(WXEXECDIR) - 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 = wxLuaCan ! 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) ! WXSTC_LIB = $(WXBASENAME)_stc-$(WXRELEASE) ! WXXRC_LIB = $(WXBASENAME)_xrc-$(WXRELEASE) ! WXFL_LIB = $(WXBASENAME)_fl-$(WXRELEASE) ! APPEXTRADEFS = -I$(WXLUA_WXLUASETUP_DIR) -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$(WXXRC_LIB) -l$(WXLUABIND_LIB) -l$(WXLUA_LIB) -l$(WXLUADEBUG_LIB) -l$(WXLUASOCKET_LIB) $(LUA_LIBS) ! OBJECTS = \ ! cancom.o \ ! canlua.o \ ! cansim.o \ ! wxluacan_bind.o \ ! wxluacan.o ! DEPFILES = $(OBJECTS:.o=.d) .cpp.o: $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $< ! all: lua wxLuaLib wxLuaDebugLib wxLuaSocketLib wxLuaBindings $(PROGRAM) $(PROGRAM): $(OBJECTS) $(LUA_LIBS) $(CXX) -o $@ $(OBJECTS) $(LDLIBS) $(APPEXTRALIBS) - lua: - @(cd $(WXLUA_DIR)/modules/lua && make linux) - genwxbind: $(LUA) -e"rulesFilename=\"wxluacan_rules.lua\"" $(WXLUA_DIR)/bindings/genwxbind.lua > error.txt - wxLuaBindings: - @(cd $(WXLUA_DIR)/modules/wxbind/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/wxlua/src && make clean) ! @(cd $(WXLUA_DIR)/modules/wxluadebug/src && make clean) ! @(cd $(WXLUA_DIR)/modules/wxluasocket/src && make clean) ! -include $(DEPFILES) --- 7,51 ---- # Makefile for wxLuaCan app 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 ! # ---------------------------------------------------------------------------- ! PROGRAM = wxLuaCan ! HEADERS = ! SOURCES = cancom.cpp canlua.cpp cansim.cpp wxluacan_bind.cpp wxluacan.cpp ! OBJECTS=$(SOURCES:.cpp=.o) ! DEPFILES=$(OBJECTS:.o=.d) ! #APPEXTRALIBS := ! # ---------------------------------------------------------------------------- .cpp.o: $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $< ! all: Lua wxLuaLib wxLuaDebugLib wxLuaSocketLib wxLuaBindLib $(PROGRAM) $(PROGRAM): $(OBJECTS) $(LUA_LIBS) $(CXX) -o $@ $(OBJECTS) $(LDLIBS) $(APPEXTRALIBS) genwxbind: $(LUA) -e"rulesFilename=\"wxluacan_rules.lua\"" $(WXLUA_DIR)/bindings/genwxbind.lua > error.txt 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) |
|
From: John L. <jr...@us...> - 2007-07-04 05:39:49
|
Update of /cvsroot/wxlua/wxLua/apps/wxluaedit/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv478/wxLua/apps/wxluaedit/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/apps/wxluaedit/src/Makefile,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Makefile 23 May 2007 20:17:24 -0000 1.13 --- Makefile 4 Jul 2007 05:39:13 -0000 1.14 *************** *** 7,113 **** # Makefile for wxLuaEditor app using gmake - # --- wxLua parameters ------------------------------------------------------- - WXLUA_LIBVERSION_CURRENT = 2 - WXLUA_LIBVERSION_REVISION = 8 - WXLUA_LIBVERSION_AGE = 0 - - WXLUA_DIR = ../../.. - WXLUA_LIBDIR = $(WXEXECDIR) - 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 = wxLuaEditor ! 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) ! # The wxSTEditor library name compiled from wxCode/components/wxstedit ! WXSTEDIT_LIB = $(WXBASENAME)_stedit-$(WXRELEASE) ! WXSTEDIT_DIR = $(WXCODE)/components/wxstedit ! APPEXTRADEFS = -I$(WXLUA_DIR) -I$(WXLUA_DIR)/modules -I$(WXLUA_DIR)/modules/lua/include -I$(WXSTEDIT_DIR)/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$(WXSTEDIT_LIB) -l$(WXXRC_LIB) -l$(WXLUABIND_LIB) -l$(WXLUASTC_LIB) -l$(WXLUA_LIB) -l$(WXLUADEBUG_LIB) -l$(WXLUASOCKET_LIB) $(LUA_LIBS) ! OBJECTS = wxluaedit.o wxledit.o ! DEPFILES = $(OBJECTS:.o=.d) .cpp.o: $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $< ! all: lua wxLuaLib wxLuaDebugLib wxLuaSocketLib wxLuaBindings wxLuaSTCBindings wxStEdit $(PROGRAM) $(PROGRAM): $(OBJECTS) $(LUA_LIBS) $(CXX) -o $@ $(OBJECTS) $(LDLIBS) $(APPEXTRALIBS) - lua: - @(cd $(WXLUA_DIR)/modules/lua && make linux) - - bindings: - @(cd $(WXLUA_DIR)/bindings/wxwidgets && make) - - editor: - $(LUA) $(WXLUA_DIR)/util/bin2c/bin2c.lua -t $(WXLUA_DIR)/samples/editor.wx.lua wxLuaEditor > editor.h - - wxLuaBindings: - @(cd $(WXLUA_DIR)/modules/wxbind/src && make) - - wxLuaSTCBindings: - @(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) - - wxStEdit: - @(cd $(WXSTEDIT_DIR)/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)/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) --- 7,48 ---- # Makefile for wxLuaEditor app 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 ! # ---------------------------------------------------------------------------- ! PROGRAM = wxLuaEditor ! HEADERS = ! SOURCES = wxluaedit.cpp wxledit.cpp ! OBJECTS=$(SOURCES:.cpp=.o) ! DEPFILES=$(OBJECTS:.o=.d) ! APPEXTRALIBS := -l$(WXSTEDIT_LIB) -l$(WXLUASTC_LIB) -l$(WXSTC_LIB) $(APPEXTRALIBS) ! # ---------------------------------------------------------------------------- .cpp.o: $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $< ! all: Lua wxLuaLib wxLuaDebugLib wxLuaSocketLib wxLuaBindLib wxSTCBindLib wxAUIBindLib wxStEdit $(PROGRAM) $(PROGRAM): $(OBJECTS) $(LUA_LIBS) $(CXX) -o $@ $(OBJECTS) $(LDLIBS) $(APPEXTRALIBS) 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) |
|
From: John L. <jr...@us...> - 2007-07-04 05:39:49
|
Update of /cvsroot/wxlua/wxLua/apps/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv478/wxLua/apps/wxlua/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/apps/wxlua/src/Makefile,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** Makefile 6 Jun 2007 15:20:14 -0000 1.22 --- Makefile 4 Jul 2007 05:39:12 -0000 1.23 *************** *** 7,119 **** # 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 - - # If we're using cygwin, lua maybe somewhere else, try some common places - # note some other variables cygwin sets don't seem to be exported - ifeq (Cygwin, $(findstring Cygwin, $(XTERM_VERSION))) - LUA=$(WXLUA_DIR)/bin/vc_lib/lua.exe - else - LUA=$(WXLUA_DIR)/bin/lua - endif - # ---------------------------------------------------------------------------- - # --- 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 = wxLua ! 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) $(LUA_LIBS) ! OBJECTS=wxlua.o lconsole.o ! DEPFILES=$(OBJECTS:.o=.d) .cpp.o: $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $< ! all: lua wxLuaLib wxLuaDebugLib wxLuaSocketLib wxLuaBindings wxSTCBindings $(PROGRAM) ! $(PROGRAM): $(OBJECTS) $(LUA_LIBS) wxLuaLib wxLuaDebugLib wxLuaSocketLib wxLuaBindings $(CXX) -o $@ $(OBJECTS) $(LDLIBS) $(APPEXTRALIBS) - lua: - @(cd $(WXLUA_DIR)/modules/lua && make linux) - - wxwidgets_bindings: - @(cd $(WXLUA_DIR)/bindings/wxwidgets && make) - - wxstc_bindings: - @(cd $(WXLUA_DIR)/bindings/wxstc && make) - editor: $(LUA) $(WXLUA_DIR)/util/bin2c/bin2c.lua -t -lf -n wxLuaEditor -o editor.h $(WXLUA_DIR)/samples/editor.wx.lua - 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) --- 7,51 ---- # 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 ! # ---------------------------------------------------------------------------- ! PROGRAM = wxLua ! HEADERS = ! SOURCES = wxlua.cpp lconsole.cpp ! OBJECTS=$(SOURCES:.cpp=.o) ! DEPFILES=$(OBJECTS:.o=.d) ! APPEXTRALIBS := -l$(WXLUASTC_LIB) -l$(WXSTC_LIB) $(APPEXTRALIBS) ! # ---------------------------------------------------------------------------- .cpp.o: $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $< ! all: Lua wxLuaLib wxLuaDebugLib wxLuaSocketLib wxLuaBindLib wxSTCBindLib wxAUIBindLib $(PROGRAM) ! $(PROGRAM): $(OBJECTS) $(LUA_LIBS) $(CXX) -o $@ $(OBJECTS) $(LDLIBS) $(APPEXTRALIBS) editor: $(LUA) $(WXLUA_DIR)/util/bin2c/bin2c.lua -t -lf -n wxLuaEditor -o editor.h $(WXLUA_DIR)/samples/editor.wx.lua 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) |
|
From: John L. <jr...@us...> - 2007-07-04 05:39:48
|
Update of /cvsroot/wxlua/wxLua/apps/build/msvc8 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv478/wxLua/apps/build/msvc8 Modified Files: apps_app_wxlua.vcproj apps_app_wxluacan.vcproj apps_app_wxluaedit.vcproj apps_app_wxluafreeze.vcproj Log Message: Add wxAUI library and rebuild all build files Cleanup Makefiles using wx-config and include common bits to simplify them Index: apps_app_wxluafreeze.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc8/apps_app_wxluafreeze.vcproj,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** apps_app_wxluafreeze.vcproj 6 May 2007 10:01:54 -0000 1.5 --- apps_app_wxluafreeze.vcproj 4 Jul 2007 05:39:11 -0000 1.6 *************** *** 25,29 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 25,29 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 44,48 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 44,48 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 63,67 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 63,67 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 82,86 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 82,86 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 101,105 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 101,105 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 120,124 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 120,124 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 139,143 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 139,143 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 158,162 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 158,162 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 177,181 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 177,181 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 196,200 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 196,200 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 215,219 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 215,219 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 234,238 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 234,238 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 253,257 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 253,257 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 272,276 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 272,276 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_aui.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 291,295 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 291,295 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 310,314 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 310,314 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_aui.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> Index: apps_app_wxlua.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc8/apps_app_wxlua.vcproj,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** apps_app_wxlua.vcproj 6 May 2007 10:01:54 -0000 1.5 --- apps_app_wxlua.vcproj 4 Jul 2007 05:39:11 -0000 1.6 *************** *** 25,29 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_stc.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxlua.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxlua.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 25,29 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_stc.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxlua.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxlua.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 44,48 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxlua.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxlua.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 44,48 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxlua.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxlua.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 63,67 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_stc.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxlua.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxlua.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 63,67 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_stc.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxlua.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxlua.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 82,86 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxlua.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxlua.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 82,86 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxlua.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxlua.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 101,105 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_stc.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxlua.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxlua.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 101,105 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_stc.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxlua.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxlua.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 120,124 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_stc.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxlua.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxlua.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 120,124 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_stc.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxlua.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxlua.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 139,143 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_stc.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxlua.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxlua.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 139,143 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_stc.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxlua.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxlua.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 158,162 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_stc.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxlua.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxlua.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 158,162 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_stc.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxlua.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxlua.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 177,181 **** ... [truncated message content] |
|
From: John L. <jr...@us...> - 2007-07-04 05:39:48
|
Update of /cvsroot/wxlua/wxLua/apps/build/msvc6 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv478/wxLua/apps/build/msvc6 Modified Files: apps_app_wxlua.dsp apps_app_wxluacan.dsp apps_app_wxluaedit.dsp apps_app_wxluafreeze.dsp Log Message: Add wxAUI library and rebuild all build files Cleanup Makefiles using wx-config and include common bits to simplify them Index: apps_app_wxluaedit.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc6/apps_app_wxluaedit.dsp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** apps_app_wxluaedit.dsp 6 May 2007 10:01:54 -0000 1.5 --- apps_app_wxluaedit.dsp 4 Jul 2007 05:39:11 -0000 1.6 *************** *** 66,71 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release Unicode DLL Multilib" --- 66,71 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release Unicode DLL Multilib" *************** *** 91,96 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release Unicode Monolithic" --- 91,96 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release Unicode Monolithic" *************** *** 116,121 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release Unicode Multilib" --- 116,121 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release Unicode Multilib" *************** *** 141,146 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release DLL Monolithic" --- 141,146 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release DLL Monolithic" *************** *** 166,171 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release DLL Multilib" --- 166,171 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release DLL Multilib" *************** *** 191,196 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release Monolithic" --- 191,196 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release Monolithic" *************** *** 216,221 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release Multilib" --- 216,221 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release Multilib" *************** *** 241,246 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug Unicode DLL Monolithic" --- 241,246 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug Unicode DLL Monolithic" *************** *** 266,271 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug Unicode DLL Multilib" --- 266,271 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug Unicode DLL Multilib" *************** *** 291,296 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug Unicode Monolithic" --- 291,296 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug Unicode Monolithic" *************** *** 316,321 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug Unicode Multilib" --- 316,321 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug Unicode Multilib" *************** *** 341,346 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug DLL Monolithic" --- 341,346 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug DLL Monolithic" *************** *** 366,371 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug DLL Multilib" --- 366,371 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug DLL Multilib" *************** *** 391,396 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug Monolithic" --- 391,396 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_aui.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_aui.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug Monolithic" *************** *** 416,421 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug Multilib" --- 416,421 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug Multilib" *************** *** 441,446 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_lib" !ENDIF --- 441,446 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_aui.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_aui.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_lib" !ENDIF Index: apps_app_wxluacan.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc6/apps_app_wxluacan.dsp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** apps_app_wxluacan.dsp 6 May 2007 10:01:54 -0000 1.5 --- apps_app_wxluacan.dsp 4 Jul 2007 05:39:11 -0000 1.6 *************** *** 66,71 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Release Unicode DLL Multilib" --- 66,71 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Release Unicode DLL Multilib" *************** *** 91,96 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Release Unicode Monolithic" --- 91,96 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Release Unicode Monolithic" *************** *** 116,121 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib... [truncated message content] |
|
From: John L. <jr...@us...> - 2007-07-04 05:39:48
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv478/wxLua/apps Modified Files: Makefile.in Log Message: Add wxAUI library and rebuild all build files Cleanup Makefiles using wx-config and include common bits to simplify them Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** Makefile.in 24 May 2007 00:59:43 -0000 1.61 --- Makefile.in 4 Jul 2007 05:39:10 -0000 1.62 *************** *** 245,249 **** @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@../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) $(__app) $(LIBS) -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)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(__app_wxlua___mac_rezcmd) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(__app_wxlua___mac_setfilecmd) --- 245,249 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@../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) $(__app) $(LIBS) -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)_wxbindaui-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(__app_wxlua___mac_rezcmd) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(__app_wxlua___mac_setfilecmd) *************** *** 265,269 **** @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ -e "s/EXECUTABLE/wxLua/" \ ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ -e "s/VERSION/2.8.0/" \ @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(top_srcdir)/distrib/macbundle/Info.plist.in >wxLua.app/Contents/Info.plist @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ --- 265,269 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ -e "s/EXECUTABLE/wxLua/" \ ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ -e "s/VERSION/2.8.4/" \ @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(top_srcdir)/distrib/macbundle/Info.plist.in >wxLua.app/Contents/Info.plist @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ *************** *** 280,284 **** @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@../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) $(__app) $(LIBS) -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)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 -lwxcode_$(WX_PORT)$(WXLIBPOSTFIX)_stedit-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_rezcmd) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_setfilecmd) --- 280,284 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@../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) $(__app) $(LIBS) -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)_wxbindaui-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 -lwxcode_$(WX_PORT)$(WXLIBPOSTFIX)_stedit-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_rezcmd) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_setfilecmd) *************** *** 300,304 **** @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ -e "s/EXECUTABLE/wxLuaEdit/" \ ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ -e "s/VERSION/2.8.0/" \ @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(top_srcdir)/distrib/macbundle/Info.plist.in >wxLuaEdit.app/Contents/Info.plist @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ --- 300,304 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ -e "s/EXECUTABLE/wxLuaEdit/" \ ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ -e "s/VERSION/2.8.4/" \ @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(top_srcdir)/distrib/macbundle/Info.plist.in >wxLuaEdit.app/Contents/Info.plist @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ *************** *** 315,319 **** @COND_USE_WXLUACANAPP_1@../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) $(__app) $(LIBS) -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)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_rezcmd) @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_setfilecmd) --- 315,319 ---- @COND_USE_WXLUACANAPP_1@../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) $(__app) $(LIBS) -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)_wxbindaui-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_rezcmd) @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_setfilecmd) *************** *** 335,339 **** @COND_USE_WXLUACANAPP_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_USE_WXLUACANAPP_1@ -e "s/EXECUTABLE/wxLuaCan/" \ ! @COND_USE_WXLUACANAPP_1@ -e "s/VERSION/2.8.0/" \ @COND_USE_WXLUACANAPP_1@ $(top_srcdir)/distrib/macbundle/Info.plist.in >wxLuaCan.app/Contents/Info.plist @COND_USE_WXLUACANAPP_1@ --- 335,339 ---- @COND_USE_WXLUACANAPP_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_USE_WXLUACANAPP_1@ -e "s/EXECUTABLE/wxLuaCan/" \ ! @COND_USE_WXLUACANAPP_1@ -e "s/VERSION/2.8.4/" \ @COND_USE_WXLUACANAPP_1@ $(top_srcdir)/distrib/macbundle/Info.plist.in >wxLuaCan.app/Contents/Info.plist @COND_USE_WXLUACANAPP_1@ *************** *** 350,354 **** @COND_USE_WXLUAFREEZEAPP_1@../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) $(__app) $(LIBS) -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)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_rezcmd) @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_setfilecmd) --- 350,354 ---- @COND_USE_WXLUAFREEZEAPP_1@../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) $(__app) $(LIBS) -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)_wxbindaui-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_rezcmd) @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_setfilecmd) *************** *** 370,374 **** @COND_USE_WXLUAFREEZEAPP_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_USE_WXLUAFREEZEAPP_1@ -e "s/EXECUTABLE/wxLuaFreeze/" \ ! @COND_USE_WXLUAFREEZEAPP_1@ -e "s/VERSION/2.8.0/" \ @COND_USE_WXLUAFREEZEAPP_1@ $(top_srcdir)/distrib/macbundle/Info.plist.in >wxLuaFreeze.app/Contents/Info.plist @COND_USE_WXLUAFREEZEAPP_1@ --- 370,374 ---- @COND_USE_WXLUAFREEZEAPP_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_USE_WXLUAFREEZEAPP_1@ -e "s/EXECUTABLE/wxLuaFreeze/" \ ! @COND_USE_WXLUAFREEZEAPP_1@ -e "s/VERSION/2.8.4/" \ @COND_USE_WXLUAFREEZEAPP_1@ $(top_srcdir)/distrib/macbundle/Info.plist.in >wxLuaFreeze.app/Contents/Info.plist @COND_USE_WXLUAFREEZEAPP_1@ |
|
From: John L. <jr...@us...> - 2007-07-04 05:39:46
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv478/wxLua Modified Files: Makefile.in Log Message: Add wxAUI library and rebuild all build files Cleanup Makefiles using wx-config and include common bits to simplify them Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/Makefile.in,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** Makefile.in 17 Jun 2007 18:36:04 -0000 1.27 --- Makefile.in 4 Jul 2007 05:39:09 -0000 1.28 *************** *** 79,83 **** samples: @mkdir -p $(DESTDIR)$(datadir)/wxlua/samples ! @for f in samples/validator.wx.lua samples/calculator.wx.lua samples/choices.wx.lua samples/coroutine.wx.lua samples/dialog.wx.lua samples/editor.wx.lua samples/fldemo.wx.lua samples/grid.wx.lua samples/htmlwin.wx.lua samples/luamodule.wx.lua samples/mdi.wx.lua samples/minimal.wx.lua samples/printing.wx.lua samples/scribble.wx.lua samples/sizer.wx.lua samples/tree.wx.lua samples/unittest.wx.lua samples/veryminimal.wx.lua samples/wxluasudoku.wx.lua samples/bindings.wx.lua samples/calculator.xrc; do \ if test ! -f $(DESTDIR)$(datadir)/wxlua/samples/$$f -a ! -d $(DESTDIR)$(datadir)/wxlua/samples/$$f ; \ then x=yep ; \ --- 79,83 ---- samples: @mkdir -p $(DESTDIR)$(datadir)/wxlua/samples ! @for f in samples/validator.wx.lua samples/calculator.wx.lua samples/choices.wx.lua samples/coroutine.wx.lua samples/media.wx.lua samples/dialog.wx.lua samples/editor.wx.lua samples/grid.wx.lua samples/htmlwin.wx.lua samples/luamodule.wx.lua samples/mdi.wx.lua samples/minimal.wx.lua samples/printing.wx.lua samples/scribble.wx.lua samples/sizer.wx.lua samples/tree.wx.lua samples/unittest.wx.lua samples/veryminimal.wx.lua samples/wxluasudoku.wx.lua samples/bindings.wx.lua samples/settings.wx.lua samples/controls.wx.lua samples/picker.wx.lua samples/calculator.xrc; do \ if test ! -f $(DESTDIR)$(datadir)/wxlua/samples/$$f -a ! -d $(DESTDIR)$(datadir)/wxlua/samples/$$f ; \ then x=yep ; \ |
|
From: John L. <jr...@us...> - 2007-07-04 05:39:26
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv478/wxLua/samples Modified Files: luamodule.wx.lua Log Message: Add wxAUI library and rebuild all build files Cleanup Makefiles using wx-config and include common bits to simplify them Index: luamodule.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/luamodule.wx.lua,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** luamodule.wx.lua 25 Jun 2007 03:32:35 -0000 1.5 --- luamodule.wx.lua 4 Jul 2007 05:39:22 -0000 1.6 *************** *** 12,20 **** -- to make this sample script work out-of-the-box, we need to add -- to the paths looked by require() all possible locations of the ! -- wx.dll/.so module. -- Please also note that this sample can be executed only when -- wxLua has been compiled in shared mode (--enable-shared on Unix, -- SHARED=1 on Windows) ! package.cpath = ";;../lib/?.so;./?.dll;../lib/vc_dll/?.dll;../lib/bcc_dll/?.dll;../lib/mingw_dll/?.dll;" require("wx") --- 12,20 ---- -- to make this sample script work out-of-the-box, we need to add -- to the paths looked by require() all possible locations of the ! -- wx.dll/.so module when this script is run from the samples dir. -- Please also note that this sample can be executed only when -- wxLua has been compiled in shared mode (--enable-shared on Unix, -- SHARED=1 on Windows) ! package.cpath = ";;./?.dll;./?.so;../lib/?.so;../lib/vc_dll/?.dll;../lib/bcc_dll/?.dll;../lib/mingw_dll/?.dll;" require("wx") |
|
From: John L. <jr...@us...> - 2007-07-04 05:39:26
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv478/wxLua/modules/wxluasocket/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/wxluasocket/src/Makefile,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Makefile 12 Jun 2007 05:03:17 -0000 1.15 --- Makefile 4 Jul 2007 05:39:22 -0000 1.16 *************** *** 7,44 **** # Makefile for wxLua library using gmake - # --- wxLua parameters ------------------------------------------------------- - WXLUA_LIBVERSION_CURRENT = 2 - WXLUA_LIBVERSION_REVISION = 8 - WXLUA_LIBVERSION_AGE = 0 - - WXLUA_DIR = ../../.. - WXLUA_LIBDIR = $(WXLIB_DIR) - 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) ! GCC_PROFILE = #-pg ! APPEXTRADEFS = $(GCC_PROFILE) -I$(WXLUA_WXLUASETUP_DIR) -I$(WXLUA_DIR) -I$(WXLUA_DIR)/modules -I$(WXLUA_DIR)/modules/lua/include -I$(WXPREFIX)/contrib/include -DLUACALL= ! APPEXTRALIBS = $(GCC_PROFILE) ! TARGET_LIBNAME = lib$(WXBASENAME)_wxluasocket-$(WXRELEASE) TARGET_LIBDIR = $(WXLUA_LIBDIR) --- 7,22 ---- # Makefile for wxLua library 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 ! # ---------------------------------------------------------------------------- ! TARGET_LIBNAME = lib$(WXLUASOCKET_LIB) TARGET_LIBDIR = $(WXLUA_LIBDIR) *************** *** 48,56 **** TARGET_LIB_LINK2 = $(TARGET_LIBNAME).so ! RM = rm -f ! AR = ar ! AROPTIONS = rcu ! RANLIB = ranlib ! LN_S = ln -s HEADERS = \ --- 26,30 ---- TARGET_LIB_LINK2 = $(TARGET_LIBNAME).so ! # ---------------------------------------------------------------------------- HEADERS = \ *************** *** 70,77 **** DEPFILES=$(OBJECTS:.o=.d) .cpp.o: $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $< ! all: $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED) $(TARGET_LIB_STATIC) : $(OBJECTS) --- 44,53 ---- DEPFILES=$(OBJECTS:.o=.d) + # ---------------------------------------------------------------------------- + .cpp.o: $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $< ! all: $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED) $(TARGET_LIB_STATIC) : $(OBJECTS) *************** *** 81,85 **** $(TARGET_LIB_SHARED): $(OBJECTS) ! $(CXX) -shared -o $@ $(OBJECTS) $(APPEXTRALIBS) cd $(TARGET_LIBDIR) \ && $(RM) $(TARGET_LIB_LINK1) $(TARGET_LIB_LINK2) \ --- 57,61 ---- $(TARGET_LIB_SHARED): $(OBJECTS) ! $(CXX) -shared -o $@ $(OBJECTS) $(LIBEXTRALIBS) cd $(TARGET_LIBDIR) \ && $(RM) $(TARGET_LIB_LINK1) $(TARGET_LIB_LINK2) \ *************** *** 93,95 **** --- 69,76 ---- $(TARGET_LIBDIR)/$(TARGET_LIB_LINK2) + # ---------------------------------------------------------------------------- + # Include wxLua targets using wx-config for wxWidgets parameters + + include $(WXLUA_DIR)/build/Makefile_wx-config_targets.in + -include $(DEPFILES) |
|
From: John L. <jr...@us...> - 2007-07-04 05:39:26
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv478/wxLua/modules/wxluadebug/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/wxluadebug/src/Makefile,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Makefile 12 Jun 2007 05:03:17 -0000 1.12 --- Makefile 4 Jul 2007 05:39:22 -0000 1.13 *************** *** 7,44 **** # Makefile for wxLua library using gmake - # --- wxLua parameters ------------------------------------------------------- - WXLUA_LIBVERSION_CURRENT = 2 - WXLUA_LIBVERSION_REVISION = 8 - WXLUA_LIBVERSION_AGE = 0 - - WXLUA_DIR = ../../.. - WXLUA_LIBDIR = $(WXLIB_DIR) - 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) ! GCC_PROFILE = #-pg ! APPEXTRADEFS = $(GCC_PROFILE) -I$(WXLUA_DIR) -I$(WXLUA_DIR)/modules -I$(WXLUA_DIR)/modules/lua/include -I$(WXPREFIX)/contrib/include -DLUACALL= ! APPEXTRALIBS = $(GCC_PROFILE) ! TARGET_LIBNAME = lib$(WXBASENAME)_wxluadebug-$(WXRELEASE) TARGET_LIBDIR = $(WXLUA_LIBDIR) --- 7,22 ---- # Makefile for wxLua library 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 ! # ---------------------------------------------------------------------------- ! TARGET_LIBNAME = lib$(WXLUADEBUG_LIB) TARGET_LIBDIR = $(WXLUA_LIBDIR) *************** *** 48,56 **** TARGET_LIB_LINK2 = $(TARGET_LIBNAME).so ! RM = rm -f ! AR = ar ! AROPTIONS = rcu ! RANLIB = ranlib ! LN_S = ln -s HEADERS = \ --- 26,30 ---- TARGET_LIB_LINK2 = $(TARGET_LIBNAME).so ! # ---------------------------------------------------------------------------- HEADERS = \ *************** *** 65,72 **** DEPFILES=$(OBJECTS:.o=.d) .cpp.o: $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $< ! all: $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED) $(TARGET_LIB_STATIC) : $(OBJECTS) --- 39,48 ---- DEPFILES=$(OBJECTS:.o=.d) + # ---------------------------------------------------------------------------- + .cpp.o: $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $< ! all: $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED) $(TARGET_LIB_STATIC) : $(OBJECTS) *************** *** 76,80 **** $(TARGET_LIB_SHARED): $(OBJECTS) ! $(CXX) -shared -o $@ $(OBJECTS) $(APPEXTRALIBS) cd $(TARGET_LIBDIR) \ && $(RM) $(TARGET_LIB_LINK1) $(TARGET_LIB_LINK2) \ --- 52,56 ---- $(TARGET_LIB_SHARED): $(OBJECTS) ! $(CXX) -shared -o $@ $(OBJECTS) $(LIBEXTRALIBS) cd $(TARGET_LIBDIR) \ && $(RM) $(TARGET_LIB_LINK1) $(TARGET_LIB_LINK2) \ *************** *** 88,90 **** --- 64,71 ---- $(TARGET_LIBDIR)/$(TARGET_LIB_LINK2) + # ---------------------------------------------------------------------------- + # Include wxLua targets using wx-config for wxWidgets parameters + + include $(WXLUA_DIR)/build/Makefile_wx-config_targets.in + -include $(DEPFILES) |
|
From: John L. <jr...@us...> - 2007-07-04 05:39:25
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindstc/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv478/wxLua/modules/wxbindstc/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/wxbindstc/src/Makefile,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Makefile 12 Jun 2007 05:03:17 -0000 1.10 --- Makefile 4 Jul 2007 05:39:21 -0000 1.11 *************** *** 5,56 **** # Copyright: (c) 2002 Lomtick Software. All rights reserved. # ! # Makefile for wxLuaBinding library using gmake ! ! # --- wxLua parameters ------------------------------------------------------- ! WXLUA_LIBVERSION_CURRENT = 2 ! WXLUA_LIBVERSION_REVISION = 8 ! WXLUA_LIBVERSION_AGE = 0 ! ! WXLUA_DIR = ../../.. ! WXLUA_LIBDIR = $(WXLIB_DIR) ! 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) ! GCC_PROFILE = #-pg ! APPEXTRADEFS = $(GCC_PROFILE) -I$(WXLUA_DIR) -I$(WXLUA_DIR)/modules -I$(WXLUA_DIR)/modules/lua/include -I$(WXLUA_WXLUASETUP_DIR) -I$(WXPREFIX)/contrib/include -DLUACALL= ! APPEXTRALIBS = $(GCC_PROFILE) ! WXBIND_TARGET_LIBNAME = lib$(WXBASENAME)_wxluastc-$(WXRELEASE) ! WXBIND_TARGET_LIBDIR = $(WXLUA_LIBDIR) ! WXBIND_TARGET_LIB_STATIC = $(WXBIND_TARGET_LIBDIR)/$(WXBIND_TARGET_LIBNAME).a ! WXBIND_TARGET_LIB_SHARED = $(WXBIND_TARGET_LIBDIR)/$(WXBIND_TARGET_LIBNAME).so.$(WXLUA_LIBVERSION_CURRENT).$(WXLUA_LIBVERSION_REVISION).$(WXLUA_LIBVERSION_AGE) ! WXBIND_TARGET_LIB_LINK1 = $(WXBIND_TARGET_LIBNAME).so.$(WXLUA_LIBVERSION_CURRENT) ! WXBIND_TARGET_LIB_LINK2 = $(WXBIND_TARGET_LIBNAME).so ! RM = rm -f ! AR = ar ! AROPTIONS = rcu ! RANLIB = ranlib ! LN_S = ln -s HEADERS = --- 5,30 ---- # Copyright: (c) 2002 Lomtick Software. All rights reserved. # ! # Makefile for wxLua library 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 ! # ---------------------------------------------------------------------------- ! TARGET_LIBNAME = lib$(WXLUASTC_LIB) ! TARGET_LIBDIR = $(WXLUA_LIBDIR) ! TARGET_LIB_STATIC = $(TARGET_LIBDIR)/$(TARGET_LIBNAME).a ! TARGET_LIB_SHARED = $(TARGET_LIBDIR)/$(TARGET_LIBNAME).so.$(WXLUA_LIBVERSION_CURRENT).$(WXLUA_LIBVERSION_REVISION).$(WXLUA_LIBVERSION_AGE) ! TARGET_LIB_LINK1 = $(TARGET_LIBNAME).so.$(WXLUA_LIBVERSION_CURRENT) ! TARGET_LIB_LINK2 = $(TARGET_LIBNAME).so ! # ---------------------------------------------------------------------------- HEADERS = *************** *** 63,88 **** DEPFILES=$(OBJECTS:.o=.d) .cpp.o: $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $< ! all: $(WXBIND_TARGET_LIB_STATIC) $(WXBIND_TARGET_LIB_SHARED) ! $(WXBIND_TARGET_LIB_STATIC): $(OBJECTS) @$(RM) $@ $(AR) $(AROPTIONS) $@ $(OBJECTS) $(RANLIB) $@ ! $(WXBIND_TARGET_LIB_SHARED): $(OBJECTS) ! $(CXX) -shared -o $@ $(OBJECTS) $(APPEXTRALIBS) ! cd $(WXBIND_TARGET_LIBDIR) \ ! && $(RM) $(WXBIND_TARGET_LIB_LINK1) $(WXBIND_TARGET_LIB_LINK2) \ ! && $(LN_S) $(WXBIND_TARGET_LIB_SHARED) $(WXBIND_TARGET_LIB_LINK1) \ ! && $(LN_S) $(WXBIND_TARGET_LIB_SHARED) $(WXBIND_TARGET_LIB_LINK2) clean: rm -f core $(OBJECTS) $(DEPFILES) \ ! $(WXBIND_TARGET_LIB_STATIC) $(WXBIND_TARGET_LIB_SHARED) \ ! $(WXBIND_TARGET_LIBDIR)/$(WXBIND_TARGET_LIB_LINK1) \ ! $(WXBIND_TARGET_LIBDIR)/$(WXBIND_TARGET_LIB_LINK2) -include $(DEPFILES) --- 37,69 ---- DEPFILES=$(OBJECTS:.o=.d) + # ---------------------------------------------------------------------------- + .cpp.o: $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $< ! all: $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED) ! $(TARGET_LIB_STATIC) : $(OBJECTS) @$(RM) $@ $(AR) $(AROPTIONS) $@ $(OBJECTS) $(RANLIB) $@ ! $(TARGET_LIB_SHARED): $(OBJECTS) ! $(CXX) -shared -o $@ $(OBJECTS) $(LIBEXTRALIBS) ! cd $(TARGET_LIBDIR) \ ! && $(RM) $(TARGET_LIB_LINK1) $(TARGET_LIB_LINK2) \ ! && $(LN_S) $(TARGET_LIB_SHARED) $(TARGET_LIB_LINK1) \ ! && $(LN_S) $(TARGET_LIB_SHARED) $(TARGET_LIB_LINK2) clean: rm -f core $(OBJECTS) $(DEPFILES) \ ! $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED) \ ! $(TARGET_LIBDIR)/$(TARGET_LIB_LINK1) \ ! $(TARGET_LIBDIR)/$(TARGET_LIB_LINK2) ! ! # ---------------------------------------------------------------------------- ! # Include wxLua targets using wx-config for wxWidgets parameters ! ! include $(WXLUA_DIR)/build/Makefile_wx-config_targets.in -include $(DEPFILES) |
|
From: John L. <jr...@us...> - 2007-07-04 05:39:25
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindaui/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv478/wxLua/modules/wxbindaui/src Added Files: Makefile aui.cpp dummy.cpp wxaui_bind.cpp Log Message: Add wxAUI library and rebuild all build files Cleanup Makefiles using wx-config and include common bits to simplify them --- NEW FILE: wxaui_bind.cpp --- // --------------------------------------------------------------------------- // This file was generated by genwxbind.lua // // Any changes made to this file may be lost when file is regenerated. // --------------------------------------------------------------------------- #ifdef __BORLANDC__ #pragma hdrstop #endif #include "wx/wxprec.h" #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/wxlstate.h" #include "wxbindaui/include/wxbind.h" // --------------------------------------------------------------------------- // wxLuaGetEventList_wxaui() is called to register events // --------------------------------------------------------------------------- wxLuaBindEvent* wxLuaGetEventList_wxaui(size_t &count) { static wxLuaBindEvent eventList[] = { #if wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI { "wxEVT_AUI_FIND_MANAGER", &wxEVT_AUI_FIND_MANAGER, &s_wxluatag_wxAuiManagerEvent }, { "wxEVT_AUI_PANE_BUTTON", &wxEVT_AUI_PANE_BUTTON, &s_wxluatag_wxAuiManagerEvent }, { "wxEVT_AUI_PANE_CLOSE", &wxEVT_AUI_PANE_CLOSE, &s_wxluatag_wxAuiManagerEvent }, { "wxEVT_AUI_PANE_MAXIMIZE", &wxEVT_AUI_PANE_MAXIMIZE, &s_wxluatag_wxAuiManagerEvent }, { "wxEVT_AUI_PANE_RESTORE", &wxEVT_AUI_PANE_RESTORE, &s_wxluatag_wxAuiManagerEvent }, { "wxEVT_AUI_RENDER", &wxEVT_AUI_RENDER, &s_wxluatag_wxAuiManagerEvent }, { "wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND", &wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND, &s_wxluatag_wxAuiNotebookEvent }, { "wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG", &wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG, &s_wxluatag_wxAuiNotebookEvent }, { "wxEVT_COMMAND_AUINOTEBOOK_BUTTON", &wxEVT_COMMAND_AUINOTEBOOK_BUTTON, &s_wxluatag_wxAuiNotebookEvent }, { "wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION", &wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION, &s_wxluatag_wxAuiNotebookEvent }, { "wxEVT_COMMAND_AUINOTEBOOK_END_DRAG", &wxEVT_COMMAND_AUINOTEBOOK_END_DRAG, &s_wxluatag_wxAuiNotebookEvent }, { "wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED", &wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, &s_wxluatag_wxAuiNotebookEvent }, { "wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING", &wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, &s_wxluatag_wxAuiNotebookEvent }, { "wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE", &wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE, &s_wxluatag_wxAuiNotebookEvent }, #endif // wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI { 0, 0, 0 }, }; count = sizeof(eventList)/sizeof(wxLuaBindEvent) - 1; return eventList; } // --------------------------------------------------------------------------- // wxLuaGetDefineList_wxaui() is called to register %define and %enum // --------------------------------------------------------------------------- wxLuaBindDefine* wxLuaGetDefineList_wxaui(size_t &count) { static wxLuaBindDefine defineList[] = { #if wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI { "wxAUI_BUTTON_CLOSE", wxAUI_BUTTON_CLOSE }, { "wxAUI_BUTTON_CUSTOM1", wxAUI_BUTTON_CUSTOM1 }, { "wxAUI_BUTTON_CUSTOM2", wxAUI_BUTTON_CUSTOM2 }, { "wxAUI_BUTTON_CUSTOM3", wxAUI_BUTTON_CUSTOM3 }, { "wxAUI_BUTTON_DOWN", wxAUI_BUTTON_DOWN }, { "wxAUI_BUTTON_LEFT", wxAUI_BUTTON_LEFT }, { "wxAUI_BUTTON_MAXIMIZE_RESTORE", wxAUI_BUTTON_MAXIMIZE_RESTORE }, { "wxAUI_BUTTON_MINIMIZE", wxAUI_BUTTON_MINIMIZE }, { "wxAUI_BUTTON_OPTIONS", wxAUI_BUTTON_OPTIONS }, { "wxAUI_BUTTON_PIN", wxAUI_BUTTON_PIN }, { "wxAUI_BUTTON_RIGHT", wxAUI_BUTTON_RIGHT }, { "wxAUI_BUTTON_STATE_CHECKED", wxAUI_BUTTON_STATE_CHECKED }, { "wxAUI_BUTTON_STATE_DISABLED", wxAUI_BUTTON_STATE_DISABLED }, { "wxAUI_BUTTON_STATE_HIDDEN", wxAUI_BUTTON_STATE_HIDDEN }, { "wxAUI_BUTTON_STATE_HOVER", wxAUI_BUTTON_STATE_HOVER }, { "wxAUI_BUTTON_STATE_NORMAL", wxAUI_BUTTON_STATE_NORMAL }, { "wxAUI_BUTTON_STATE_PRESSED", wxAUI_BUTTON_STATE_PRESSED }, { "wxAUI_BUTTON_UP", wxAUI_BUTTON_UP }, { "wxAUI_BUTTON_WINDOWLIST", wxAUI_BUTTON_WINDOWLIST }, { "wxAUI_DOCKART_ACTIVE_CAPTION_COLOUR", wxAUI_DOCKART_ACTIVE_CAPTION_COLOUR }, { "wxAUI_DOCKART_ACTIVE_CAPTION_GRADIENT_COLOUR", wxAUI_DOCKART_ACTIVE_CAPTION_GRADIENT_COLOUR }, { "wxAUI_DOCKART_ACTIVE_CAPTION_TEXT_COLOUR", wxAUI_DOCKART_ACTIVE_CAPTION_TEXT_COLOUR }, { "wxAUI_DOCKART_BACKGROUND_COLOUR", wxAUI_DOCKART_BACKGROUND_COLOUR }, { "wxAUI_DOCKART_BORDER_COLOUR", wxAUI_DOCKART_BORDER_COLOUR }, { "wxAUI_DOCKART_CAPTION_FONT", wxAUI_DOCKART_CAPTION_FONT }, { "wxAUI_DOCKART_CAPTION_SIZE", wxAUI_DOCKART_CAPTION_SIZE }, { "wxAUI_DOCKART_GRADIENT_TYPE", wxAUI_DOCKART_GRADIENT_TYPE }, { "wxAUI_DOCKART_GRIPPER_COLOUR", wxAUI_DOCKART_GRIPPER_COLOUR }, { "wxAUI_DOCKART_GRIPPER_SIZE", wxAUI_DOCKART_GRIPPER_SIZE }, { "wxAUI_DOCKART_INACTIVE_CAPTION_COLOUR", wxAUI_DOCKART_INACTIVE_CAPTION_COLOUR }, { "wxAUI_DOCKART_INACTIVE_CAPTION_GRADIENT_COLOUR", wxAUI_DOCKART_INACTIVE_CAPTION_GRADIENT_COLOUR }, { "wxAUI_DOCKART_INACTIVE_CAPTION_TEXT_COLOUR", wxAUI_DOCKART_INACTIVE_CAPTION_TEXT_COLOUR }, { "wxAUI_DOCKART_PANE_BORDER_SIZE", wxAUI_DOCKART_PANE_BORDER_SIZE }, { "wxAUI_DOCKART_PANE_BUTTON_SIZE", wxAUI_DOCKART_PANE_BUTTON_SIZE }, { "wxAUI_DOCKART_SASH_COLOUR", wxAUI_DOCKART_SASH_COLOUR }, { "wxAUI_DOCKART_SASH_SIZE", wxAUI_DOCKART_SASH_SIZE }, { "wxAUI_DOCK_BOTTOM", wxAUI_DOCK_BOTTOM }, { "wxAUI_DOCK_CENTER", wxAUI_DOCK_CENTER }, { "wxAUI_DOCK_CENTRE", wxAUI_DOCK_CENTRE }, { "wxAUI_DOCK_LEFT", wxAUI_DOCK_LEFT }, { "wxAUI_DOCK_NONE", wxAUI_DOCK_NONE }, { "wxAUI_DOCK_RIGHT", wxAUI_DOCK_RIGHT }, { "wxAUI_DOCK_TOP", wxAUI_DOCK_TOP }, { "wxAUI_GRADIENT_HORIZONTAL", wxAUI_GRADIENT_HORIZONTAL }, { "wxAUI_GRADIENT_NONE", wxAUI_GRADIENT_NONE }, { "wxAUI_GRADIENT_VERTICAL", wxAUI_GRADIENT_VERTICAL }, { "wxAUI_INSERT_DOCK", wxAUI_INSERT_DOCK }, { "wxAUI_INSERT_PANE", wxAUI_INSERT_PANE }, { "wxAUI_INSERT_ROW", wxAUI_INSERT_ROW }, { "wxAUI_MGR_ALLOW_ACTIVE_PANE", wxAUI_MGR_ALLOW_ACTIVE_PANE }, { "wxAUI_MGR_ALLOW_FLOATING", wxAUI_MGR_ALLOW_FLOATING }, { "wxAUI_MGR_DEFAULT", wxAUI_MGR_DEFAULT }, { "wxAUI_MGR_HINT_FADE", wxAUI_MGR_HINT_FADE }, { "wxAUI_MGR_NO_VENETIAN_BLINDS_FADE", wxAUI_MGR_NO_VENETIAN_BLINDS_FADE }, { "wxAUI_MGR_RECTANGLE_HINT", wxAUI_MGR_RECTANGLE_HINT }, { "wxAUI_MGR_TRANSPARENT_DRAG", wxAUI_MGR_TRANSPARENT_DRAG }, { "wxAUI_MGR_TRANSPARENT_HINT", wxAUI_MGR_TRANSPARENT_HINT }, { "wxAUI_MGR_VENETIAN_BLINDS_HINT", wxAUI_MGR_VENETIAN_BLINDS_HINT }, { "wxAUI_NB_BOTTOM", wxAUI_NB_BOTTOM }, { "wxAUI_NB_CLOSE_BUTTON", wxAUI_NB_CLOSE_BUTTON }, { "wxAUI_NB_CLOSE_ON_ACTIVE_TAB", wxAUI_NB_CLOSE_ON_ACTIVE_TAB }, { "wxAUI_NB_CLOSE_ON_ALL_TABS", wxAUI_NB_CLOSE_ON_ALL_TABS }, { "wxAUI_NB_DEFAULT_STYLE", wxAUI_NB_DEFAULT_STYLE }, { "wxAUI_NB_LEFT", wxAUI_NB_LEFT }, { "wxAUI_NB_RIGHT", wxAUI_NB_RIGHT }, { "wxAUI_NB_SCROLL_BUTTONS", wxAUI_NB_SCROLL_BUTTONS }, { "wxAUI_NB_TAB_EXTERNAL_MOVE", wxAUI_NB_TAB_EXTERNAL_MOVE }, { "wxAUI_NB_TAB_FIXED_WIDTH", wxAUI_NB_TAB_FIXED_WIDTH }, { "wxAUI_NB_TAB_MOVE", wxAUI_NB_TAB_MOVE }, { "wxAUI_NB_TAB_SPLIT", wxAUI_NB_TAB_SPLIT }, { "wxAUI_NB_TOP", wxAUI_NB_TOP }, { "wxAUI_NB_WINDOWLIST_BUTTON", wxAUI_NB_WINDOWLIST_BUTTON }, #endif // wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI { 0, 0 }, }; count = sizeof(defineList)/sizeof(wxLuaBindDefine) - 1; return defineList; } // --------------------------------------------------------------------------- // wxLuaGetStringList_wxaui() is called to register %define %string // --------------------------------------------------------------------------- wxLuaBindString* wxLuaGetStringList_wxaui(size_t &count) { static wxLuaBindString stringList[] = { { 0, 0 }, }; count = sizeof(stringList)/sizeof(wxLuaBindString) - 1; return stringList; } // --------------------------------------------------------------------------- // wxLuaGetObjectList_wxaui() is called to register object and pointer bindings // --------------------------------------------------------------------------- wxLuaBindObject* wxLuaGetObjectList_wxaui(size_t &count) { static wxLuaBindObject objectList[] = { #if wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI { "wxAuiNullDockInfo", &s_wxluatag_wxAuiDockInfo, &wxAuiNullDockInfo, NULL }, { "wxAuiNullPaneInfo", &s_wxluatag_wxAuiPaneInfo, &wxAuiNullPaneInfo, NULL }, #endif // wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI { 0, 0, 0, 0 }, }; count = sizeof(objectList)/sizeof(wxLuaBindObject) - 1; return objectList; } // --------------------------------------------------------------------------- // wxLuaGetFunctionList_wxaui() is called to register global functions // --------------------------------------------------------------------------- // --------------------------------------------------------------------------- // wxLuaGetFunctionList_wxaui() is called to register global functions // --------------------------------------------------------------------------- wxLuaBindMethod* wxLuaGetFunctionList_wxaui(size_t &count) { static wxLuaBindMethod functionList[] = { { 0, 0, 0, 0 }, }; count = sizeof(functionList)/sizeof(wxLuaBindMethod) - 1; return functionList; } // --------------------------------------------------------------------------- // wxLuaGetClassList_wxaui() is called to register classes // --------------------------------------------------------------------------- wxLuaBindClass* wxLuaGetClassList_wxaui(size_t &count) { static wxLuaBindClass classList[] = { #if wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI { "wxAuiDefaultDockArt", wxAuiDefaultDockArt_methods, wxAuiDefaultDockArt_methodCount, NULL, &s_wxluatag_wxAuiDefaultDockArt, "wxAuiDockArt", NULL ,s_wxluadefineArray_None, 0, }, { "wxAuiDefaultTabArt", wxAuiDefaultTabArt_methods, wxAuiDefaultTabArt_methodCount, NULL, &s_wxluatag_wxAuiDefaultTabArt, "wxAuiTabArt", NULL ,s_wxluadefineArray_None, 0, }, { "wxAuiDockArt", wxAuiDockArt_methods, wxAuiDockArt_methodCount, NULL, &s_wxluatag_wxAuiDockArt, NULL, NULL ,s_wxluadefineArray_None, 0, }, { "wxAuiDockInfo", wxAuiDockInfo_methods, wxAuiDockInfo_methodCount, NULL, &s_wxluatag_wxAuiDockInfo, NULL, NULL ,s_wxluadefineArray_None, 0, }, { "wxAuiDockUIPart", wxAuiDockUIPart_methods, wxAuiDockUIPart_methodCount, NULL, &s_wxluatag_wxAuiDockUIPart, NULL, NULL ,wxAuiDockUIPart_enums, wxAuiDockUIPart_enumCount, }, { "wxAuiFloatingFrame", wxAuiFloatingFrame_methods, wxAuiFloatingFrame_methodCount, CLASSINFO(wxAuiFloatingFrame), &s_wxluatag_wxAuiFloatingFrame, "wxFrame", NULL ,s_wxluadefineArray_None, 0, }, { "wxAuiManager", wxAuiManager_methods, wxAuiManager_methodCount, CLASSINFO(wxAuiManager), &s_wxluatag_wxAuiManager, "wxEvtHandler", NULL ,s_wxluadefineArray_None, 0, }, { "wxAuiManagerEvent", wxAuiManagerEvent_methods, wxAuiManagerEvent_methodCount, CLASSINFO(wxAuiManagerEvent), &s_wxluatag_wxAuiManagerEvent, "wxEvent", NULL ,s_wxluadefineArray_None, 0, }, { "wxAuiNotebook", wxAuiNotebook_methods, wxAuiNotebook_methodCount, CLASSINFO(wxAuiNotebook), &s_wxluatag_wxAuiNotebook, "wxControl", NULL ,s_wxluadefineArray_None, 0, }, { "wxAuiNotebookEvent", wxAuiNotebookEvent_methods, wxAuiNotebookEvent_methodCount, CLASSINFO(wxAuiNotebookEvent), &s_wxluatag_wxAuiNotebookEvent, "wxNotifyEvent", NULL ,s_wxluadefineArray_None, 0, }, { "wxAuiNotebookPage", wxAuiNotebookPage_methods, wxAuiNotebookPage_methodCount, NULL, &s_wxluatag_wxAuiNotebookPage, NULL, NULL ,s_wxluadefineArray_None, 0, }, { "wxAuiNotebookPageArray", wxAuiNotebookPageArray_methods, wxAuiNotebookPageArray_methodCount, NULL, &s_wxluatag_wxAuiNotebookPageArray, NULL, NULL ,s_wxluadefineArray_None, 0, }, { "wxAuiPaneButton", wxAuiPaneButton_methods, wxAuiPaneButton_methodCount, NULL, &s_wxluatag_wxAuiPaneButton, NULL, NULL ,s_wxluadefineArray_None, 0, }, { "wxAuiPaneInfo", wxAuiPaneInfo_methods, wxAuiPaneInfo_methodCount, NULL, &s_wxluatag_wxAuiPaneInfo, NULL, NULL ,wxAuiPaneInfo_enums, wxAuiPaneInfo_enumCount, }, { "wxAuiPaneInfoArray", wxAuiPaneInfoArray_methods, wxAuiPaneInfoArray_methodCount, NULL, &s_wxluatag_wxAuiPaneInfoArray, NULL, NULL ,s_wxluadefineArray_None, 0, }, { "wxAuiSimpleTabArt", wxAuiSimpleTabArt_methods, wxAuiSimpleTabArt_methodCount, NULL, &s_wxluatag_wxAuiSimpleTabArt, "wxAuiTabArt", NULL ,s_wxluadefineArray_None, 0, }, { "wxAuiTabArt", wxAuiTabArt_methods, wxAuiTabArt_methodCount, NULL, &s_wxluatag_wxAuiTabArt, NULL, NULL ,s_wxluadefineArray_None, 0, }, { "wxAuiTabContainerButton", wxAuiTabContainerButton_methods, wxAuiTabContainerButton_methodCount, NULL, &s_wxluatag_wxAuiTabContainerButton, NULL, NULL ,s_wxluadefineArray_None, 0, }, { "wxAuiTabCtrl", wxAuiTabCtrl_methods, wxAuiTabCtrl_methodCount, CLASSINFO(wxAuiTabCtrl), &s_wxluatag_wxAuiTabCtrl, "wxControl", NULL ,s_wxluadefineArray_None, 0, }, #endif // wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI { 0, 0, 0, 0, 0, 0, 0 }, }; count = sizeof(classList)/sizeof(wxLuaBindClass) - 1; return classList; } // --------------------------------------------------------------------------- // wxLuaBinding_wxaui() - the binding class // --------------------------------------------------------------------------- // binding class extern wxLuaBindClass *wxLuaGetClassList_wxaui(size_t &count); extern wxLuaBindDefine *wxLuaGetDefineList_wxaui(size_t &count); extern wxLuaBindString *wxLuaGetStringList_wxaui(size_t &count); extern wxLuaBindEvent *wxLuaGetEventList_wxaui(size_t &count); extern wxLuaBindObject *wxLuaGetObjectList_wxaui(size_t &count); extern wxLuaBindMethod *wxLuaGetFunctionList_wxaui(size_t &count); IMPLEMENT_DYNAMIC_CLASS(wxLuaBinding_wxaui, wxLuaBinding) wxLuaBinding_wxaui::wxLuaBinding_wxaui() : wxLuaBinding() { m_bindingName = wxT("wxaui"); m_nameSpace = wxT("wxaui"); m_classArray = wxLuaGetClassList_wxaui(m_classCount); m_defineArray = wxLuaGetDefineList_wxaui(m_defineCount); m_stringArray = wxLuaGetStringList_wxaui(m_stringCount); m_eventArray = wxLuaGetEventList_wxaui(m_eventCount); m_objectArray = wxLuaGetObjectList_wxaui(m_objectCount); m_functionArray = wxLuaGetFunctionList_wxaui(m_functionCount); InitBinding(); } void wxLuaBinding_wxaui::PreRegister(const wxLuaState& , bool , int ) { } void wxLuaBinding_wxaui::PostRegister(const wxLuaState& , bool , int ) { } // bind wxLuaBinding_wxaui to a single wxLuaState bool wxLuaBinding_wxaui_bind(const wxLuaState& wxlState_) { wxLuaState wxlState(wxlState_); wxCHECK_MSG(wxlState.Ok(), false, wxT("Invalid wxLuaState")); wxASSERT(!wxlState.GetLuaStateData()->m_bindings_registered); wxASSERT(!wxlState.GetLuaBinding(wxT("wxaui"))); // ignore binding request when we already have wxaui registered if (wxlState.GetLuaBinding(wxT("wxaui"))) return false; wxlState.GetLuaStateData()->m_bindingList.Append(new wxLuaBinding_wxaui()); return true; } // initialize wxLuaBinding_wxaui for all wxLuaStates bool wxLuaBinding_wxaui_init() { static wxLuaBinding_wxaui m_binding; wxLuaBindingList::compatibility_iterator node = wxLuaBinding::GetBindingList()->Find(&m_binding); if (node && (node->GetData() == &m_binding)) return false; wxLuaBinding::GetBindingList()->Append(&m_binding); return true; } #if wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI wxLUA_IMPLEMENT_ENCAPSULATION(wxAuiDefaultDockArt, wxAuiDefaultDockArt) wxLUA_IMPLEMENT_ENCAPSULATION(wxAuiDefaultTabArt, wxAuiDefaultTabArt) wxLUA_IMPLEMENT_ENCAPSULATION(wxAuiDockArt, wxAuiDockArt) wxLUA_IMPLEMENT_ENCAPSULATION(wxAuiDockInfo, wxAuiDockInfo) wxLUA_IMPLEMENT_ENCAPSULATION(wxAuiDockUIPart, wxAuiDockUIPart) wxLUA_IMPLEMENT_ENCAPSULATION(wxAuiNotebookPage, wxAuiNotebookPage) wxLUA_IMPLEMENT_ENCAPSULATION(wxAuiNotebookPageArray, wxAuiNotebookPageArray) wxLUA_IMPLEMENT_ENCAPSULATION(wxAuiPaneButton, wxAuiPaneButton) wxLUA_IMPLEMENT_ENCAPSULATION(wxAuiPaneInfo, wxAuiPaneInfo) wxLUA_IMPLEMENT_ENCAPSULATION(wxAuiPaneInfoArray, wxAuiPaneInfoArray) wxLUA_IMPLEMENT_ENCAPSULATION(wxAuiSimpleTabArt, wxAuiSimpleTabArt) wxLUA_IMPLEMENT_ENCAPSULATION(wxAuiTabArt, wxAuiTabArt) wxLUA_IMPLEMENT_ENCAPSULATION(wxAuiTabContainerButton, wxAuiTabContainerButton) #endif // wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI --- NEW FILE: Makefile --- # File: Makefile # Author: John Labenski, J Winwood # Created: 2002 # Updated: # Copyright: (c) 2002 Lomtick Software. All rights reserved. # # Makefile for wxLua library 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 # ---------------------------------------------------------------------------- TARGET_LIBNAME = lib$(WXLUAAUI_LIB) TARGET_LIBDIR = $(WXLUA_LIBDIR) TARGET_LIB_STATIC = $(TARGET_LIBDIR)/$(TARGET_LIBNAME).a TARGET_LIB_SHARED = $(TARGET_LIBDIR)/$(TARGET_LIBNAME).so.$(WXLUA_LIBVERSION_CURRENT).$(WXLUA_LIBVERSION_REVISION).$(WXLUA_LIBVERSION_AGE) TARGET_LIB_LINK1 = $(TARGET_LIBNAME).so.$(WXLUA_LIBVERSION_CURRENT) TARGET_LIB_LINK2 = $(TARGET_LIBNAME).so # ---------------------------------------------------------------------------- HEADERS = SOURCES = \ aui.cpp \ wxaui_bind.cpp OBJECTS=$(SOURCES:.cpp=.o) DEPFILES=$(OBJECTS:.o=.d) # ---------------------------------------------------------------------------- .cpp.o: $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $< all: $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED) $(TARGET_LIB_STATIC) : $(OBJECTS) @$(RM) $@ $(AR) $(AROPTIONS) $@ $(OBJECTS) $(RANLIB) $@ $(TARGET_LIB_SHARED): $(OBJECTS) $(CXX) -shared -o $@ $(OBJECTS) $(LIBEXTRALIBS) cd $(TARGET_LIBDIR) \ && $(RM) $(TARGET_LIB_LINK1) $(TARGET_LIB_LINK2) \ && $(LN_S) $(TARGET_LIB_SHARED) $(TARGET_LIB_LINK1) \ && $(LN_S) $(TARGET_LIB_SHARED) $(TARGET_LIB_LINK2) clean: rm -f core $(OBJECTS) $(DEPFILES) \ $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED) \ $(TARGET_LIBDIR)/$(TARGET_LIB_LINK1) \ $(TARGET_LIBDIR)/$(TARGET_LIB_LINK2) # ---------------------------------------------------------------------------- # Include wxLua targets using wx-config for wxWidgets parameters include $(WXLUA_DIR)/build/Makefile_wx-config_targets.in -include $(DEPFILES) --- NEW FILE: dummy.cpp --- /* * File: src/common/dummy.cpp * Purpose: See below * Author: Julian Smart * Created: 1993 * Updated: * Copyright: (c) 1993, AIAI, University of Edinburgh */ /* A dummy file to include wx.h. If precompiling wx.h, * always start by compiling this and producing the PCH file. * Then subsequent source files use the PCH file. * * If precompiling wx.h for wxWidgets and derived apps, * link dummy.obj with your program. * * This will produce a big PCH file. */ #include "wx/wxprec.h" #ifdef __BORLANDC__ #pragma hdrstop #endif #ifdef __WXMSW__ #include "wx/msw/msvcrt.h" #endif #ifdef __VISAGECPP__ char wxDummyChar = 0; #endif --- NEW FILE: aui.cpp --- // --------------------------------------------------------------------------- // This file was generated by genwxbind.lua // // Any changes made to this file may be lost when file is regenerated. // --------------------------------------------------------------------------- #ifdef __BORLANDC__ #pragma hdrstop #endif #include "wx/wxprec.h" #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/wxlstate.h" #include "wxbindaui/include/wxbind.h" [...7441 lines suppressed...] } // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxAuiPaneButton_methods[] = { // %member { "Get_button_id", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiPaneButton_Get_button_id, 1, NULL }, // %member { "Set_button_id", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiPaneButton_Set_button_id, 1, NULL }, { "button_id", WXLUAMETHOD_SETPROP, s_wxluafunc_wxLua_wxAuiPaneButton_Set_button_id, 1, NULL }, { "button_id", WXLUAMETHOD_GETPROP, s_wxluafunc_wxLua_wxAuiPaneButton_Get_button_id, 1, NULL }, { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxAuiPaneButton_delete, 1, NULL }, { 0, 0, 0, 0 }, }; int wxAuiPaneButton_methodCount = sizeof(wxAuiPaneButton_methods)/sizeof(wxLuaBindMethod) - 1; #endif // wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI |
|
From: John L. <jr...@us...> - 2007-07-04 05:39:24
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindaui/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv478/wxLua/modules/wxbindaui/include Added Files: wxbind.h wxbindauidefs.h Log Message: Add wxAUI library and rebuild all build files Cleanup Makefiles using wx-config and include common bits to simplify them --- NEW FILE: wxbindauidefs.h --- /////////////////////////////////////////////////////////////////////////////// // Name: wxbindauidefs.h // Purpose: definitions for wxBindAUI module // Author: Francesco Montorsi // Modified by: // Created: 20/5/2006 // RCS-ID: $Id: wxbindauidefs.h,v 1.1 2007/07/04 05:39:20 jrl1 Exp $ // Copyright: (c) Francesco Montorsi // Licence: wxWidgets licence /////////////////////////////////////////////////////////////////////////////// #ifndef __WX_WXBINDAUIDEFS_H__ #define __WX_WXBINDAUIDEFS_H__ #include "wx/defs.h" // ---------------------------------------------------------------------------- // WXDLLIMPEXP macros // ---------------------------------------------------------------------------- #ifdef WXMAKINGDLL_WXBINDAUI #define WXDLLIMPEXP_WXBINDAUI WXEXPORT #define WXDLLIMPEXP_DATA_WXBINDAUI(type) WXEXPORT type #elif defined(WXUSINGDLL) #define WXDLLIMPEXP_WXBINDAUI WXIMPORT #define WXDLLIMPEXP_DATA_WXBINDAUI(type) WXIMPORT type #else // not making nor using DLL #define WXDLLIMPEXP_WXBINDAUI #define WXDLLIMPEXP_DATA_WXBINDAUI(type) type #endif #endif // __WX_WXBINDAUIDEFS_H__ --- NEW FILE: wxbind.h --- // --------------------------------------------------------------------------- // wxaui.h - headers and tags for wxLua binding // // This file was generated by genwxbind.lua // Any changes made to this file may be lost when file is regenerated // --------------------------------------------------------------------------- #ifndef __HOOK_WXLUA_wxaui_H__ #define __HOOK_WXLUA_wxaui_H__ #include "wx/defs.h" #include "wxbind/include/wxbind.h" #include "wxbindaui/include/wxbindauidefs.h" #ifndef wxUSE_WAVE #define wxUSE_WAVE 0 #endif #ifndef wxUSE_SOUND #define wxUSE_SOUND 0 #endif #include "wxlua/include/wxlstate.h" #include "wxlua/include/wxlbind.h" // --------------------------------------------------------------------------- // Check if the version of binding generator used to create this is older than // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' #if WXLUA_BINDING_VERSION > 14 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." #endif //WXLUA_BINDING_VERSION > 14 // --------------------------------------------------------------------------- // binding class class wxLuaBinding_wxaui : public wxLuaBinding { public: wxLuaBinding_wxaui(); virtual wxLuaBinding* Clone() const { return new wxLuaBinding_wxaui; } protected: virtual void PreRegister(const wxLuaState& wxlState, bool registerTypes, int luaTable); virtual void PostRegister(const wxLuaState& wxlState, bool registerTypes, int luaTable); DECLARE_DYNAMIC_CLASS(wxLuaBinding_wxaui) }; // bind wxLuaBinding_wxaui to a single wxLuaState extern WXDLLIMPEXP_WXBINDAUI bool wxLuaBinding_wxaui_bind(const wxLuaState& wxlState); // initialize wxLuaBinding_wxaui for all wxLuaStates extern WXDLLIMPEXP_WXBINDAUI bool wxLuaBinding_wxaui_init(); // --------------------------------------------------------------------------- // Includes // --------------------------------------------------------------------------- #if wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI #include "wx/aui/aui.h" #endif // wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI // --------------------------------------------------------------------------- // Lua Tag Method Values and Tables for each Class // --------------------------------------------------------------------------- #if wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI extern WXDLLIMPEXP_DATA_WXBINDAUI(int) s_wxluatag_wxAuiDefaultDockArt; extern WXDLLIMPEXP_WXBINDAUI wxLuaBindMethod wxAuiDefaultDockArt_methods[]; extern WXDLLIMPEXP_DATA_WXBINDAUI(int) wxAuiDefaultDockArt_methodCount; extern WXDLLIMPEXP_DATA_WXBINDAUI(int) s_wxluatag_wxAuiDefaultTabArt; extern WXDLLIMPEXP_WXBINDAUI wxLuaBindMethod wxAuiDefaultTabArt_methods[]; extern WXDLLIMPEXP_DATA_WXBINDAUI(int) wxAuiDefaultTabArt_methodCount; extern WXDLLIMPEXP_DATA_WXBINDAUI(int) s_wxluatag_wxAuiDockArt; extern WXDLLIMPEXP_WXBINDAUI wxLuaBindMethod wxAuiDockArt_methods[]; extern WXDLLIMPEXP_DATA_WXBINDAUI(int) wxAuiDockArt_methodCount; extern WXDLLIMPEXP_DATA_WXBINDAUI(int) s_wxluatag_wxAuiDockInfo; extern WXDLLIMPEXP_WXBINDAUI wxLuaBindMethod wxAuiDockInfo_methods[]; extern WXDLLIMPEXP_DATA_WXBINDAUI(int) wxAuiDockInfo_methodCount; extern WXDLLIMPEXP_DATA_WXBINDAUI(int) s_wxluatag_wxAuiDockUIPart; extern WXDLLIMPEXP_WXBINDAUI wxLuaBindMethod wxAuiDockUIPart_methods[]; extern WXDLLIMPEXP_DATA_WXBINDAUI(int) wxAuiDockUIPart_methodCount; extern WXDLLIMPEXP_WXBINDAUI wxLuaBindDefine wxAuiDockUIPart_enums[]; extern WXDLLIMPEXP_DATA_WXBINDAUI(int) wxAuiDockUIPart_enumCount; extern WXDLLIMPEXP_DATA_WXBINDAUI(int) s_wxluatag_wxAuiFloatingFrame; extern WXDLLIMPEXP_WXBINDAUI wxLuaBindMethod wxAuiFloatingFrame_methods[]; extern WXDLLIMPEXP_DATA_WXBINDAUI(int) wxAuiFloatingFrame_methodCount; extern WXDLLIMPEXP_DATA_WXBINDAUI(int) s_wxluatag_wxAuiManager; extern WXDLLIMPEXP_WXBINDAUI wxLuaBindMethod wxAuiManager_methods[]; extern WXDLLIMPEXP_DATA_WXBINDAUI(int) wxAuiManager_methodCount; extern WXDLLIMPEXP_DATA_WXBINDAUI(int) s_wxluatag_wxAuiManagerEvent; extern WXDLLIMPEXP_WXBINDAUI wxLuaBindMethod wxAuiManagerEvent_methods[]; extern WXDLLIMPEXP_DATA_WXBINDAUI(int) wxAuiManagerEvent_methodCount; extern WXDLLIMPEXP_DATA_WXBINDAUI(int) s_wxluatag_wxAuiNotebook; extern WXDLLIMPEXP_WXBINDAUI wxLuaBindMethod wxAuiNotebook_methods[]; extern WXDLLIMPEXP_DATA_WXBINDAUI(int) wxAuiNotebook_methodCount; extern WXDLLIMPEXP_DATA_WXBINDAUI(int) s_wxluatag_wxAuiNotebookEvent; extern WXDLLIMPEXP_WXBINDAUI wxLuaBindMethod wxAuiNotebookEvent_methods[]; extern WXDLLIMPEXP_DATA_WXBINDAUI(int) wxAuiNotebookEvent_methodCount; extern WXDLLIMPEXP_DATA_WXBINDAUI(int) s_wxluatag_wxAuiNotebookPage; extern WXDLLIMPEXP_WXBINDAUI wxLuaBindMethod wxAuiNotebookPage_methods[]; extern WXDLLIMPEXP_DATA_WXBINDAUI(int) wxAuiNotebookPage_methodCount; extern WXDLLIMPEXP_DATA_WXBINDAUI(int) s_wxluatag_wxAuiNotebookPageArray; extern WXDLLIMPEXP_WXBINDAUI wxLuaBindMethod wxAuiNotebookPageArray_methods[]; extern WXDLLIMPEXP_DATA_WXBINDAUI(int) wxAuiNotebookPageArray_methodCount; extern WXDLLIMPEXP_DATA_WXBINDAUI(int) s_wxluatag_wxAuiPaneButton; extern WXDLLIMPEXP_WXBINDAUI wxLuaBindMethod wxAuiPaneButton_methods[]; extern WXDLLIMPEXP_DATA_WXBINDAUI(int) wxAuiPaneButton_methodCount; extern WXDLLIMPEXP_DATA_WXBINDAUI(int) s_wxluatag_wxAuiPaneInfo; extern WXDLLIMPEXP_WXBINDAUI wxLuaBindMethod wxAuiPaneInfo_methods[]; extern WXDLLIMPEXP_DATA_WXBINDAUI(int) wxAuiPaneInfo_methodCount; extern WXDLLIMPEXP_WXBINDAUI wxLuaBindDefine wxAuiPaneInfo_enums[]; extern WXDLLIMPEXP_DATA_WXBINDAUI(int) wxAuiPaneInfo_enumCount; extern WXDLLIMPEXP_DATA_WXBINDAUI(int) s_wxluatag_wxAuiPaneInfoArray; extern WXDLLIMPEXP_WXBINDAUI wxLuaBindMethod wxAuiPaneInfoArray_methods[]; extern WXDLLIMPEXP_DATA_WXBINDAUI(int) wxAuiPaneInfoArray_methodCount; extern WXDLLIMPEXP_DATA_WXBINDAUI(int) s_wxluatag_wxAuiSimpleTabArt; extern WXDLLIMPEXP_WXBINDAUI wxLuaBindMethod wxAuiSimpleTabArt_methods[]; extern WXDLLIMPEXP_DATA_WXBINDAUI(int) wxAuiSimpleTabArt_methodCount; extern WXDLLIMPEXP_DATA_WXBINDAUI(int) s_wxluatag_wxAuiTabArt; extern WXDLLIMPEXP_WXBINDAUI wxLuaBindMethod wxAuiTabArt_methods[]; extern WXDLLIMPEXP_DATA_WXBINDAUI(int) wxAuiTabArt_methodCount; extern WXDLLIMPEXP_DATA_WXBINDAUI(int) s_wxluatag_wxAuiTabContainerButton; extern WXDLLIMPEXP_WXBINDAUI wxLuaBindMethod wxAuiTabContainerButton_methods[]; extern WXDLLIMPEXP_DATA_WXBINDAUI(int) wxAuiTabContainerButton_methodCount; extern WXDLLIMPEXP_DATA_WXBINDAUI(int) s_wxluatag_wxAuiTabCtrl; extern WXDLLIMPEXP_WXBINDAUI wxLuaBindMethod wxAuiTabCtrl_methods[]; extern WXDLLIMPEXP_DATA_WXBINDAUI(int) wxAuiTabCtrl_methodCount; #endif // wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI // --------------------------------------------------------------------------- // Encapsulation Declarations - need to be public for other bindings. // --------------------------------------------------------------------------- #if wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBINDAUI, wxAuiDefaultDockArt, wxAuiDefaultDockArt) wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBINDAUI, wxAuiDefaultTabArt, wxAuiDefaultTabArt) wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBINDAUI, wxAuiDockArt, wxAuiDockArt) wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBINDAUI, wxAuiDockInfo, wxAuiDockInfo) wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBINDAUI, wxAuiDockUIPart, wxAuiDockUIPart) wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBINDAUI, wxAuiNotebookPage, wxAuiNotebookPage) wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBINDAUI, wxAuiNotebookPageArray, wxAuiNotebookPageArray) wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBINDAUI, wxAuiPaneButton, wxAuiPaneButton) wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBINDAUI, wxAuiPaneInfo, wxAuiPaneInfo) wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBINDAUI, wxAuiPaneInfoArray, wxAuiPaneInfoArray) wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBINDAUI, wxAuiSimpleTabArt, wxAuiSimpleTabArt) wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBINDAUI, wxAuiTabArt, wxAuiTabArt) wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBINDAUI, wxAuiTabContainerButton, wxAuiTabContainerButton) #endif // wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI #endif // __HOOK_WXLUA_wxaui_H__ |
|
From: John L. <jr...@us...> - 2007-07-04 05:39:18
|
Update of /cvsroot/wxlua/wxLua/bindings/wxaui In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv478/wxLua/bindings/wxaui Added Files: Makefile aui.i wxaui_rules.lua Log Message: Add wxAUI library and rebuild all build files Cleanup Makefiles using wx-config and include common bits to simplify them --- NEW FILE: aui.i --- // =========================================================================== // Purpose: wxAUI // Author: John Labenski // Created: 07/03/2007 // Copyright: (c) 2007 John Labenski. All rights reserved. // Licence: wxWidgets licence // =========================================================================== // NOTE: This file is mostly copied from wxWidget's include/aui/*.h headers // to make updating it easier. %if wxLUA_USE_wxAUI && %wxchkver_2_8 && wxUSE_AUI %include "wx/aui/aui.h" // --------------------------------------------------------------------------- // --------------------------------------------------------------------------- //%include "wx/aui/auibook.h" // already included by aui.h %enum wxAuiNotebookOption wxAUI_NB_TOP wxAUI_NB_LEFT // not implemented yet wxAUI_NB_RIGHT // not implemented yet wxAUI_NB_BOTTOM // not implemented yet wxAUI_NB_TAB_SPLIT wxAUI_NB_TAB_MOVE wxAUI_NB_TAB_EXTERNAL_MOVE wxAUI_NB_TAB_FIXED_WIDTH wxAUI_NB_SCROLL_BUTTONS wxAUI_NB_WINDOWLIST_BUTTON wxAUI_NB_CLOSE_BUTTON wxAUI_NB_CLOSE_ON_ACTIVE_TAB wxAUI_NB_CLOSE_ON_ALL_TABS wxAUI_NB_DEFAULT_STYLE //= wxAUI_NB_TOP|wxAUI_NB_TAB_SPLIT|wxAUI_NB_TAB_MOVE|wxAUI_NB_SCROLL_BUTTONS|wxAUI_NB_CLOSE_ON_ACTIVE_TAB %endenum // --------------------------------------------------------------------------- // wxAuiNotebookEvent %class %delete wxAuiNotebookEvent, wxNotifyEvent %define_event wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE // EVT_AUINOTEBOOK_PAGE_CLOSE(winid, fn) %define_event wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED // EVT_AUINOTEBOOK_PAGE_CHANGED(winid, fn) %define_event wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING // EVT_AUINOTEBOOK_PAGE_CHANGING(winid, fn) %define_event wxEVT_COMMAND_AUINOTEBOOK_BUTTON // EVT_AUINOTEBOOK_BUTTON(winid, fn) %define_event wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG // EVT_AUINOTEBOOK_BEGIN_DRAG(winid, fn) %define_event wxEVT_COMMAND_AUINOTEBOOK_END_DRAG // EVT_AUINOTEBOOK_END_DRAG(winid, fn) %define_event wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION // EVT_AUINOTEBOOK_DRAG_MOTION(winid, fn) %define_event wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND // EVT_AUINOTEBOOK_ALLOW_DND(winid, fn) wxAuiNotebookEvent(wxEventType command_type = wxEVT_NULL, int win_id = 0) wxAuiNotebookEvent(const wxAuiNotebookEvent& c) void SetSelection(int s) int GetSelection() const void SetOldSelection(int s) int GetOldSelection() const void SetDragSource(wxAuiNotebook* s) wxAuiNotebook* GetDragSource() const %endclass // --------------------------------------------------------------------------- // wxAuiNotebookPage %class %delete %noclassinfo %encapsulate wxAuiNotebookPage %member wxWindow* window; // page's associated window %member wxString caption; // caption displayed on the tab %member wxBitmap bitmap; // tab's bitmap %member wxRect rect; // tab's hit rectangle %member bool active; // true if the page is currently active %endclass // --------------------------------------------------------------------------- // wxAuiNotebookPageArray %class %delete %noclassinfo %encapsulate wxAuiNotebookPageArray wxAuiNotebookPageArray() wxAuiNotebookPageArray(const wxAuiNotebookPageArray& array) void Add(wxAuiNotebookPage* page) void Clear() int GetCount() const void Insert(wxAuiNotebookPage* page, int nIndex) bool IsEmpty() wxAuiNotebookPage Item(size_t nIndex) const void RemoveAt(size_t nIndex) %endclass // --------------------------------------------------------------------------- // wxAuiTabContainerButton %class %delete %noclassinfo %encapsulate wxAuiTabContainerButton %member int id; // button's id %member int cur_state; // current state (normal, hover, pressed, etc.) %member int location; // buttons location (wxLEFT, wxRIGHT, or wxCENTER) %member wxBitmap bitmap; // button's hover bitmap %member wxBitmap dis_bitmap; // button's disabled bitmap %member wxRect rect; // button's hit rectangle %endclass //WX_DECLARE_USER_EXPORTED_OBJARRAY(wxAuiTabContainerButton, wxAuiTabContainerButtonArray, WXDLLIMPEXP_AUI); // --------------------------------------------------------------------------- // wxAuiTabArt %class %delete %noclassinfo %encapsulate wxAuiTabArt // wxAuiTabArt() No constructor - base class %gc virtual wxAuiTabArt* Clone() //= 0; virtual void SetFlags(unsigned int flags) //= 0; virtual void SetSizingInfo(const wxSize& tab_ctrl_size, size_t tab_count) //= 0; virtual void SetNormalFont(const wxFont& font) //= 0; virtual void SetSelectedFont(const wxFont& font) //= 0; virtual void SetMeasuringFont(const wxFont& font) //= 0; virtual void DrawBackground( wxDC& dc, wxWindow* wnd, const wxRect& rect) //= 0; virtual void DrawTab(wxDC& dc, wxWindow* wnd, const wxAuiNotebookPage& pane, const wxRect& in_rect, int close_button_state, wxRect* out_tab_rect, wxRect* out_button_rect, int* x_extent) //= 0; virtual void DrawButton( wxDC& dc, wxWindow* wnd, const wxRect& in_rect, int bitmap_id, int button_state, int orientation, wxRect* out_rect) //= 0; virtual wxSize GetTabSize( wxDC& dc, wxWindow* wnd, const wxString& caption, const wxBitmap& bitmap, bool active, int close_button_state, int* x_extent) //= 0; virtual int ShowDropDown( wxWindow* wnd, const wxAuiNotebookPageArray& items, int active_idx) //= 0; virtual int GetIndentSize() //= 0; virtual int GetBestTabCtrlSize( wxWindow* wnd, const wxAuiNotebookPageArray& pages, const wxSize& required_bmp_size) //= 0; %endclass // --------------------------------------------------------------------------- // wxAuiDefaultTabArt %class %delete %noclassinfo %encapsulate wxAuiDefaultTabArt, wxAuiTabArt wxAuiDefaultTabArt(); %endclass // --------------------------------------------------------------------------- // wxAuiSimpleTabArt %class %delete %noclassinfo %encapsulate wxAuiSimpleTabArt, wxAuiTabArt wxAuiSimpleTabArt(); %endclass // --------------------------------------------------------------------------- // wxAuiTabContainer //%class %delete %noclassinfo %encapsulate wxAuiTabContainer // wxAuiTabContainer(); // // All methods put into wxAuiTabCtrl since this isn't the base class of anything else // //%endclass // --------------------------------------------------------------------------- // wxAuiTabCtrl %class wxAuiTabCtrl, wxControl //, wxAuiTabContainer wxAuiTabCtrl(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0); void SetArtProvider(wxAuiTabArt* art); wxAuiTabArt* GetArtProvider() const; void SetFlags(unsigned int flags); unsigned int GetFlags() const; bool AddPage(wxWindow* page, const wxAuiNotebookPage& info); bool InsertPage(wxWindow* page, const wxAuiNotebookPage& info, size_t idx); bool MovePage(wxWindow* page, size_t new_idx); bool RemovePage(wxWindow* page); bool SetActivePage(wxWindow* page); bool SetActivePage(size_t page); void SetNoneActive(); int GetActivePage() const; bool TabHitTest(int x, int y, wxWindow** hit) const; bool ButtonHitTest(int x, int y, wxAuiTabContainerButton** hit) const; wxWindow* GetWindowFromIdx(size_t idx) const; int GetIdxFromWindow(wxWindow* page) const; size_t GetPageCount() const; wxAuiNotebookPage& GetPage(size_t idx); const wxAuiNotebookPage& GetPage(size_t idx) const; wxAuiNotebookPageArray& GetPages(); void SetNormalFont(const wxFont& normal_font); void SetSelectedFont(const wxFont& selected_font); void SetMeasuringFont(const wxFont& measuring_font); void DoShowHide(); void SetRect(const wxRect& rect); void RemoveButton(int id); void AddButton(int id, int location, const wxBitmap& normal_bitmap = wxNullBitmap, const wxBitmap& disabled_bitmap = wxNullBitmap); size_t GetTabOffset() const; void SetTabOffset(size_t offset); %endclass // --------------------------------------------------------------------------- // wxAuiNotebook %class wxAuiNotebook, wxControl wxAuiNotebook(); wxAuiNotebook(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxAUI_NB_DEFAULT_STYLE); bool Create(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0); void SetWindowStyleFlag(long style); void SetArtProvider(wxAuiTabArt* art); wxAuiTabArt* GetArtProvider() const; virtual void SetUniformBitmapSize(const wxSize& size); virtual void SetTabCtrlHeight(int height); bool AddPage(wxWindow* page, const wxString& caption, bool select = false, const wxBitmap& bitmap = wxNullBitmap); bool InsertPage(size_t page_idx, wxWindow* page, const wxString& caption, bool select = false, const wxBitmap& bitmap = wxNullBitmap); bool DeletePage(size_t page); bool RemovePage(size_t page); size_t GetPageCount() const; wxWindow* GetPage(size_t page_idx) const; int GetPageIndex(wxWindow* page_wnd) const; bool SetPageText(size_t page, const wxString& text); wxString GetPageText(size_t page_idx) const; bool SetPageBitmap(size_t page, const wxBitmap& bitmap); wxBitmap GetPageBitmap(size_t page_idx) const; size_t SetSelection(size_t new_page); int GetSelection() const; virtual void Split(size_t page, int direction); //#if wxABI_VERSION >= 20801 const wxAuiManager& GetAuiManager() const //#endif //#if wxABI_VERSION >= 20805 // Sets the normal font void SetNormalFont(const wxFont& font); // Sets the selected tab font void SetSelectedFont(const wxFont& font); // Sets the measuring font void SetMeasuringFont(const wxFont& font); // Sets the tab font virtual bool SetFont(const wxFont& font); // Gets the tab control height int GetTabCtrlHeight() const; // Gets the height of the notebook for a given page height int GetHeightForPageHeight(int pageHeight); //#endif %endclass // --------------------------------------------------------------------------- // --------------------------------------------------------------------------- //%include "wx/aui/dockart.h" // --------------------------------------------------------------------------- // wxAuiDockArt %class %delete %encapsulate %noclassinfo wxAuiDockArt // wxAuiDockArt() - No constructor - base class virtual int GetMetric(int id) //= 0; virtual void SetMetric(int id, int new_val) //= 0; virtual void SetFont(int id, const wxFont& font) //= 0; virtual wxFont GetFont(int id) //= 0; virtual wxColour GetColour(int id) //= 0; virtual void SetColour(int id, const wxColour& colour) //= 0; wxColour GetColor(int id) void SetColor(int id, const wxColour& color) virtual void DrawSash(wxDC& dc, wxWindow* window, int orientation, const wxRect& rect) //= 0; virtual void DrawBackground(wxDC& dc, wxWindow* window, int orientation, const wxRect& rect) //= 0; virtual void DrawCaption(wxDC& dc, wxWindow* window, const wxString& text, const wxRect& rect, wxAuiPaneInfo& pane) //= 0; virtual void DrawGripper(wxDC& dc, wxWindow* window, const wxRect& rect, wxAuiPaneInfo& pane) //= 0; virtual void DrawBorder(wxDC& dc, wxWindow* window, const wxRect& rect, wxAuiPaneInfo& pane) //= 0; virtual void DrawPaneButton(wxDC& dc, wxWindow* window, int button, int button_state, const wxRect& rect, wxAuiPaneInfo& pane) //= 0; %endclass // --------------------------------------------------------------------------- // wxAuiDefaultDockArt %class %delete %noclassinfo %encapsulate wxAuiDefaultDockArt, wxAuiDockArt wxAuiDefaultDockArt(); %endclass // --------------------------------------------------------------------------- // --------------------------------------------------------------------------- //%include "wx/aui/floatpane.h" // --------------------------------------------------------------------------- // wxAuiFloatingFrame %class wxAuiFloatingFrame, wxFrame // wxAuiFloatingFrameBaseClass wxAuiFloatingFrame(wxWindow* parent, wxAuiManager* owner_mgr, const wxAuiPaneInfo& pane, wxWindowID id = wxID_ANY, long style = wxRESIZE_BORDER|wxSYSTEM_MENU|wxCAPTION|wxFRAME_NO_TASKBAR | wxFRAME_FLOAT_ON_PARENT|wxCLIP_CHILDREN); void SetPaneWindow(const wxAuiPaneInfo& pane); wxAuiManager* GetOwnerManager() const; %endclass // --------------------------------------------------------------------------- // --------------------------------------------------------------------------- //%include "wx/aui/framemanager.h" %enum wxAuiManagerDock wxAUI_DOCK_NONE wxAUI_DOCK_TOP wxAUI_DOCK_RIGHT wxAUI_DOCK_BOTTOM wxAUI_DOCK_LEFT wxAUI_DOCK_CENTER wxAUI_DOCK_CENTRE //= wxAUI_DOCK_CENTER %endenum %enum wxAuiManagerOption wxAUI_MGR_ALLOW_FLOATING wxAUI_MGR_ALLOW_ACTIVE_PANE wxAUI_MGR_TRANSPARENT_DRAG wxAUI_MGR_TRANSPARENT_HINT wxAUI_MGR_VENETIAN_BLINDS_HINT wxAUI_MGR_RECTANGLE_HINT wxAUI_MGR_HINT_FADE wxAUI_MGR_NO_VENETIAN_BLINDS_FADE wxAUI_MGR_DEFAULT //= wxAUI_MGR_ALLOW_FLOATING | wxAUI_MGR_TRANSPARENT_HINT | wxAUI_MGR_HINT_FADE | wxAUI_MGR_NO_VENETIAN_BLINDS_FADE %endenum %enum wxAuiPaneDockArtSetting wxAUI_DOCKART_SASH_SIZE wxAUI_DOCKART_CAPTION_SIZE wxAUI_DOCKART_GRIPPER_SIZE wxAUI_DOCKART_PANE_BORDER_SIZE wxAUI_DOCKART_PANE_BUTTON_SIZE wxAUI_DOCKART_BACKGROUND_COLOUR wxAUI_DOCKART_SASH_COLOUR wxAUI_DOCKART_ACTIVE_CAPTION_COLOUR wxAUI_DOCKART_ACTIVE_CAPTION_GRADIENT_COLOUR wxAUI_DOCKART_INACTIVE_CAPTION_COLOUR wxAUI_DOCKART_INACTIVE_CAPTION_GRADIENT_COLOUR wxAUI_DOCKART_ACTIVE_CAPTION_TEXT_COLOUR wxAUI_DOCKART_INACTIVE_CAPTION_TEXT_COLOUR wxAUI_DOCKART_BORDER_COLOUR wxAUI_DOCKART_GRIPPER_COLOUR wxAUI_DOCKART_CAPTION_FONT wxAUI_DOCKART_GRADIENT_TYPE %endenum %enum wxAuiPaneDockArtGradients wxAUI_GRADIENT_NONE wxAUI_GRADIENT_VERTICAL wxAUI_GRADIENT_HORIZONTAL %endenum %enum wxAuiPaneButtonState wxAUI_BUTTON_STATE_NORMAL wxAUI_BUTTON_STATE_HOVER wxAUI_BUTTON_STATE_PRESSED wxAUI_BUTTON_STATE_DISABLED wxAUI_BUTTON_STATE_HIDDEN wxAUI_BUTTON_STATE_CHECKED %endenum %enum wxAuiButtonId wxAUI_BUTTON_CLOSE wxAUI_BUTTON_MAXIMIZE_RESTORE wxAUI_BUTTON_MINIMIZE wxAUI_BUTTON_PIN wxAUI_BUTTON_OPTIONS wxAUI_BUTTON_WINDOWLIST wxAUI_BUTTON_LEFT wxAUI_BUTTON_RIGHT wxAUI_BUTTON_UP wxAUI_BUTTON_DOWN wxAUI_BUTTON_CUSTOM1 wxAUI_BUTTON_CUSTOM2 wxAUI_BUTTON_CUSTOM3 %endenum %enum wxAuiPaneInsertLevel wxAUI_INSERT_PANE wxAUI_INSERT_ROW wxAUI_INSERT_DOCK %endenum //WX_DECLARE_USER_EXPORTED_OBJARRAY(wxAuiDockInfo, wxAuiDockInfoArray, WXDLLIMPEXP_AUI); //WX_DECLARE_USER_EXPORTED_OBJARRAY(wxAuiDockUIPart, wxAuiDockUIPartArray, WXDLLIMPEXP_AUI); //WX_DECLARE_USER_EXPORTED_OBJARRAY(wxAuiPaneButton, wxAuiPaneButtonArray, WXDLLIMPEXP_AUI); //WX_DECLARE_USER_EXPORTED_OBJARRAY(wxAuiPaneInfo, wxAuiPaneInfoArray, WXDLLIMPEXP_AUI); //WX_DEFINE_USER_EXPORTED_ARRAY_PTR(wxAuiPaneInfo*, wxAuiPaneInfoPtrArray, class WXDLLIMPEXP_AUI); //WX_DEFINE_USER_EXPORTED_ARRAY_PTR(wxAuiDockInfo*, wxAuiDockInfoPtrArray, class WXDLLIMPEXP_AUI); // --------------------------------------------------------------------------- // wxAuiPaneInfo // NOTE: You can add and subtract flags from this list, // but do not change the values of the flags, because // they are stored in a binary integer format in the // perspective string. If you really need to change the // values around, you'll have to ensure backwards-compatibility // in the perspective loading code. %enum wxAuiPaneInfo::wxAuiPaneState optionFloating optionHidden optionLeftDockable optionRightDockable optionTopDockable optionBottomDockable optionFloatable optionMovable optionResizable optionPaneBorder optionCaption optionGripper optionDestroyOnClose optionToolbar optionActive optionGripperTop optionMaximized buttonClose buttonMaximize buttonMinimize buttonPin buttonCustom1 buttonCustom2 buttonCustom3 savedHiddenState // used internally actionPane // used internally %endenum %class %delete %noclassinfo %encapsulate wxAuiPaneInfo %define_object wxAuiNullPaneInfo wxAuiPaneInfo() wxAuiPaneInfo(const wxAuiPaneInfo& c) %operator wxAuiPaneInfo& operator=(const wxAuiPaneInfo& c) // Write the safe parts of a newly loaded PaneInfo structure "source" into "this" // used on loading perspectives etc. void SafeSet(wxAuiPaneInfo source) bool IsOk() const bool IsFixed() const bool IsResizable() const bool IsShown() const bool IsFloating() const bool IsDocked() const bool IsToolbar() const bool IsTopDockable() const bool IsBottomDockable() const bool IsLeftDockable() const bool IsRightDockable() const bool IsFloatable() const bool IsMovable() const bool IsDestroyOnClose() const bool IsMaximized() const bool HasCaption() const bool HasGripper() const bool HasBorder() const bool HasCloseButton() const bool HasMaximizeButton() const bool HasMinimizeButton() const bool HasPinButton() const bool HasGripperTop() const wxAuiPaneInfo& Window(wxWindow* w) wxAuiPaneInfo& Name(const wxString& n) wxAuiPaneInfo& Caption(const wxString& c) wxAuiPaneInfo& Left() wxAuiPaneInfo& Right() wxAuiPaneInfo& Top() wxAuiPaneInfo& Bottom() wxAuiPaneInfo& Center() wxAuiPaneInfo& Centre() wxAuiPaneInfo& Direction(int direction) wxAuiPaneInfo& Layer(int layer) wxAuiPaneInfo& Row(int row) wxAuiPaneInfo& Position(int pos) wxAuiPaneInfo& BestSize(const wxSize& size) wxAuiPaneInfo& MinSize(const wxSize& size) wxAuiPaneInfo& MaxSize(const wxSize& size) wxAuiPaneInfo& BestSize(int x, int y) wxAuiPaneInfo& MinSize(int x, int y) wxAuiPaneInfo& MaxSize(int x, int y) wxAuiPaneInfo& FloatingPosition(const wxPoint& pos) wxAuiPaneInfo& FloatingPosition(int x, int y) wxAuiPaneInfo& FloatingSize(const wxSize& size) wxAuiPaneInfo& FloatingSize(int x, int y) wxAuiPaneInfo& Fixed() wxAuiPaneInfo& Resizable(bool resizable = true) wxAuiPaneInfo& Dock() wxAuiPaneInfo& Float() wxAuiPaneInfo& Hide() wxAuiPaneInfo& Show(bool show = true) wxAuiPaneInfo& CaptionVisible(bool visible = true) wxAuiPaneInfo& Maximize() wxAuiPaneInfo& Restore() wxAuiPaneInfo& PaneBorder(bool visible = true) wxAuiPaneInfo& Gripper(bool visible = true) wxAuiPaneInfo& GripperTop(bool attop = true) wxAuiPaneInfo& CloseButton(bool visible = true) wxAuiPaneInfo& MaximizeButton(bool visible = true) wxAuiPaneInfo& MinimizeButton(bool visible = true) wxAuiPaneInfo& PinButton(bool visible = true) wxAuiPaneInfo& DestroyOnClose(bool b = true) wxAuiPaneInfo& TopDockable(bool b = true) wxAuiPaneInfo& BottomDockable(bool b = true) wxAuiPaneInfo& LeftDockable(bool b = true) wxAuiPaneInfo& RightDockable(bool b = true) wxAuiPaneInfo& Floatable(bool b = true) wxAuiPaneInfo& Movable(bool b = true) wxAuiPaneInfo& Dockable(bool b = true) wxAuiPaneInfo& DefaultPane() wxAuiPaneInfo& CentrePane() wxAuiPaneInfo& CenterPane() wxAuiPaneInfo& ToolbarPane() wxAuiPaneInfo& SetFlag(unsigned int flag, bool option_state) bool HasFlag(unsigned int flag) const /* wxString name; // name of the pane wxString caption; // caption displayed on the window wxWindow* window; // window that is in this pane wxFrame* frame; // floating frame window that holds the pane unsigned int state; // a combination of wxPaneState values int dock_direction; // dock direction (top, bottom, left, right, center) int dock_layer; // layer number (0 = innermost layer) int dock_row; // row number on the docking bar (0 = first row) int dock_pos; // position inside the row (0 = first position) wxSize best_size; // size that the layout engine will prefer wxSize min_size; // minimum size the pane window can tolerate wxSize max_size; // maximum size the pane window can tolerate wxPoint floating_pos; // position while floating wxSize floating_size; // size while floating int dock_proportion; // proportion while docked wxAuiPaneButtonArray buttons; // buttons on the pane wxRect rect; // current rectangle (populated by wxAUI) */ %endclass // --------------------------------------------------------------------------- // wxAuiPaneInfoArray %class %delete %noclassinfo %encapsulate wxAuiPaneInfoArray wxAuiPaneInfoArray() wxAuiPaneInfoArray(const wxAuiPaneInfoArray& array) void Add(wxAuiPaneInfo pi) void Clear() int GetCount() const //int Index(wxAuiPaneInfo* page) void Insert(wxAuiPaneInfo pi, int nIndex) bool IsEmpty() wxAuiPaneInfo Item(size_t nIndex) const void RemoveAt(size_t nIndex) %endclass // --------------------------------------------------------------------------- // wxAuiManager %class wxAuiManager, wxEvtHandler wxAuiManager(wxWindow* managed_wnd = NULL, unsigned int flags = wxAUI_MGR_DEFAULT); void UnInit(); void SetFlags(unsigned int flags); unsigned int GetFlags() const; void SetManagedWindow(wxWindow* managed_wnd); wxWindow* GetManagedWindow() const; static wxAuiManager* GetManager(wxWindow* window); void SetArtProvider(%ungc wxAuiDockArt* art_provider); %gc wxAuiDockArt* GetArtProvider() const; wxAuiPaneInfo& GetPane(wxWindow* window); wxAuiPaneInfo& GetPane(const wxString& name); wxAuiPaneInfoArray& GetAllPanes(); bool AddPane(wxWindow* window, const wxAuiPaneInfo& pane_info); bool AddPane(wxWindow* window, const wxAuiPaneInfo& pane_info, const wxPoint& drop_pos); bool AddPane(wxWindow* window, int direction = wxLEFT, const wxString& caption = wxEmptyString); bool InsertPane(wxWindow* window, const wxAuiPaneInfo& insert_location, int insert_level = wxAUI_INSERT_PANE); bool DetachPane(wxWindow* window); void Update(); wxString SavePaneInfo(wxAuiPaneInfo& pane); void LoadPaneInfo(wxString pane_part, wxAuiPaneInfo &pane); wxString SavePerspective(); bool LoadPerspective(const wxString& perspective, bool update = true); void SetDockSizeConstraint(double width_pct, double height_pct); void GetDockSizeConstraint(double* width_pct, double* height_pct) const; void ClosePane(wxAuiPaneInfo& pane_info); void MaximizePane(wxAuiPaneInfo& pane_info); void RestorePane(wxAuiPaneInfo& pane_info); void RestoreMaximizedPane(); virtual wxAuiFloatingFrame* CreateFloatingFrame(wxWindow* parent, const wxAuiPaneInfo& p); void StartPaneDrag( wxWindow* pane_window, const wxPoint& offset); wxRect CalculateHintRect( wxWindow* pane_window, const wxPoint& pt, const wxPoint& offset); void DrawHintRect( wxWindow* pane_window, const wxPoint& pt, const wxPoint& offset); virtual void ShowHint(const wxRect& rect); virtual void HideHint(); // public events (which can be invoked externally) void OnRender(wxAuiManagerEvent& evt); void OnPaneButton(wxAuiManagerEvent& evt); %endclass // --------------------------------------------------------------------------- // wxAuiManagerEvent %class %delete wxAuiManagerEvent, wxEvent %define_event wxEVT_AUI_PANE_BUTTON // EVT_AUI_PANE_BUTTON(func) %define_event wxEVT_AUI_PANE_CLOSE // EVT_AUI_PANE_CLOSE(func) %define_event wxEVT_AUI_PANE_MAXIMIZE // EVT_AUI_PANE_MAXIMIZE(func) %define_event wxEVT_AUI_PANE_RESTORE // EVT_AUI_PANE_RESTORE(func) %define_event wxEVT_AUI_RENDER // EVT_AUI_RENDER(func) %define_event wxEVT_AUI_FIND_MANAGER // EVT_AUI_FIND_MANAGER(func) wxAuiManagerEvent(wxEventType type=wxEVT_NULL) wxAuiManagerEvent(const wxAuiManagerEvent& c) void SetManager(wxAuiManager* mgr) void SetPane(wxAuiPaneInfo* p) void SetButton(int b) void SetDC(wxDC* pdc) wxAuiManager* GetManager() const wxAuiPaneInfo* GetPane() const int GetButton() const wxDC* GetDC() const void Veto(bool veto = true) bool GetVeto() const void SetCanVeto(bool can_veto) bool CanVeto() const %endclass // --------------------------------------------------------------------------- // wxAuiDockInfo %class %delete %noclassinfo %encapsulate wxAuiDockInfo %define_object wxAuiNullDockInfo wxAuiDockInfo() wxAuiDockInfo(const wxAuiDockInfo& c) %operator wxAuiDockInfo& operator=(const wxAuiDockInfo& c) bool IsOk() const bool IsHorizontal() const bool IsVertical() const /* public: wxAuiPaneInfoPtrArray panes; // array of panes wxRect rect; // current rectangle int dock_direction; // dock direction (top, bottom, left, right, center) int dock_layer; // layer number (0 = innermost layer) int dock_row; // row number on the docking bar (0 = first row) int size; // size of the dock int min_size; // minimum size of a dock (0 if there is no min) bool resizable; // flag indicating whether the dock is resizable bool toolbar; // flag indicating dock contains only toolbars bool fixed; // flag indicating that the dock operates on // absolute coordinates as opposed to proportional bool reserved1; */ %endclass // --------------------------------------------------------------------------- // wxAuiDockUIPart %enum wxAuiDockUIPart::dummy typeCaption, typeGripper, typeDock, typeDockSizer, typePane, typePaneSizer, typeBackground, typePaneBorder, typePaneButton %endenum %class %delete %noclassinfo %encapsulate wxAuiDockUIPart %member int type; // ui part type (see enum above) %member int orientation; // orientation (either wxHORIZONTAL or wxVERTICAL) %member wxAuiDockInfo* dock; // which dock the item is associated with %member wxAuiPaneInfo* pane; // which pane the item is associated with %member wxAuiPaneButton* button; // which pane button the item is associated with %member wxSizer* cont_sizer; // the part's containing sizer %member wxSizerItem* sizer_item; // the sizer item of the part %member wxRect rect; // client coord rectangle of the part itself %endclass // --------------------------------------------------------------------------- // wxAuiPaneButton %class %delete %noclassinfo %encapsulate wxAuiPaneButton %member int button_id; // id of the button (e.g. buttonClose) %endclass %endif // wxLUA_USE_wxAUI && %wxchkver_2_8 && wxUSE_AUI --- NEW FILE: Makefile --- # # File: makefile.unx # Author: John Labenski, J Winwood # Created: 2002 # Updated: # Copyright: (c) 2002. J Winwood # # # Makefile for generating the bindings WXLUA_DIR = ../.. all: genwxbind genwxbind: @(cd $(WXLUA_DIR)/bindings && ../bin/lua -e"rulesFilename=\"wxaui/wxaui_rules.lua\"" genwxbind.lua > wxaui/error.txt) # do nothing to clean clean: --- NEW FILE: wxaui_rules.lua --- ------------------------------------------------------------------------------- -- Rules to build wxWidgets' wxAUI binding for wxLua -- load using : $lua -e"rulesFilename=\"rules.lua\"" genwxbind.lua ------------------------------------------------------------------------------- ------------------------------------------------------------------------------- -- Set the root directory of the wxLua distribution, used only in this file wxlua_dir = "../" --============================================================================= -- Set the lua namespace (lua table) that the bindings will be placed into. -- eg. wx.wxWindow(...) hook_lua_namespace = "wxaui" -- Set the C++ "namespace" that the bindings will be placed. -- eg. cpp function names contain this to prevent duplicate function names hook_cpp_namespace = "wxaui" --============================================================================= -- Set the directory to output the bindings to, both C++ header and source files output_cpp_header_filepath = wxlua_dir.."modules/wxbindaui/include" output_cpp_filepath = wxlua_dir.."modules/wxbindaui/src" --============================================================================= -- Set the DLLIMPEXP macros for compiling these bindings into a DLL -- Use "WXLUA_NO_DLLIMPEXP" and "WXLUA_NO_DLLIMPEXP_DATA" for no IMPEXP macros output_cpp_impexpsymbol = "WXDLLIMPEXP_WXBINDAUI" output_cpp_impexpdatasymbol = "WXDLLIMPEXP_DATA_WXBINDAUI" ------------------------------------------------------------------------------- -- Set the name of the header file that will have the #includes from the -- bindings in it. This will be used as #include "hook_cpp_header_filename" in -- the C++ wrapper files, so it must include the proper #include path. hook_cpp_header_filename = "wxbindaui/include/wxbind.h" ------------------------------------------------------------------------------- -- Set the name of the main binding file that will have the glue code for the -- bindings in it. This file along with the output from the *.i files will be -- placed in the "output_cpp_filepath". hook_cpp_binding_filename = hook_cpp_namespace.."_bind.cpp" ------------------------------------------------------------------------------- -- Set the name of the subclassed wxLuaBinding class hook_cpp_binding_classname = "wxLuaBinding_"..hook_cpp_namespace ------------------------------------------------------------------------------- -- Set the function names that wrap the output structs of defined values, -- objects, events, functions, and classes. hook_cpp_define_funcname = "wxLuaGetDefineList_"..hook_cpp_namespace hook_cpp_string_funcname = "wxLuaGetStringList_"..hook_cpp_namespace hook_cpp_object_funcname = "wxLuaGetObjectList_"..hook_cpp_namespace hook_cpp_event_funcname = "wxLuaGetEventList_"..hook_cpp_namespace hook_cpp_function_funcname = "wxLuaGetFunctionList_"..hook_cpp_namespace hook_cpp_class_funcname = "wxLuaGetClassList_"..hook_cpp_namespace ------------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim at the top of -- every generated cpp file or "" for none hook_cpp_binding_includes = "" ------------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim below the -- #includes of every generated cpp file or "" for none hook_cpp_binding_post_includes = "" ------------------------------------------------------------------------------- -- Add additional include information or C++ code for the binding header file. -- This code will be place directly after any #includes at the top of the file hook_cpp_binding_header_includes = "#include \"wx/defs.h\"\n".. "#include \"wxbind/include/wxbind.h\"\n".. "#include \"wxbindaui/include/wxbindauidefs.h\"\n".. "#ifndef wxUSE_WAVE\n#define wxUSE_WAVE 0\n#endif\n".. "#ifndef wxUSE_SOUND\n#define wxUSE_SOUND 0\n#endif\n" ------------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim at the top of -- the single hook_cpp_binding_filename generated cpp file or "" for none hook_cpp_binding_source_includes = "" --============================================================================= -- Set the bindings directory that contains the *.i interface files interface_filepath = wxlua_dir.."bindings/wxaui" ------------------------------------------------------------------------------- -- A list of interface files to use to make the bindings. These files will be -- converted into *.cpp and placed in the output_cpp_filepath directory. -- The files are loaded from the interface_filepath. interface_fileTable = { "aui.i" } ------------------------------------------------------------------------------- -- A list of files that contain bindings that need to be overridden or empty -- table {} for none. -- The files are loaded from the interface_filepath. --override_fileTable = { "override.hpp" } --============================================================================= -- A table containing filenames of XXX_datatype.lua from other wrappers to -- to define classes and data types used in this wrapper -- NOTE: for the base wxWidgets wrappers we don't load the cache since they -- don't depend on other wrappers and can cause problems when interface -- files are updated. Make sure you delete or have updated any cache file -- that changes any data types used by this binding. datatype_cache_input_fileTable = { wxlua_dir.."bindings/wxwidgets/wx_datatypes.lua" } ------------------------------------------------------------------------------- -- The file to output the data type cache for later use with a binding that -- makes use of data types (classes, enums, etc) that are declared in this -- binding. The file will be generated in the interface_filepath. datatypes_cache_output_filename = hook_cpp_namespace.."_datatypes.lua" --============================================================================= -- virtual void wxLuaBinding::PreRegister function body for the -- hook_cpp_binding_classname. You can initialize data here. -- Typically this is not necessary and you can rem this out. -- wxLuaBinding_PreRegister = nothing to do here --============================================================================= -- virtual void wxLuaBinding::PostRegister function body for the -- hook_cpp_binding_classname. You can load any other custom bindings here. -- Typically this is not necessary and you can rem this out. -- wxLuaBinding_PostRegister = nothing to do here --============================================================================= -- Add additional conditions here -- example: conditions["DOXYGEN_INCLUDE"] = "defined(DOXYGEN_INCLUDE)" ------------------------------------------------------------------------------- -- Add additional data types here -- example: AllocDataType("wxArrayInt", "class",false) --============================================================================= -- Generate comments into binding C++ code comment_cpp_binding_code = true |
|
From: John L. <jr...@us...> - 2007-07-04 05:39:17
|
Update of /cvsroot/wxlua/wxLua/build In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv478/wxLua/build Added Files: Makefile_wx-config.in Makefile_wx-config_targets.in Log Message: Add wxAUI library and rebuild all build files Cleanup Makefiles using wx-config and include common bits to simplify them --- NEW FILE: Makefile_wx-config.in --- # File: Makefile_wx-config.in # Author: John Labenski # Created: 2002 # Updated: # Copyright: (c) 2002 John Labenski. All rights reserved. # # Base Makefile for wxLua using wx-config to get settings # ---------------------------------------------------------------------------- # Your Makefile MUST define this correctly #WXLUA_DIR = ../../.. # --- wxLua parameters ------------------------------------------------------- WXLUA_LIBVERSION_CURRENT = 2 WXLUA_LIBVERSION_REVISION = 8 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 # If we're using cygwin, lua might be somewhere else, try some common places # note some other variables cygwin sets don't seem to be exported ifeq (Cygwin, $(findstring Cygwin, $(XTERM_VERSION))) LUA=$(WXLUA_DIR)/bin/vc_lib/lua.exe else LUA=$(WXLUA_DIR)/bin/lua endif # --- 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 WXSTC_LIB = $(WXBASENAME)_stc-$(WXRELEASE) WXXRC_LIB = $(WXBASENAME)_xrc-$(WXRELEASE) # ---------------------------------------------------------------------------- # The wxSTEditor library name compiled from wxCode/components/wxstedit WXSTEDIT_LIB = $(WXBASENAME)_stedit-$(WXRELEASE) WXSTEDIT_DIR = $(WXCODE)/components/wxstedit # ---------------------------------------------------------------------------- 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) # for lib targets, these are extra linker args 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) --- NEW FILE: Makefile_wx-config_targets.in --- # File: Makefile_wx-config_targets.in # Author: John Labenski # Created: 2002 # Updated: # Copyright: (c) 2002 John Labenski. All rights reserved. # # Base Makefile for wxLua using wx-config to get settings # ---------------------------------------------------------------------------- # Some targets that we may like to build Lua: @(cd $(WXLUA_DIR)/modules/lua && make linux) wxLuaLib: @(cd $(WXLUA_DIR)/modules/wxlua/src && make) wxLuaDebugLib: @(cd $(WXLUA_DIR)/modules/wxluadebug/src && make) wxLuaSocketLib: @(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) @(cd $(WXLUA_DIR)/modules/wxlua/src && make clean) @(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) |
|
From: John L. <jr...@us...> - 2007-07-04 05:09:12
|
Update of /cvsroot/wxlua/wxLua/bindings/wxaui In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21712/bindings/wxaui Log Message: Directory /cvsroot/wxlua/wxLua/bindings/wxaui added to the repository |
|
From: John L. <jr...@us...> - 2007-07-04 05:07:37
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindaui/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20962/wxbindaui/src Log Message: Directory /cvsroot/wxlua/wxLua/modules/wxbindaui/src added to the repository |
|
From: John L. <jr...@us...> - 2007-07-04 05:07:37
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindaui/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20951/wxbindaui/include Log Message: Directory /cvsroot/wxlua/wxLua/modules/wxbindaui/include added to the repository |
|
From: John L. <jr...@us...> - 2007-07-04 05:07:37
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindaui In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20889/wxbindaui Log Message: Directory /cvsroot/wxlua/wxLua/modules/wxbindaui added to the repository |
|
From: John L. <jr...@us...> - 2007-07-02 17:06:13
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27045/bindings Modified Files: genwxbind.lua Log Message: Ignore "inline" attribute for functions Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.140 retrieving revision 1.141 diff -C2 -d -r1.140 -r1.141 *** genwxbind.lua 2 Jul 2007 00:05:12 -0000 1.140 --- genwxbind.lua 2 Jul 2007 17:06:03 -0000 1.141 *************** *** 2136,2139 **** --- 2136,2144 ---- lineState.ActionMandatory = true + elseif tag == "inline" then + lineState.DefType = "method" + lineState.Action = "method" + lineState.ActionMandatory = true + else if lineState.IsConstructor then |
