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: Francesco M. <fr...@us...> - 2006-12-19 22:24:44
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21377/apps Modified Files: Makefile.in Log Message: get rid of WX_UNICODE and WX_DEBUG (again); removed the 'verbatim' name from modules and apps; added explanatory comments about the naming of our vanilla lua; renamed our lua interpreter to just 'lua' (as for the standard lua distro); now LUA_DIR is set correctly for windows builds; now USE_SYSTEM_LUA and LUA_DIR are passed through subprojects Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** Makefile.in 19 Dec 2006 21:11:57 -0000 1.47 --- Makefile.in 19 Dec 2006 22:24:10 -0000 1.48 *************** *** 45,53 **** DESTDIR = ! APP_VERBATIMLUA_CFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ -I$(LUA_DIR)/include -I$(top_srcdir)/modules/lua/include $(WX_CFLAGS) \ $(LUA_PLATFORM_SPECIFIC_CFLAGS) $(CPPFLAGS) $(CFLAGS) ! APP_VERBATIMLUA_OBJECTS = \ ! app_verbatimlua_lua.o APP_WXLUA_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ -I$(LUA_DIR)/include $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) --- 45,53 ---- DESTDIR = ! APP_LUA_CFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ -I$(LUA_DIR)/include -I$(top_srcdir)/modules/lua/include $(WX_CFLAGS) \ $(LUA_PLATFORM_SPECIFIC_CFLAGS) $(CPPFLAGS) $(CFLAGS) ! APP_LUA_OBJECTS = \ ! app_lua_lua.o APP_WXLUA_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ -I$(LUA_DIR)/include $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) *************** *** 93,99 **** @COND_WX_DEBUG_1_WX_UNICODE_0@WXLIBPOSTFIX = d @COND_WX_DEBUG_0_WX_UNICODE_1@WXLIBPOSTFIX = u ! @COND_PLATFORM_MAC_1@__app_verbatimlua___mac_setfilecmd \ ! @COND_PLATFORM_MAC_1@ = $(SETFILE) -t APPL \ ! @COND_PLATFORM_MAC_1@ $(top_builddir)/bin/wxlua-lua$(EXEEXT) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@__app_wxlua___depname \ @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ = \ --- 93,98 ---- @COND_WX_DEBUG_1_WX_UNICODE_0@WXLIBPOSTFIX = d @COND_WX_DEBUG_0_WX_UNICODE_1@WXLIBPOSTFIX = u ! @COND_PLATFORM_MAC_1@__app_lua___mac_setfilecmd = \ ! @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL $(top_builddir)/bin/lua$(EXEEXT) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@__app_wxlua___depname \ @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ = \ *************** *** 156,167 **** ### Targets: ### ! all: $(top_builddir)/bin/wxlua-lua$(EXEEXT) $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) ! install: all install_app_verbatimlua $(__install_app_wxlua___depname) $(__install_app_wxluaedit___depname) $(__install_app_wxluacan___depname) $(__install_app_wxluafreeze___depname) ! uninstall: uninstall_app_verbatimlua $(__uninstall_app_wxlua___depname) $(__uninstall_app_wxluaedit___depname) $(__uninstall_app_wxluacan___depname) $(__uninstall_app_wxluafreeze___depname) install-strip: install ! $(STRIP) $(DESTDIR)$(bindir)/wxlua-lua$(EXEEXT) $(STRIP) $(DESTDIR)$(bindir)/wxlua$(EXEEXT) $(STRIP) $(DESTDIR)$(bindir)/wxluaedit$(EXEEXT) --- 155,166 ---- ### Targets: ### ! all: $(top_builddir)/bin/lua$(EXEEXT) $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) ! install: all install_app_lua $(__install_app_wxlua___depname) $(__install_app_wxluaedit___depname) $(__install_app_wxluacan___depname) $(__install_app_wxluafreeze___depname) ! uninstall: uninstall_app_lua $(__uninstall_app_wxlua___depname) $(__uninstall_app_wxluaedit___depname) $(__uninstall_app_wxluacan___depname) $(__uninstall_app_wxluafreeze___depname) install-strip: install ! $(STRIP) $(DESTDIR)$(bindir)/lua$(EXEEXT) $(STRIP) $(DESTDIR)$(bindir)/wxlua$(EXEEXT) $(STRIP) $(DESTDIR)$(bindir)/wxluaedit$(EXEEXT) *************** *** 172,176 **** rm -rf ./.deps ./.pch rm -f ./*.o ! rm -f $(top_builddir)/bin/wxlua-lua$(EXEEXT) rm -f $(top_builddir)/bin/wxlua$(EXEEXT) rm -f $(top_builddir)/bin/wxluaedit$(EXEEXT) --- 171,175 ---- rm -rf ./.deps ./.pch rm -f ./*.o ! rm -f $(top_builddir)/bin/lua$(EXEEXT) rm -f $(top_builddir)/bin/wxlua$(EXEEXT) rm -f $(top_builddir)/bin/wxluaedit$(EXEEXT) *************** *** 181,195 **** rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile ! $(top_builddir)/bin/wxlua-lua$(EXEEXT): $(APP_VERBATIMLUA_OBJECTS) ! $(CC) -o $@ $(APP_VERBATIMLUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) -lm -llua5.1 ! $(__app_verbatimlua___mac_setfilecmd) ! install_app_verbatimlua: $(INSTALL_DIR) $(DESTDIR)$(bindir) ! $(INSTALL_PROGRAM) $(top_builddir)/bin/wxlua-lua$(EXEEXT) $(DESTDIR)$(bindir) ! uninstall_app_verbatimlua: ! rm -f $(DESTDIR)$(bindir)/wxlua-lua$(EXEEXT) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@$(top_builddir)/bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc) --- 180,194 ---- rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile ! $(top_builddir)/bin/lua$(EXEEXT): $(APP_LUA_OBJECTS) ! $(CC) -o $@ $(APP_LUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) -lm -llua5.1 ! $(__app_lua___mac_setfilecmd) ! install_app_lua: $(INSTALL_DIR) $(DESTDIR)$(bindir) ! $(INSTALL_PROGRAM) $(top_builddir)/bin/lua$(EXEEXT) $(DESTDIR)$(bindir) ! uninstall_app_lua: ! rm -f $(DESTDIR)$(bindir)/lua$(EXEEXT) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@$(top_builddir)/bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc) *************** *** 245,250 **** @COND_USE_WXLUAFREEZEAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluafreeze$(EXEEXT) ! app_verbatimlua_lua.o: $(srcdir)/../modules/lua/src/lua.c ! $(CCC) -c -o $@ $(APP_VERBATIMLUA_CFLAGS) $(srcdir)/../modules/lua/src/lua.c app_wxlua_wxlua.o: $(srcdir)/wxlua/src/wxlua.cpp --- 244,249 ---- @COND_USE_WXLUAFREEZEAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluafreeze$(EXEEXT) ! app_lua_lua.o: $(srcdir)/../modules/lua/src/lua.c ! $(CCC) -c -o $@ $(APP_LUA_CFLAGS) $(srcdir)/../modules/lua/src/lua.c app_wxlua_wxlua.o: $(srcdir)/wxlua/src/wxlua.cpp *************** *** 294,296 **** @IF_GNU_MAKE@-include .deps/*.d ! .PHONY: all install uninstall clean distclean install_app_verbatimlua uninstall_app_verbatimlua install_app_wxlua uninstall_app_wxlua install_app_wxluaedit uninstall_app_wxluaedit install_app_wxluacan uninstall_app_wxluacan install_app_wxluafreeze uninstall_app_wxluafreeze --- 293,295 ---- @IF_GNU_MAKE@-include .deps/*.d ! .PHONY: all install uninstall clean distclean install_app_lua uninstall_app_lua install_app_wxlua uninstall_app_wxlua install_app_wxluaedit uninstall_app_wxluaedit install_app_wxluacan uninstall_app_wxluacan install_app_wxluafreeze uninstall_app_wxluafreeze |
|
From: Francesco M. <fr...@us...> - 2006-12-19 22:24:44
|
Update of /cvsroot/wxlua/wxLua/apps/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21377/apps/build/bakefiles Modified Files: apps.bkl Log Message: get rid of WX_UNICODE and WX_DEBUG (again); removed the 'verbatim' name from modules and apps; added explanatory comments about the naming of our vanilla lua; renamed our lua interpreter to just 'lua' (as for the standard lua distro); now LUA_DIR is set correctly for windows builds; now USE_SYSTEM_LUA and LUA_DIR are passed through subprojects Index: apps.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** apps.bkl 19 Dec 2006 21:11:57 -0000 1.45 --- apps.bkl 19 Dec 2006 22:24:11 -0000 1.46 *************** *** 80,84 **** <!-- ================================================================== --> ! <exe id="app_verbatimlua" template="wxlua"> <app-type>console</app-type> <dirname>$(WXLUA_BINOUTPUT_PATH)</dirname> --- 80,84 ---- <!-- ================================================================== --> ! <exe id="app_lua" template="wxlua"> <app-type>console</app-type> <dirname>$(WXLUA_BINOUTPUT_PATH)</dirname> *************** *** 98,102 **** </if> ! <exename>wxlua-lua</exename> <wxlua-lib>lua</wxlua-lib> </exe> --- 98,106 ---- </if> ! <!-- we want as EXE name the standard "lua" name so that when we install ! wxLua we get the lua installed in standard places and with standard names ! (see also the notes in modules.bkl for lua_lib and lua_dll) ! --> ! <exename>lua</exename> <wxlua-lib>lua</wxlua-lib> </exe> |
|
From: Francesco M. <fr...@us...> - 2006-12-19 22:24:18
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21377/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat modules_mod_luamodule.dsp modules_mod_wxbind.dsp modules_mod_wxbindstc.dsp modules_mod_wxlua.dsp modules_mod_wxluadebug.dsp modules_mod_wxluasocket.dsp Added Files: modules_mod_lua.dsp Removed Files: modules_mod_verbatimlua.dsp Log Message: get rid of WX_UNICODE and WX_DEBUG (again); removed the 'verbatim' name from modules and apps; added explanatory comments about the naming of our vanilla lua; renamed our lua interpreter to just 'lua' (as for the standard lua distro); now LUA_DIR is set correctly for windows builds; now USE_SYSTEM_LUA and LUA_DIR are passed through subprojects Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** makefile.bcc 19 Dec 2006 21:12:01 -0000 1.58 --- makefile.bcc 19 Dec 2006 22:24:12 -0000 1.59 *************** *** 75,88 **** !endif - # Compile Unicode build of wxWidgets? [0,1] - !ifndef WX_UNICODE - WX_UNICODE = 0 - !endif - - # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] - !ifndef WX_DEBUG - WX_DEBUG = 1 - !endif - # Version of the wx library to build against. !ifndef WX_VERSION --- 75,78 ---- *************** *** 102,106 **** # The path to the Lua library !ifndef LUA_DIR ! LUA_DIR = modules\lua !endif --- 92,96 ---- # The path to the Lua library !ifndef LUA_DIR ! LUA_DIR = ..\..\..\modules\lua !endif *************** *** 396,400 **** ### Conditionally set variables: ### ! !if "$(WX_DEBUG)" == "1" WX3RDPARTYLIBPOSTFIX = d !endif --- 386,390 ---- ### Conditionally set variables: ### ! !if "$(BUILD)" == "debug" WX3RDPARTYLIBPOSTFIX = d !endif *************** *** 454,484 **** __mod_luamodule___depname = ..\..\..\lib\bcc_dll\wx.dll !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)_media.lib ! !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)u_media.lib ! !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)d_media.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)ud_media.lib !endif ! !if "$(WX_UNICODE)" == "1" __WXUNICODE_DEFINE_p = -D_UNICODE !endif ! !if "$(WX_DEBUG)" == "1" __WXDEBUG_DEFINE_p = -D__WXDEBUG__ !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" ! WXLIBPOSTFIX = u ! !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0" WXLIBPOSTFIX = d !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1" WXLIBPOSTFIX = ud !endif !if "$(SHARED)" == "0" ____SHARED = --- 444,474 ---- __mod_luamodule___depname = ..\..\..\lib\bcc_dll\wx.dll !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)d_media.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)ud_media.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)_media.lib ! !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)u_media.lib ! !endif ! !if "$(UNICODE)" == "1" __WXUNICODE_DEFINE_p = -D_UNICODE !endif ! !if "$(BUILD)" == "debug" __WXDEBUG_DEFINE_p = -D__WXDEBUG__ !endif ! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "0" WXLIBPOSTFIX = d !endif ! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "1" WXLIBPOSTFIX = ud !endif + !if "$(BUILD)" == "release" && "$(UNICODE)" == "1" + WXLIBPOSTFIX = u + !endif !if "$(SHARED)" == "0" ____SHARED = *************** *** 499,598 **** __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\bcc_dll !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib ! !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib ! !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "0" ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION).lib ! !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "1" ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)u.lib ! !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "0" __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)d.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "1" __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)ud.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)_core.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)u_core.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)d_core.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)ud_core.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)_xml.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)u_xml.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)d_xml.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)ud_xml.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)_net.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)u_net.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)d_net.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)ud_net.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)_adv.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)u_adv.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)d_adv.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)ud_adv.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)_html.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)u_html.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)d_html.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)ud_html.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)_xrc.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)u_xrc.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)d_xrc.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)ud_xrc.lib !endif !if "$(WX_SHARED)" == "0" __WXLIBPATH_FILENAMES = \lib\bcc_lib --- 489,588 ---- __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\bcc_dll !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "1" && "$(UNICODE)" == "0" __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)d.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "1" && "$(UNICODE)" == "1" __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)ud.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "1" && "$(UNICODE)" == "0" ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION).lib ! !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "1" && "$(UNICODE)" == "1" ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)u.lib ! !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)d_core.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)ud_core.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)_core.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)u_core.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)d_xml.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)ud_xml.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)_xml.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)u_xml.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)d_net.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)ud_net.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)_net.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)u_net.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)d_adv.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)ud_adv.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)_adv.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)u_adv.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)d_html.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)ud_html.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)_html.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)u_html.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)d_xrc.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)ud_xrc.lib !endif + !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" + __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)_xrc.lib + !endif + !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" + __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)u_xrc.lib + !endif !if "$(WX_SHARED)" == "0" __WXLIBPATH_FILENAMES = \lib\bcc_lib --- modules_mod_verbatimlua.dsp DELETED --- Index: modules_mod_wxlua.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/modules_mod_wxlua.dsp,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** modules_mod_wxlua.dsp 19 Dec 2006 21:12:02 -0000 1.29 --- modules_mod_wxlua.dsp 19 Dec 2006 22:24:13 -0000 1.30 *************** *** 56,71 **** # PROP Intermediate_Dir "vcmsw_uddll\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmsw_uddll\wxprec_wxlua_dll.pch" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmsw_uddll\wxprec_wxlua_dll.pch" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "modules\lua\include" /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d _DEBUG ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "modules\lua\include" /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 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 oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.lib" /debug ! # ADD LINK32 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 oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.lib" /debug !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Unicode Debug Multilib" --- 56,71 ---- # PROP Intermediate_Dir "vcmsw_uddll\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmsw_uddll\wxprec_wxlua_dll.pch" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmsw_uddll\wxprec_wxlua_dll.pch" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d _DEBUG ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 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 oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.lib" /debug ! # ADD LINK32 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 oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.lib" /debug !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Unicode Debug Multilib" *************** *** 81,96 **** # PROP Intermediate_Dir "vcmsw_uddll\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmsw_uddll\wxprec_wxlua_dll.pch" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmsw_uddll\wxprec_wxlua_dll.pch" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "modules\lua\include" /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d _DEBUG ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "modules\lua\include" /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 lua5.1.lib wxbase28ud.lib wxmsw28ud_core.lib wxbase28ud_xml.lib wxbase28ud_net.lib wxmsw28ud_adv.lib wxmsw28ud_media.lib wxmsw28ud_html.lib wxmsw28ud_xrc.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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.lib" /debug ! # ADD LINK32 lua5.1.lib wxbase28ud.lib wxmsw28ud_core.lib wxbase28ud_xml.lib wxbase28ud_net.lib wxmsw28ud_adv.lib wxmsw28ud_media.lib wxmsw28ud_html.lib wxmsw28ud_xrc.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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.lib" /debug !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Unicode Release Monolithic" --- 81,96 ---- # PROP Intermediate_Dir "vcmsw_uddll\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmsw_uddll\wxprec_wxlua_dll.pch" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmsw_uddll\wxprec_wxlua_dll.pch" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d _DEBUG ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 lua5.1.lib wxbase28ud.lib wxmsw28ud_core.lib wxbase28ud_xml.lib wxbase28ud_net.lib wxmsw28ud_adv.lib wxmsw28ud_media.lib wxmsw28ud_html.lib wxmsw28ud_xrc.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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.lib" /debug ! # ADD LINK32 lua5.1.lib wxbase28ud.lib wxmsw28ud_core.lib wxbase28ud_xml.lib wxbase28ud_net.lib wxmsw28ud_adv.lib wxmsw28ud_media.lib wxmsw28ud_html.lib wxmsw28ud_xrc.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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.lib" /debug !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Unicode Release Monolithic" *************** *** 106,121 **** # PROP Intermediate_Dir "vcmsw_udll\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmsw_udll\wxprec_wxlua_dll.pch" /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmsw_udll\wxprec_wxlua_dll.pch" /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "modules\lua\include" /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXLUA ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "modules\lua\include" /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXLUA BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.lib" ! # ADD LINK32 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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Unicode Release Multilib" --- 106,121 ---- # PROP Intermediate_Dir "vcmsw_udll\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmsw_udll\wxprec_wxlua_dll.pch" /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmsw_udll\wxprec_wxlua_dll.pch" /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXLUA ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXLUA BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.lib" ! # ADD LINK32 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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Unicode Release Multilib" *************** *** 131,146 **** # PROP Intermediate_Dir "vcmsw_udll\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmsw_udll\wxprec_wxlua_dll.pch" /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmsw_udll\wxprec_wxlua_dll.pch" /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "modules\lua\include" /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXLUA ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "modules\lua\include" /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXLUA BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 lua5.1.lib wxbase28u.lib wxmsw28u_core.lib wxbase28u_xml.lib wxbase28u_net.lib wxmsw28u_adv.lib wxmsw28u_media.lib wxmsw28u_html.lib wxmsw28u_xrc.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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.lib" ! # ADD LINK32 lua5.1.lib wxbase28u.lib wxmsw28u_core.lib wxbase28u_xml.lib wxbase28u_net.lib wxmsw28u_adv.lib wxmsw28u_media.lib wxmsw28u_html.lib wxmsw28u_xrc.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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Debug Monolithic" --- 131,146 ---- # PROP Intermediate_Dir "vcmsw_udll\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmsw_udll\wxprec_wxlua_dll.pch" /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmsw_udll\wxprec_wxlua_dll.pch" /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXLUA ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXLUA BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 lua5.1.lib wxbase28u.lib wxmsw28u_core.lib wxbase28u_xml.lib wxbase28u_net.lib wxmsw28u_adv.lib wxmsw28u_media.lib wxmsw28u_html.lib wxmsw28u_xrc.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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.lib" ! # ADD LINK32 lua5.1.lib wxbase28u.lib wxmsw28u_core.lib wxbase28u_xml.lib wxbase28u_net.lib wxmsw28u_adv.lib wxmsw28u_media.lib wxmsw28u_html.lib wxmsw28u_xrc.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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Debug Monolithic" *************** *** 156,171 **** # PROP Intermediate_Dir "vcmsw_ddll\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmsw_ddll\wxprec_wxlua_dll.pch" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmsw_ddll\wxprec_wxlua_dll.pch" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "modules\lua\include" /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d _DEBUG ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "modules\lua\include" /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 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 oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.lib" /debug ! # ADD LINK32 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 oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.lib" /debug !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Debug Multilib" --- 156,171 ---- # PROP Intermediate_Dir "vcmsw_ddll\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmsw_ddll\wxprec_wxlua_dll.pch" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmsw_ddll\wxprec_wxlua_dll.pch" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d _DEBUG ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 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 oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.lib" /debug ! # ADD LINK32 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 oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.lib" /debug !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Debug Multilib" *************** *** 181,196 **** # PROP Intermediate_Dir "vcmsw_ddll\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmsw_ddll\wxprec_wxlua_dll.pch" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmsw_ddll\wxprec_wxlua_dll.pch" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "modules\lua\include" /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d _DEBUG ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "modules\lua\include" /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 lua5.1.lib wxbase28d.lib wxmsw28d_core.lib wxbase28d_xml.lib wxbase28d_net.lib wxmsw28d_adv.lib wxmsw28d_media.lib wxmsw28d_html.lib wxmsw28d_xrc.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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.lib" /debug ! # ADD LINK32 lua5.1.lib wxbase28d.lib wxmsw28d_core.lib wxbase28d_xml.lib wxbase28d_net.lib wxmsw28d_adv.lib wxmsw28d_media.lib wxmsw28d_html.lib wxmsw28d_xrc.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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.lib" /debug !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Release Monolithic" --- 181,196 ---- # PROP Intermediate_Dir "vcmsw_ddll\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmsw_ddll\wxprec_wxlua_dll.pch" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmsw_ddll\wxprec_wxlua_dll.pch" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d _DEBUG ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 lua5.1.lib wxbase28d.lib wxmsw28d_core.lib wxbase28d_xml.lib wxbase28d_net.lib wxmsw28d_adv.lib wxmsw28d_media.lib wxmsw28d_html.lib wxmsw28d_xrc.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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.lib" /debug ! # ADD LINK32 lua5.1.lib wxbase28d.lib wxmsw28d_core.lib wxbase28d_xml.lib wxbase28d_net.lib wxmsw28d_adv.lib wxmsw28d_media.lib wxmsw28d_html.lib wxmsw28d_xrc.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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.lib" /debug !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Release Monolithic" *************** *** 206,221 **** # PROP Intermediate_Dir "vcmsw_dll\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmsw_dll\wxprec_wxlua_dll.pch" /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw28_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmsw_dll\wxprec_wxlua_dll.pch" /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw28_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "modules\lua\include" /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXLUA ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "modules\lua\include" /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXLUA BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 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 oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28_wxlua.lib" ! # ADD LINK32 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 oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28_wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Release Multilib" --- 206,221 ---- # PROP Intermediate_Dir "vcmsw_dll\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmsw_dll\wxprec_wxlua_dll.pch" /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw28_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmsw_dll\wxprec_wxlua_dll.pch" /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw28_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXLUA ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXLUA BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 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 oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28_wxlua.lib" ! # ADD LINK32 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 oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28_wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Release Multilib" *************** *** 231,246 **** # PROP Intermediate_Dir "vcmsw_dll\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmsw_dll\wxprec_wxlua_dll.pch" /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw28_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmsw_dll\wxprec_wxlua_dll.pch" /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw28_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "modules\lua\include" /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXLUA ! # ADD RSC /l 0x409 /i "..\..\..\mod... [truncated message content] |
|
From: Francesco M. <fr...@us...> - 2006-12-19 22:24:16
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21377/apps/build/msw Modified Files: apps.dsw apps_app_wxlua.dsp apps_app_wxluacan.dsp apps_app_wxluaedit.dsp apps_app_wxluafreeze.dsp makefile.bcc makefile.gcc makefile.vc makefile.wat Added Files: apps_app_lua.dsp Removed Files: apps_app_verbatimlua.dsp Log Message: get rid of WX_UNICODE and WX_DEBUG (again); removed the 'verbatim' name from modules and apps; added explanatory comments about the naming of our vanilla lua; renamed our lua interpreter to just 'lua' (as for the standard lua distro); now LUA_DIR is set correctly for windows builds; now USE_SYSTEM_LUA and LUA_DIR are passed through subprojects Index: apps.dsw =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/apps.dsw,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** apps.dsw 10 Dec 2006 00:47:21 -0000 1.13 --- apps.dsw 19 Dec 2006 22:24:11 -0000 1.14 *************** *** 3,7 **** ############################################################################### ! Project: "app_verbatimlua"=apps_app_verbatimlua.dsp - Package Owner=<4> Package=<5> --- 3,7 ---- ############################################################################### ! Project: "app_lua"=apps_app_lua.dsp - Package Owner=<4> Package=<5> Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** makefile.bcc 19 Dec 2006 21:11:58 -0000 1.57 --- makefile.bcc 19 Dec 2006 22:24:11 -0000 1.58 *************** *** 75,88 **** !endif - # Compile Unicode build of wxWidgets? [0,1] - !ifndef WX_UNICODE - WX_UNICODE = 0 - !endif - - # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] - !ifndef WX_DEBUG - WX_DEBUG = 1 - !endif - # Version of the wx library to build against. !ifndef WX_VERSION --- 75,78 ---- *************** *** 97,101 **** # The path to the Lua library !ifndef LUA_DIR ! LUA_DIR = modules\lua !endif --- 87,91 ---- # The path to the Lua library !ifndef LUA_DIR ! LUA_DIR = ..\..\..\modules\lua !endif *************** *** 143,147 **** ### Variables: ### ! APP_VERBATIMLUA_CFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ --- 133,137 ---- ### Variables: ### ! APP_LUA_CFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ *************** *** 149,154 **** -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I..\..\..\modules\lua\include $(CPPFLAGS) $(CFLAGS) ! APP_VERBATIMLUA_OBJECTS = \ ! bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_verbatimlua_lua.obj APP_WXLUA_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ --- 139,144 ---- -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I..\..\..\modules\lua\include $(CPPFLAGS) $(CFLAGS) ! APP_LUA_OBJECTS = \ ! bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_lua_lua.obj APP_WXLUA_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ *************** *** 191,195 **** ### Conditionally set variables: ### ! !if "$(WX_DEBUG)" == "1" WX3RDPARTYLIBPOSTFIX = d !endif --- 181,185 ---- ### Conditionally set variables: ### ! !if "$(BUILD)" == "debug" WX3RDPARTYLIBPOSTFIX = d !endif *************** *** 246,259 **** __WXLUA_BINOUTPUT_FOLDER_FILENAMES_4 = bin\bcc$(WXLIBPOSTFIX)_dll !endif ! !if "$(WX_UNICODE)" == "1" __WXUNICODE_DEFINE_p = -D_UNICODE !endif ! !if "$(WX_UNICODE)" == "1" __WXUNICODE_DEFINE_p_10 = -d_UNICODE !endif ! !if "$(WX_DEBUG)" == "1" __WXDEBUG_DEFINE_p = -D__WXDEBUG__ !endif ! !if "$(WX_DEBUG)" == "1" __WXDEBUG_DEFINE_p_10 = -d__WXDEBUG__ !endif --- 236,249 ---- __WXLUA_BINOUTPUT_FOLDER_FILENAMES_4 = bin\bcc$(WXLIBPOSTFIX)_dll !endif ! !if "$(UNICODE)" == "1" __WXUNICODE_DEFINE_p = -D_UNICODE !endif ! !if "$(UNICODE)" == "1" __WXUNICODE_DEFINE_p_10 = -d_UNICODE !endif ! !if "$(BUILD)" == "debug" __WXDEBUG_DEFINE_p = -D__WXDEBUG__ !endif ! !if "$(BUILD)" == "debug" __WXDEBUG_DEFINE_p_10 = -d__WXDEBUG__ !endif *************** *** 282,381 **** __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\bcc_dll !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)_xrc.lib ! !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)u_xrc.lib ! !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)d_xrc.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)ud_xrc.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)_html.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)u_html.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)d_html.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)ud_html.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)_adv.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)u_adv.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)d_adv.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)ud_adv.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)_net.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)u_net.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)d_net.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)ud_net.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)_xml.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)u_xml.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)d_xml.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)ud_xml.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)_core.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)u_core.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)d_core.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)ud_core.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib ! !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib ! !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "0" ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION).lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "1" ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)u.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "0" __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)d.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "1" __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)ud.lib !endif !if "$(WX_SHARED)" == "0" __WXLIBPATH_FILENAMES = \lib\bcc_lib --- 272,371 ---- __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\bcc_dll !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)d_xrc.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)ud_xrc.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)_xrc.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)u_xrc.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)d_html.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)ud_html.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)_html.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)u_html.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)d_adv.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)ud_adv.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)_adv.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)u_adv.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)d_net.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)ud_net.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)_net.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)u_net.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)d_xml.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)ud_xml.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)_xml.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)u_xml.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)d_core.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)ud_core.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)_core.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)u_core.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "1" && "$(UNICODE)" == "0" __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)d.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "1" && "$(UNICODE)" == "1" __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)ud.lib !endif + !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib + !endif + !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib + !endif + !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "1" && "$(UNICODE)" == "0" + __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION).lib + !endif + !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "1" && "$(UNICODE)" == "1" + __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)u.lib + !endif !if "$(WX_SHARED)" == "0" __WXLIBPATH_FILENAMES = \lib\bcc_lib *************** *** 390,402 **** ____BUILD_4 = -v- !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" ! WXLIBPOSTFIX = u ! !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0" WXLIBPOSTFIX = d !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1" WXLIBPOSTFIX = ud !endif --- 380,392 ---- ____BUILD_4 = -v- !endif ! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "0" WXLIBPOSTFIX = d !endif ! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "1" WXLIBPOSTFIX = ud !endif + !if "$(BUILD)" == "release" && "$(UNICODE)" == "1" + WXLIBPOSTFIX = u + !endif *************** *** 407,411 **** ### Targets: ### ! all: ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\wxlua-lua.exe $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean: --- 397,401 ---- ### Targets: ### ! all: ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\lua.exe $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean: *************** *** 413,422 **** -if exist bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.res del bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.res -if exist bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.csm del bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.csm ! -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\wxlua-lua.exe del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\wxlua-lua.exe ! -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\wxlua-lua.tds del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\wxlua-lua.tds ! -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\wxlua-lua.ilc del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\wxlua-lua.ilc ! -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\wxlua-lua.ild del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\wxlua-lua.ild ! -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\wxlua-lua.ilf del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\wxlua-lua.ilf ! -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\wxlua-lua.ils del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\wxlua-lua.ils -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_1)\wxlua.exe del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_1)\wxlua.exe -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_1)\wxlua.tds del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_1)\wxlua.tds --- 403,412 ---- -if exist bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.res del bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.res -if exist bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.csm del bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.csm ! -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\lua.exe del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\lua.exe ! -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\lua.tds del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\lua.tds ! -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\lua.ilc del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\lua.ilc ! -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\lua.ild del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\lua.ild ! -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\lua.ilf del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\lua.ilf ! -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\lua.ils del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\lua.ils -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_1)\wxlua.exe del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_1)\wxlua.exe -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_1)\wxlua.tds del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_1)\wxlua.tds *************** *** 444,450 **** -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_4)\wxluafreeze.ils del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_4)\wxluafreeze.ils ! ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\wxlua-lua.exe: $(APP_VERBATIMLUA_OBJECTS) ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib -ap @&&| ! c0x32.obj $(APP_VERBATIMLUA_OBJECTS),$@,, wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib lua5.1.lib import32.lib cw32.lib,, | --- 434,440 ---- -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_4)\wxluafreeze.ils del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_4)\wxluafreeze.ils ! ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\lua.exe: $(APP_LUA_OBJECTS) ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib -ap @&&| ! c0x32.obj $(APP_LUA_OBJECTS),$@,, wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib lua5.1.lib import32.lib cw32.lib,, | *************** *** 477,482 **** !endif ! bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_verbatimlua_lua.obj: ..\..\..\modules\lua\src\lua.c ! $(CC) -q -c -P- -o$@ $(APP_VERBATIMLUA_CFLAGS) $** bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp --- 467,472 ---- !endif ! bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_lua_lua.obj: ..\..\..\modules\lua\src\lua.c ! $(CC) -q -c -P- -o$@ $(APP_LUA_CFLAGS) $** bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp Index: apps_app_wxlua.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/apps_app_wxlua.dsp,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** apps_app_wxlua.dsp 19 Dec 2006 21:11:57 -0000 1.30 --- apps_app_wxlua.dsp 19 Dec 2006 22:24:11 -0000 1.31 *************** *** 56,71 **** # PROP Intermediate_Dir "vcmsw_uddll\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "modules\lua\include" /Zi /Gm /GZ /Fd..\..\..\bin\vcud_dll\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "modules\lua\include" /Zi /Gm /GZ /Fd..\..\..\bin\vcud_dll\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "modules\lua\include" /d "_WINDOWS" /d _DEBUG ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "modules\lua\include" /d "_WINDOWS" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxlua.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib lua5.1.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\vcud_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"modules\lua\lib" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw28ud_wxlua.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib lua5.1.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\vcud_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"modules\lua\lib" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Unicode Debug Multilib" --- 56,71 ---- # PROP Intermediate_Dir "vcmsw_uddll\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Gm /GZ /Fd..\..\..\bin\vcud_dll\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Gm /GZ /Fd..\..\..\bin\vcud_dll\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_WINDOWS" /d _DEBUG ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_WINDOWS" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxlua.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib lua5.1.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\vcud_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw28ud_wxlua.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib lua5.1.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\vcud_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Unicode Debug Multilib" *************** *** 81,96 **** # PROP Intermediate_Dir "vcmsw_uddll\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "modules\lua\include" /Zi /Gm /GZ /Fd..\..\..\bin\vcud_dll\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "modules\lua\include" /Zi /Gm /GZ /Fd..\..\..\bin\vcud_dll\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "modules\lua\include" /d "_WINDOWS" /d _DEBUG ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "modules\lua\include" /d "_WINDOWS" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxlua.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib lua5.1.lib wxmsw28ud_stc.lib wxmsw28ud_xrc.lib wxmsw28ud_html.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\vcud_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"modules\lua\lib" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw28ud_wxlua.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib lua5.1.lib wxmsw28ud_stc.lib wxmsw28ud_xrc.lib wxmsw28ud_html.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\vcud_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"modules\lua\lib" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Unicode Release Monolithic" --- 81,96 ---- # PROP Intermediate_Dir "vcmsw_uddll\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Gm /GZ /Fd..\..\..\bin\vcud_dll\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Gm /GZ /Fd..\..\..\bin\vcud_dll\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_WINDOWS" /d _DEBUG ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_WINDOWS" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxlua.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib lua5.1.lib wxmsw28ud_stc.lib wxmsw28ud_xrc.lib wxmsw28ud_html.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\vcud_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw28ud_wxlua.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib lua5.1.lib wxmsw28ud_stc.lib wxmsw28ud_xrc.lib wxmsw28ud_html.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\vcud_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Unicode Release Monolithic" *************** *** 106,121 **** # PROP Intermediate_Dir "vcmsw_udll\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "modules\lua\include" /Fd..\..\..\bin\vcu_dll\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "modules\lua\include" /Fd..\..\..\bin\vcu_dll\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "modules\lua\include" /d _WINDOWS ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "modules\lua\include" /d _WINDOWS BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vcu_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"modules\lua\lib" /subsystem:windows ! # ADD LINK32 wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vcu_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"modules\lua\lib" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Unicode Release Multilib" --- 106,121 ---- # PROP Intermediate_Dir "vcmsw_udll\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vcu_dll\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vcu_dll\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _WINDOWS ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _WINDOWS BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vcu_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows ! # ADD LINK32 wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vcu_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Unicode Release Multilib" *************** *** 131,146 **** # PROP Intermediate_Dir "vcmsw_udll\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "modules\lua\include" /Fd..\..\..\bin\vcu_dll\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "modules\lua\include" /Fd..\..\..\bin\vcu_dll\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "modules\lua\include" /d _WINDOWS ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "modules\lua\include" /d _WINDOWS BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib lua5.1.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.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\vcu_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"modules\lua\lib" /subsystem:windows ! # ADD LINK32 wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib lua5.1.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.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\vcu_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"modules\lua\lib" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Debug Monolithic" --- 131,146 ---- # PROP Intermediate_Dir "vcmsw_udll\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vcu_dll\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vcu_dll\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _WINDOWS ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _WINDOWS BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib lua5.1.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.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\vcu_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows ! # ADD LINK32 wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib lua5.1.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.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\vcu_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Debug Monolithic" *************** *** 156,171 **** # PROP Intermediate_Dir "vcmsw_ddll\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "modules\lua\include" /Zi /Gm /GZ /Fd..\..\..\bin\vcd_dll\wxlua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "modules\lua\include" /Zi /Gm /GZ /Fd..\..\..\bin\vcd_dll\wxlua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "modules\lua\include" /d "_WINDOWS" /d _DEBUG ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "modules\lua\include" /d "_WINDOWS" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxlua.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib lua5.1.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\vcd_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"modules\lua\lib" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw28d_wxlua.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib lua5.1.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\vcd_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"modules\lua\lib" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Debug Multilib" --- 156,171 ---- # PROP Intermediate_Dir "vcmsw_ddll\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Gm /GZ /Fd..\..\..\bin\vcd_dll\wxlua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Gm /GZ /Fd..\..\..\bin\vcd_dll\wxlua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_WINDOWS" /d _DEBUG ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_WINDOWS" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxlua.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib lua5.1.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\vcd_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw28d_wxlua.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib lua5.1.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\vcd_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Debug Multilib" *************** *** 181,196 **** # PROP Intermediate_Dir "vcmsw_ddll\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "modules\lua\include" /Zi /Gm /GZ /Fd..\..\..\bin\vcd_dll\wxlua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "modules\lua\include" /Zi /Gm /GZ /Fd..\..\..\bin\vcd_dll\wxlua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "modules\lua\include" /d "_WINDOWS" /d _DEBUG ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "modules\lua\include" /d "_WINDOWS" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxlua.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib lua5.1.lib wxmsw28d_stc.lib wxmsw28d_xrc.lib wxmsw28d_html.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\vcd_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"modules\lua\lib" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw28d_wxlua.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib lua5.1.lib wxmsw28d_stc.lib wxmsw28d_xrc.lib wxmsw28d_html.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\vcd_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"modules\lua\lib" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Release Monolithic" --- 181,196 ---- # PROP Intermediate_Dir "vcmsw_ddll\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Gm /GZ /Fd..\..\..\bin\vcd_dll\wxlua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Gm /GZ /Fd..\..\..\bin\vcd_dll\wxlua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_WINDOWS" /d _DEBUG ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_WINDOWS" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxlua.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib lua5.1.lib wxmsw28d_stc.lib wxmsw28d_xrc.lib wxmsw28d_html.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\vcd_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw28d_wxlua.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib lua5.1.lib wxmsw28d_stc.lib wxmsw28d_xrc.lib wxmsw28d_html.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\vcd_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Release Monolithic" *************** *** 206,221 **** # PROP Intermediate_Dir "vcmsw_dll\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "modules\lua\include" /Fd..\..\..\bin\vc_dll\wxlua.pdb /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "modules\lua\include" /Fd..\..\..\bin\vc_dll\wxlua.pdb /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "modules\lua\include" /d _WINDOWS ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "modules\lua\include" /d _WINDOWS BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxlua.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"modules\lua\lib" /subsystem:windows ! # ADD LINK32 wxlua_msw28_wxlua.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"modules\lua\lib" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Release Multilib" --- 206,221 ---- # PROP Intermediate_Dir "vcmsw_dll\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\wxlua.pdb /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\wxlua.pdb /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _WINDOWS ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _WINDOWS BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxlua.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows ! # ADD LINK32 wxlua_msw28_wxlua.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Release Multilib" *************** *** 231,246 **** # PROP Intermediate_Dir "vcmsw_dll\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "modules\lua\include" /Fd..\..\..\bin\vc_dll\wxlua.pdb /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "modules\lua\include" /Fd..\..\..\bin\vc_dll\wxlua.pdb /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\.... [truncated message content] |
|
From: Francesco M. <fr...@us...> - 2006-12-19 22:24:16
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21377/modules/build/bakefiles Modified Files: modules.bkl Log Message: get rid of WX_UNICODE and WX_DEBUG (again); removed the 'verbatim' name from modules and apps; added explanatory comments about the naming of our vanilla lua; renamed our lua interpreter to just 'lua' (as for the standard lua distro); now LUA_DIR is set correctly for windows builds; now USE_SYSTEM_LUA and LUA_DIR are passed through subprojects Index: modules.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** modules.bkl 19 Dec 2006 21:12:00 -0000 1.40 --- modules.bkl 19 Dec 2006 22:24:12 -0000 1.41 *************** *** 44,54 **** <!-- ================================================================== --> ! <!-- the VERBATIM lua lib & dll: these are needed for linking the "mod_luamodule" ! (see below); in fact, trying to link statically "mod_luamodule" with lua core ! is not a Good Thing ! See http://lua-users.org/wiki/BuildingModules to understand why (basically because lua core gets duplicated). ! Instead we need a verbatim lua DLL to create the "wx.so/.dll" DLL without any ! dangerous duplication of code. --> <lib id="lua_lib" cond="SHARED=='0' and USE_SYSTEM_LUA=='0'"> --- 44,58 ---- <!-- ================================================================== --> ! <!-- the lua lib & dll: these are needed by all wxLua modules, specially for ! linking the "mod_luamodule" (see below); in fact, compiling statically the ! lua interpreter into "mod_luamodule" is not a Good Thing ! ! See http://lua-users.org/wiki/BuildingModules to understand why (basically because lua core gets duplicated). ! NOTE: this is the vanilla lua interpreter and thus we _can_ and we ! _want_ to name it exactly like the "official" lua. ! In fact, it's very important that the mod_luamodule gets linked ! against a DSO/DLL named "lua5.1[.dll]" so that our "wx[.dll]" ! can be used just like any other Lua module. --> <lib id="lua_lib" cond="SHARED=='0' and USE_SYSTEM_LUA=='0'"> *************** *** 70,75 **** <dll id="lua_dll" cond="SHARED=='1' and USE_SYSTEM_LUA=='0'"> <dirname>$(WXLUA_LIBOUTPUT_PATH)</dirname> - - <!-- FIXME --> <libname>lua5.1</libname> <dllname>lua5.1</dllname> --- 74,77 ---- |
|
From: Francesco M. <fr...@us...> - 2006-12-19 22:24:16
|
Update of /cvsroot/wxlua/wxLua/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21377/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat wxLua.dsw Log Message: get rid of WX_UNICODE and WX_DEBUG (again); removed the 'verbatim' name from modules and apps; added explanatory comments about the naming of our vanilla lua; renamed our lua interpreter to just 'lua' (as for the standard lua distro); now LUA_DIR is set correctly for windows builds; now USE_SYSTEM_LUA and LUA_DIR are passed through subprojects Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.vc,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** makefile.vc 19 Dec 2006 21:12:00 -0000 1.39 --- makefile.vc 19 Dec 2006 22:24:11 -0000 1.40 *************** *** 49,61 **** WX_SHARED = 0 - # Compile Unicode build of wxWidgets? [0,1] - # 1 - Unicode - WX_UNICODE = 0 - - # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] - # 0 - Release - # 1 - Debug - WX_DEBUG = 1 - # Version of the wx library to build against. WX_VERSION = 28 --- 49,52 ---- *************** *** 69,72 **** --- 60,69 ---- USE_APPS = 1 + # Should wxLua use the system-wide Lua library ? [0,1] + USE_SYSTEM_LUA = 0 + + # The path to the Lua library + LUA_DIR = ..\..\..\modules\lua + # Does the wxLua bindings for STC need to be compiled ? [0,1] USE_WXBINDSTC = 1 *************** *** 107,118 **** CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)" \ UNICODE="$(UNICODE)" SHARED="$(SHARED)" WX_DIR="$(WX_DIR)" \ ! WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \ ! WX_VERSION="$(WX_VERSION)" WX_MONOLITHIC="$(WX_MONOLITHIC)" \ ! USE_APPS="$(USE_APPS)" USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" \ ! LUA_DIR="$(LUA_DIR)" USE_WXBINDSTC="$(USE_WXBINDSTC)" \ ! USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" \ ! USE_LUAMODULE="$(USE_LUAMODULE)" USE_WXLUAAPP="$(USE_WXLUAAPP)" \ ! USE_WXLUACANAPP="$(USE_WXLUACANAPP)" WXSTEDIT_DIR="$(WXSTEDIT_DIR)" \ ! USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \ USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" --- 104,114 ---- CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)" \ UNICODE="$(UNICODE)" SHARED="$(SHARED)" WX_DIR="$(WX_DIR)" \ ! WX_SHARED="$(WX_SHARED)" WX_VERSION="$(WX_VERSION)" \ ! WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" \ ! USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" LUA_DIR="$(LUA_DIR)" \ ! USE_WXBINDSTC="$(USE_WXBINDSTC)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" \ ! USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_LUAMODULE="$(USE_LUAMODULE)" \ ! USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUACANAPP="$(USE_WXLUACANAPP)" \ ! WXSTEDIT_DIR="$(WXSTEDIT_DIR)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \ USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" *************** *** 134,146 **** __apps___depname = sub_apps !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" ! WXLIBPOSTFIX = u ! !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0" WXLIBPOSTFIX = d !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1" WXLIBPOSTFIX = ud !endif --- 130,142 ---- __apps___depname = sub_apps !endif ! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "0" WXLIBPOSTFIX = d !endif ! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "1" WXLIBPOSTFIX = ud !endif + !if "$(BUILD)" == "release" && "$(UNICODE)" == "1" + WXLIBPOSTFIX = u + !endif Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.bcc,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** makefile.bcc 19 Dec 2006 21:12:00 -0000 1.36 --- makefile.bcc 19 Dec 2006 22:24:11 -0000 1.37 *************** *** 75,88 **** !endif - # Compile Unicode build of wxWidgets? [0,1] - !ifndef WX_UNICODE - WX_UNICODE = 0 - !endif - - # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] - !ifndef WX_DEBUG - WX_DEBUG = 1 - !endif - # Version of the wx library to build against. !ifndef WX_VERSION --- 75,78 ---- *************** *** 107,111 **** # The path to the Lua library !ifndef LUA_DIR ! LUA_DIR = modules\lua !endif --- 97,101 ---- # The path to the Lua library !ifndef LUA_DIR ! LUA_DIR = ..\..\..\modules\lua !endif *************** *** 167,171 **** -DBUILD="$(BUILD)" -DUNICODE="$(UNICODE)" -DSHARED="$(SHARED)" \ -DWX_DIR="$(WX_DIR)" -DWX_SHARED="$(WX_SHARED)" \ - -DWX_UNICODE="$(WX_UNICODE)" -DWX_DEBUG="$(WX_DEBUG)" \ -DWX_VERSION="$(WX_VERSION)" -DWX_MONOLITHIC="$(WX_MONOLITHIC)" \ -DUSE_APPS="$(USE_APPS)" -DUSE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" \ --- 157,160 ---- *************** *** 179,194 **** ### Conditionally set variables: ### - !if "$(BUILD)" == "debug" - WX_DEBUG = 1 - !endif - !if "$(BUILD)" == "release" - WX_DEBUG = 0 - !endif - !if "$(UNICODE)" == "0" - WX_UNICODE = 0 - !endif - !if "$(UNICODE)" == "1" - WX_UNICODE = 1 - !endif !if "$(SHARED)" == "0" SHARED_SUFFIX = --- 168,171 ---- *************** *** 206,218 **** __apps___depname = apps !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" ! WXLIBPOSTFIX = u ! !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0" WXLIBPOSTFIX = d !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1" WXLIBPOSTFIX = ud !endif --- 183,195 ---- __apps___depname = apps !endif ! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "0" WXLIBPOSTFIX = d !endif ! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "1" WXLIBPOSTFIX = ud !endif + !if "$(BUILD)" == "release" && "$(UNICODE)" == "1" + WXLIBPOSTFIX = u + !endif Index: wxLua.dsw =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/wxLua.dsw,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxLua.dsw 11 Dec 2006 15:29:43 -0000 1.16 --- wxLua.dsw 19 Dec 2006 22:24:11 -0000 1.17 *************** *** 4,8 **** ############################################################################### ! Project: "app_lua"=..\..\apps\build\msw\apps_app_verbatimlua.dsp - Package Owner=<4> Package=<5> --- 4,8 ---- ############################################################################### ! Project: "app_lua"=..\..\apps\build\msw\apps_app_lua.dsp - Package Owner=<4> Package=<5> *************** *** 13,17 **** {{{ Begin Project Dependency ! Project_Dep_Name mod_verbatimlua End Project Dependency }}} --- 13,17 ---- {{{ Begin Project Dependency ! Project_Dep_Name mod_lua End Project Dependency }}} *************** *** 28,32 **** {{{ Begin Project Dependency ! Project_Dep_Name mod_verbatimlua End Project Dependency Begin Project Dependency --- 28,32 ---- {{{ Begin Project Dependency ! Project_Dep_Name mod_lua End Project Dependency Begin Project Dependency *************** *** 58,62 **** {{{ Begin Project Dependency ! Project_Dep_Name mod_verbatimlua End Project Dependency Begin Project Dependency --- 58,62 ---- {{{ Begin Project Dependency ! Project_Dep_Name mod_lua End Project Dependency Begin Project Dependency *************** *** 85,89 **** {{{ Begin Project Dependency ! Project_Dep_Name mod_verbatimlua End Project Dependency Begin Project Dependency --- 85,89 ---- {{{ Begin Project Dependency ! Project_Dep_Name mod_lua End Project Dependency Begin Project Dependency *************** *** 115,119 **** {{{ Begin Project Dependency ! Project_Dep_Name mod_verbatimlua End Project Dependency Begin Project Dependency --- 115,119 ---- {{{ Begin Project Dependency ! Project_Dep_Name mod_lua End Project Dependency Begin Project Dependency *************** *** 136,140 **** ############################################################################### ! Project: "mod_verbatimlua"=..\..\modules\build\msw\modules_mod_verbatimlua.dsp - Package Owner=<4> Package=<5> --- 136,140 ---- ############################################################################### ! Project: "mod_lua"=..\..\modules\build\msw\modules_mod_lua.dsp - Package Owner=<4> Package=<5> *************** *** 157,161 **** {{{ Begin Project Dependency ! Project_Dep_Name mod_verbatimlua End Project Dependency }}} --- 157,161 ---- {{{ Begin Project Dependency ! Project_Dep_Name mod_lua End Project Dependency }}} *************** *** 172,176 **** {{{ Begin Project Dependency ! Project_Dep_Name mod_verbatimlua End Project Dependency Begin Project Dependency --- 172,176 ---- {{{ Begin Project Dependency ! Project_Dep_Name mod_lua End Project Dependency Begin Project Dependency *************** *** 190,194 **** {{{ Begin Project Dependency ! Project_Dep_Name mod_verbatimlua End Project Dependency Begin Project Dependency --- 190,194 ---- {{{ Begin Project Dependency ! Project_Dep_Name mod_lua End Project Dependency Begin Project Dependency *************** *** 211,215 **** {{{ Begin Project Dependency ! Project_Dep_Name mod_verbatimlua End Project Dependency Begin Project Dependency --- 211,215 ---- {{{ Begin Project Dependency ! Project_Dep_Name mod_lua End Project Dependency Begin Project Dependency *************** *** 229,233 **** {{{ Begin Project Dependency ! Project_Dep_Name mod_verbatimlua End Project Dependency Begin Project Dependency --- 229,233 ---- {{{ Begin Project Dependency ! Project_Dep_Name mod_lua End Project Dependency Begin Project Dependency *************** *** 250,254 **** {{{ Begin Project Dependency ! Project_Dep_Name mod_verbatimlua End Project Dependency Begin Project Dependency --- 250,254 ---- {{{ Begin Project Dependency ! Project_Dep_Name mod_lua End Project Dependency Begin Project Dependency Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.wat,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** makefile.wat 19 Dec 2006 21:12:00 -0000 1.38 --- makefile.wat 19 Dec 2006 22:24:11 -0000 1.39 *************** *** 49,61 **** WX_SHARED = 0 - # Compile Unicode build of wxWidgets? [0,1] - # 1 - Unicode - WX_UNICODE = 0 - - # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] - # 0 - Release - # 1 - Debug - WX_DEBUG = 1 - # Version of the wx library to build against. WX_VERSION = 28 --- 49,52 ---- *************** *** 69,72 **** --- 60,69 ---- USE_APPS = 1 + # Should wxLua use the system-wide Lua library ? [0,1] + USE_SYSTEM_LUA = 0 + + # The path to the Lua library + LUA_DIR = ..\..\..\modules\lua + # Does the wxLua bindings for STC need to be compiled ? [0,1] USE_WXBINDSTC = 1 *************** *** 138,156 **** !endif WXLIBPOSTFIX = ! !ifeq WX_DEBUG 0 ! !ifeq WX_UNICODE 1 ! WXLIBPOSTFIX = u ! !endif ! !endif ! !ifeq WX_DEBUG 1 ! !ifeq WX_UNICODE 0 WXLIBPOSTFIX = d !endif !endif ! !ifeq WX_DEBUG 1 ! !ifeq WX_UNICODE 1 WXLIBPOSTFIX = ud !endif !endif ### Variables: ### --- 135,153 ---- !endif WXLIBPOSTFIX = ! !ifeq BUILD debug ! !ifeq UNICODE 0 WXLIBPOSTFIX = d !endif !endif ! !ifeq BUILD debug ! !ifeq UNICODE 1 WXLIBPOSTFIX = ud !endif !endif + !ifeq BUILD release + !ifeq UNICODE 1 + WXLIBPOSTFIX = u + !endif + !endif ### Variables: ### *************** *** 159,170 **** CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)" & UNICODE="$(UNICODE)" SHARED="$(SHARED)" WX_DIR="$(WX_DIR)" & ! WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" & ! WX_VERSION="$(WX_VERSION)" WX_MONOLITHIC="$(WX_MONOLITHIC)" & ! USE_APPS="$(USE_APPS)" USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" & ! LUA_DIR="$(LUA_DIR)" USE_WXBINDSTC="$(USE_WXBINDSTC)" & ! USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" & ! USE_LUAMODULE="$(USE_LUAMODULE)" USE_WXLUAAPP="$(USE_WXLUAAPP)" & ! USE_WXLUACANAPP="$(USE_WXLUACANAPP)" WXSTEDIT_DIR="$(WXSTEDIT_DIR)" & ! USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" & USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" --- 156,166 ---- CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)" & UNICODE="$(UNICODE)" SHARED="$(SHARED)" WX_DIR="$(WX_DIR)" & ! WX_SHARED="$(WX_SHARED)" WX_VERSION="$(WX_VERSION)" & ! WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" & ! USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" LUA_DIR="$(LUA_DIR)" & ! USE_WXBINDSTC="$(USE_WXBINDSTC)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" & ! USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_LUAMODULE="$(USE_LUAMODULE)" & ! USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUACANAPP="$(USE_WXLUACANAPP)" & ! WXSTEDIT_DIR="$(WXSTEDIT_DIR)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" & USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.gcc,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** makefile.gcc 19 Dec 2006 21:12:00 -0000 1.37 --- makefile.gcc 19 Dec 2006 22:24:11 -0000 1.38 *************** *** 44,53 **** WX_SHARED = 0 - # Compile Unicode build of wxWidgets? [0,1] - WX_UNICODE = 0 - - # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] - WX_DEBUG = 1 - # Version of the wx library to build against. WX_VERSION = 28 --- 44,47 ---- *************** *** 59,62 **** --- 53,62 ---- USE_APPS = 1 + # Should wxLua use the system-wide Lua library ? [0,1] + USE_SYSTEM_LUA = 0 + + # The path to the Lua library + LUA_DIR = ..\..\..\modules\lua + # Does the wxLua bindings for STC need to be compiled ? [0,1] USE_WXBINDSTC = 1 *************** *** 97,108 **** CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)" \ UNICODE="$(UNICODE)" SHARED="$(SHARED)" WX_DIR="$(WX_DIR)" \ ! WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \ ! WX_VERSION="$(WX_VERSION)" WX_MONOLITHIC="$(WX_MONOLITHIC)" \ ! USE_APPS="$(USE_APPS)" USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" \ ! LUA_DIR="$(LUA_DIR)" USE_WXBINDSTC="$(USE_WXBINDSTC)" \ ! USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" \ ! USE_LUAMODULE="$(USE_LUAMODULE)" USE_WXLUAAPP="$(USE_WXLUAAPP)" \ ! USE_WXLUACANAPP="$(USE_WXLUACANAPP)" WXSTEDIT_DIR="$(WXSTEDIT_DIR)" \ ! USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \ USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" --- 97,107 ---- CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)" \ UNICODE="$(UNICODE)" SHARED="$(SHARED)" WX_DIR="$(WX_DIR)" \ ! WX_SHARED="$(WX_SHARED)" WX_VERSION="$(WX_VERSION)" \ ! WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" \ ! USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" LUA_DIR="$(LUA_DIR)" \ ! USE_WXBINDSTC="$(USE_WXBINDSTC)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" \ ! USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_LUAMODULE="$(USE_LUAMODULE)" \ ! USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUACANAPP="$(USE_WXLUACANAPP)" \ ! WXSTEDIT_DIR="$(WXSTEDIT_DIR)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \ USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" *************** *** 124,142 **** __apps___depname = apps endif ! ifeq ($(WX_DEBUG),0) ! ifeq ($(WX_UNICODE),1) ! WXLIBPOSTFIX = u ! endif ! endif ! ifeq ($(WX_DEBUG),1) ! ifeq ($(WX_UNICODE),0) WXLIBPOSTFIX = d endif endif ! ifeq ($(WX_DEBUG),1) ! ifeq ($(WX_UNICODE),1) WXLIBPOSTFIX = ud endif endif --- 123,141 ---- __apps___depname = apps endif ! ifeq ($(BUILD),debug) ! ifeq ($(UNICODE),0) WXLIBPOSTFIX = d endif endif ! ifeq ($(BUILD),debug) ! ifeq ($(UNICODE),1) WXLIBPOSTFIX = ud endif endif + ifeq ($(BUILD),release) + ifeq ($(UNICODE),1) + WXLIBPOSTFIX = u + endif + endif |
|
From: Francesco M. <fr...@us...> - 2006-12-19 21:28:23
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv29700/build/bakefiles Modified Files: options.bkl wxlua.bkl Log Message: win32 build fix after last commit Index: options.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/options.bkl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** options.bkl 19 Dec 2006 21:11:59 -0000 1.3 --- options.bkl 19 Dec 2006 21:28:20 -0000 1.4 *************** *** 17,21 **** <set var="USE_APPS_DEFAULT">1</set> <set var="USE_SYSTEM_LUA_DEFAULT">0</set> ! <set var="LUA_DIR_DEFAULT">modules$(DIRSEP)lua</set> --- 17,26 ---- <set var="USE_APPS_DEFAULT">1</set> <set var="USE_SYSTEM_LUA_DEFAULT">0</set> ! ! <!-- don't touch this default! it's used also when using USE_SYSTEM_LUA==0 ! and thus it's very important to keep it set so that the built-in lua ! is used ! --> ! <set var="LUA_DIR_DEFAULT">..\..\..\modules\lua</set> Index: wxlua.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxlua.bkl,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** wxlua.bkl 19 Dec 2006 21:11:59 -0000 1.31 --- wxlua.bkl 19 Dec 2006 21:28:20 -0000 1.32 *************** *** 34,39 **** <!-- generic options --> SHARED BUILD UNICODE ! <!-- wxwidgets build selection options --> WX_DIR WX_VERSION WX_SHARED WX_MONOLITHIC --- 34,42 ---- <!-- generic options --> SHARED BUILD UNICODE + + <!-- global options --> + USE_SYSTEM_LUA LUA_DIR ! <!-- wxWidgets build selection options --> WX_DIR WX_VERSION WX_SHARED WX_MONOLITHIC |
|
From: Francesco M. <fr...@us...> - 2006-12-19 21:12:38
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19847/modules Modified Files: Makefile.in Log Message: now BUILDDIR is set exactly like the wxWidgets builddir system LUA is now used if available on Unix or on Windows with USE_SYSTEM_LUA=1 changed the way the lua headers are included (removed the 'lua/include' prefix) to make it possible to use external lua Now when using built-in LUA the generated library is named lua5.1 and it overwrites any eventually preexisting lua library (when installed). Fixed the "samples" directory copy when srcdir==. Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** Makefile.in 17 Dec 2006 10:33:35 -0000 1.51 --- Makefile.in 19 Dec 2006 21:12:00 -0000 1.52 *************** *** 45,49 **** CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ - WX_CFLAGS = @WX_CFLAGS@ WX_CXXFLAGS = @WX_CXXFLAGS@ WX_LIBS = @WX_LIBS@ --- 45,48 ---- *************** *** 52,55 **** --- 51,55 ---- WX_VERSION_MINOR = @WX_VERSION_MINOR@ [...1421 lines suppressed...] ! lua_dll_lstrlib.o: $(srcdir)/lua/src/lstrlib.c ! $(CCC) -c -o $@ $(LUA_DLL_CFLAGS) $(srcdir)/lua/src/lstrlib.c ! lua_dll_loadlib.o: $(srcdir)/lua/src/loadlib.c ! $(CCC) -c -o $@ $(LUA_DLL_CFLAGS) $(srcdir)/lua/src/loadlib.c ! lua_dll_linit.o: $(srcdir)/lua/src/linit.c ! $(CCC) -c -o $@ $(LUA_DLL_CFLAGS) $(srcdir)/lua/src/linit.c wxlua_lib_wxlcallb.o: $(srcdir)/wxlua/src/wxlcallb.cpp $(WXLUA_LIB_ODEP) *************** *** 1738,1740 **** @IF_GNU_MAKE@-include .deps/*.d ! .PHONY: all install uninstall clean distclean install_verbatimlua_lib uninstall_verbatimlua_lib install_verbatimlua_lib_headers uninstall_verbatimlua_lib_headers install_verbatimlua_dll uninstall_verbatimlua_dll install_verbatimlua_dll_headers uninstall_verbatimlua_dll_headers install_wxlua_lib uninstall_wxlua_lib install_wxlua_lib_headers uninstall_wxlua_lib_headers install_wxlua_dll uninstall_wxlua_dll install_wxlua_dll_headers uninstall_wxlua_dll_headers install_wxbind_lib uninstall_wxbind_lib install_wxbind_lib_headers uninstall_wxbind_lib_headers install_wxbind_dll uninstall_wxbind_dll install_wxbind_dll_headers uninstall_wxbind_dll_headers install_wxbindstc_lib uninstall_wxbindstc_lib install_wxbindstc_lib_headers uninstall_wxbindstc_lib_headers install_wxbindstc_dll uninstall_wxbindstc_dll install_wxbindstc_dll_headers uninstall_wxbindstc_dll_headers install_wxluadebug_lib uninstall_wxluadebug_lib install_wxluadebug_lib_headers uninstall_wxluadebug_lib_headers install_wxluadebug_dll uninstall_wxluadebug_dll install_wxluadebug_dll_headers uninstall_wxluadebug_dll_headers install_wxluasocket_lib uninstall_wxluasocket_lib install_wxluasocket_lib_headers uninstall_wxluasocket_lib_headers install_wxluasocket_dll uninstall_wxluasocket_dll install_wxluasocket_dll_headers uninstall_wxluasocket_dll_headers install_mod_luamodule uninstall_mod_luamodule wxbindsrc wxbindmake wxbindsetup --- 1670,1672 ---- @IF_GNU_MAKE@-include .deps/*.d ! .PHONY: all install uninstall clean distclean install_lua_lib uninstall_lua_lib install_lua_lib_headers uninstall_lua_lib_headers install_lua_dll uninstall_lua_dll install_lua_dll_headers uninstall_lua_dll_headers install_wxlua_lib uninstall_wxlua_lib install_wxlua_lib_headers uninstall_wxlua_lib_headers install_wxlua_dll uninstall_wxlua_dll install_wxlua_dll_headers uninstall_wxlua_dll_headers install_wxbind_lib uninstall_wxbind_lib install_wxbind_lib_headers uninstall_wxbind_lib_headers install_wxbind_dll uninstall_wxbind_dll install_wxbind_dll_headers uninstall_wxbind_dll_headers install_wxbindstc_lib uninstall_wxbindstc_lib install_wxbindstc_lib_headers uninstall_wxbindstc_lib_headers install_wxbindstc_dll uninstall_wxbindstc_dll install_wxbindstc_dll_headers uninstall_wxbindstc_dll_headers install_wxluadebug_lib uninstall_wxluadebug_lib install_wxluadebug_lib_headers uninstall_wxluadebug_lib_headers install_wxluadebug_dll uninstall_wxluadebug_dll install_wxluadebug_dll_headers uninstall_wxluadebug_dll_headers install_wxluasocket_lib uninstall_wxluasocket_lib install_wxluasocket_lib_headers uninstall_wxluasocket_lib_headers install_wxluasocket_dll uninstall_wxluasocket_dll install_wxluasocket_dll_headers uninstall_wxluasocket_dll_headers install_mod_luamodule uninstall_mod_luamodule wxbindsrc wxbindmake wxbindsetup |
|
From: Francesco M. <fr...@us...> - 2006-12-19 21:12:36
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19847/build/bakefiles Modified Files: options.bkl wxlua.bkl wxluabase.bkl Log Message: now BUILDDIR is set exactly like the wxWidgets builddir system LUA is now used if available on Unix or on Windows with USE_SYSTEM_LUA=1 changed the way the lua headers are included (removed the 'lua/include' prefix) to make it possible to use external lua Now when using built-in LUA the generated library is named lua5.1 and it overwrites any eventually preexisting lua library (when installed). Fixed the "samples" directory copy when srcdir==. Index: options.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/options.bkl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** options.bkl 8 Mar 2006 00:06:17 -0000 1.2 --- options.bkl 19 Dec 2006 21:11:59 -0000 1.3 *************** *** 16,20 **** <set var="USE_APPS_DEFAULT">1</set> ! --- 16,21 ---- <set var="USE_APPS_DEFAULT">1</set> ! <set var="USE_SYSTEM_LUA_DEFAULT">0</set> ! <set var="LUA_DIR_DEFAULT">modules$(DIRSEP)lua</set> *************** *** 30,33 **** --- 31,45 ---- <description>Should the wxLua applications be compiled ?</description> </option> + + <option name="USE_SYSTEM_LUA"> + <values>0,1</values> + <default-value>$(USE_SYSTEM_LUA_DEFAULT)</default-value> + <description>Should wxLua use the system-wide Lua library ?</description> + </option> + + <option name="LUA_DIR" category="path"> + <default-value>$(LUA_DIR_DEFAULT)</default-value> + <description>The path to the Lua library</description> + </option> </if> *************** *** 37,40 **** --- 49,54 ---- the default values --> <set var="USE_APPS">$(USE_APPS_DEFAULT)</set> + <set var="USE_SYSTEM_LUA">$(USE_SYSTEM_LUA_DEFAULT)</set> + <set var="LUA_DIR">$(LUA_DIR_DEFAULT)</set> </if> Index: wxluabase.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxluabase.bkl,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** wxluabase.bkl 17 Dec 2006 11:32:21 -0000 1.29 --- wxluabase.bkl 19 Dec 2006 21:11:59 -0000 1.30 *************** *** 51,57 **** ! <!-- This file contains the declaration of the WX & WX-LIB templates --> <include file="wxhacks.bkl"/> --- 51,64 ---- ! <!-- ================================================================== --> ! <!-- OPTIONS --> ! <!-- ================================================================== --> ! ! <!-- This file contains the declaration of the WX & WX-LIB templates and ! of all WX_* options --> <include file="wxhacks.bkl"/> + <!-- the global options --> + <include file="options.bkl"/> *************** *** 167,174 **** <error>Invalid wxlua-lib value !</error> </if> ! <if cond="TARGETING_WIN32=='1'"> <sys-lib>wxlua_$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</sys-lib> </if> ! <if cond="TARGETING_WIN32=='0'"> <sys-lib>wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_$(value)-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)</sys-lib> </if> --- 174,184 ---- <error>Invalid wxlua-lib value !</error> </if> ! <if cond="value=='lua'"> ! <sys-lib>lua5.1</sys-lib> ! </if> ! <if cond="value!='lua' and TARGETING_WIN32=='1'"> <sys-lib>wxlua_$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</sys-lib> </if> ! <if cond="value!='lua' and TARGETING_WIN32=='0'"> <sys-lib>wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_$(value)-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)</sys-lib> </if> *************** *** 221,224 **** --- 231,235 ---- templates specific for wxlua-based apps --> <template id="wxlua-base" template="wxbase"> + <!-- an additional include & link path are required not only on win32 but also on *nix: when compiling the samples or the library the user has not *************** *** 228,231 **** --- 239,245 ---- <!-- this is for art/* files; the ./ is a little hack to avoid formatIfEmpty errors --> <include>./$(WXLUA_BASEDIR)</include> + + <!-- both when we use the system lua or our own lua we need an additional include path --> + <include>$(LUA_DIR)/include</include> </template> *************** *** 244,247 **** --- 258,264 ---- </if> + <!-- both in case we are using system's lua or our own lua, + we need yet another linker path --> + <lib-path>$(LUA_DIR)/lib</lib-path> <!-- same technique used by wx_win32.bkl: this is a placeholder Index: wxlua.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxlua.bkl,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** wxlua.bkl 17 Dec 2006 10:47:41 -0000 1.30 --- wxlua.bkl 19 Dec 2006 21:11:59 -0000 1.31 *************** *** 17,23 **** <include file="wxluabase.bkl"/> - <!-- This file contains the list of global WXLUA options --> - <include file="options.bkl"/> - <!-- This file contains the list of MODULES options --> <include file="../../modules/build/bakefiles/options.bkl"/> --- 17,20 ---- |
|
From: Francesco M. <fr...@us...> - 2006-12-19 21:12:34
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19847/modules/build/bakefiles Modified Files: modules.bkl options.bkl Log Message: now BUILDDIR is set exactly like the wxWidgets builddir system LUA is now used if available on Unix or on Windows with USE_SYSTEM_LUA=1 changed the way the lua headers are included (removed the 'lua/include' prefix) to make it possible to use external lua Now when using built-in LUA the generated library is named lua5.1 and it overwrites any eventually preexisting lua library (when installed). Fixed the "samples" directory copy when srcdir==. Index: options.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/options.bkl,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** options.bkl 20 May 2006 12:01:26 -0000 1.12 --- options.bkl 19 Dec 2006 21:12:00 -0000 1.13 *************** *** 30,36 **** <!-- ================================================================== --> ! <!-- wxbind and wxlua cannot be disabled ! --> <if cond="TARGETING_IDE=='0'"> <option name="USE_WXBINDSTC"> <values>0,1</values> --- 30,37 ---- <!-- ================================================================== --> ! <!-- Note that the Lua, wxBind and wxLua modules cannot be disabled ! --> <if cond="TARGETING_IDE=='0'"> + <option name="USE_WXBINDSTC"> <values>0,1</values> Index: modules.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** modules.bkl 10 Dec 2006 00:47:23 -0000 1.39 --- modules.bkl 19 Dec 2006 21:12:00 -0000 1.40 *************** *** 52,64 **** dangerous duplication of code. --> ! <wxlua_stdlib id="verbatimlua_lib" cond="SHARED=='0'"> ! <module-name>LUA</module-name> <!-- see options.bkl for these --> <cflags>$(LUA_PLATFORM_SPECIFIC_CFLAGS)</cflags> <ldflags>$(LUA_PLATFORM_SPECIFIC_LDFLAGS)</ldflags> ! </wxlua_stdlib> ! <wxlua_stddll id="verbatimlua_dll" cond="SHARED=='1'"> ! <module-name>LUA</module-name> <if cond="TARGETING_WIN32=='1'"> --- 52,89 ---- dangerous duplication of code. --> ! <lib id="lua_lib" cond="SHARED=='0' and USE_SYSTEM_LUA=='0'"> ! <dirname>$(WXLUA_LIBOUTPUT_PATH)</dirname> ! <libname>lua5.1</libname> ! ! <sources>$(LUA_SRC)</sources> ! <headers prefix="lua/include"> ! $(removePrefixFromList('lua/include/', LUA_HDR)) ! </headers> ! ! <install-to>$(LIBDIR)</install-to> ! <install-headers-to>$(INCLUDEDIR)</install-headers-to> <!-- see options.bkl for these --> <cflags>$(LUA_PLATFORM_SPECIFIC_CFLAGS)</cflags> <ldflags>$(LUA_PLATFORM_SPECIFIC_LDFLAGS)</ldflags> ! </lib> ! <dll id="lua_dll" cond="SHARED=='1' and USE_SYSTEM_LUA=='0'"> ! <dirname>$(WXLUA_LIBOUTPUT_PATH)</dirname> ! ! <!-- FIXME --> ! <libname>lua5.1</libname> ! <dllname>lua5.1</dllname> ! ! <version>5.1.0</version> ! <so_version>0.0.0</so_version> ! <mac_version>51</mac_version> ! ! <sources>$(LUA_SRC)</sources> ! <headers prefix="lua/include"> ! $(removePrefixFromList('lua/include/', LUA_HDR)) ! </headers> ! ! <install-to>$(LIBDIR)</install-to> ! <install-headers-to>$(INCLUDEDIR)</install-headers-to> <if cond="TARGETING_WIN32=='1'"> *************** *** 69,73 **** <cflags>$(LUA_PLATFORM_SPECIFIC_CFLAGS)</cflags> <ldflags>$(LUA_PLATFORM_SPECIFIC_LDFLAGS)</ldflags> ! </wxlua_stddll> <!-- the wxLua lib & dll --> --- 94,98 ---- <cflags>$(LUA_PLATFORM_SPECIFIC_CFLAGS)</cflags> <ldflags>$(LUA_PLATFORM_SPECIFIC_LDFLAGS)</ldflags> ! </dll> <!-- the wxLua lib & dll --> *************** *** 133,137 **** <sources>$(LUAMODULE_SRC)</sources> <headers>$(LUAMODULE_HDR)</headers> - <define>WXMAKINGDLL_LUAMODULE</define> --- 158,161 ---- *************** *** 145,149 **** <wxlua-lib>wxluasocket</wxlua-lib> <wxlua-lib>wxluadebug</wxlua-lib> ! <sys-lib>lua5.1</sys-lib> <wx-alllibs-req-bywxlua/> --- 169,173 ---- <wxlua-lib>wxluasocket</wxlua-lib> <wxlua-lib>wxluadebug</wxlua-lib> ! <wxlua-lib>lua</wxlua-lib> <wx-alllibs-req-bywxlua/> *************** *** 155,161 **** targets so to generate only half of the DSP files --> <!-- NOTE: we use 'mod_' as prefix so that when opening the DSW file, the user immediately ! gets a good idea about what is a MODULE and what is a SAMPLE (see the a2d_sample rule) --> <set var="MSVC6PRJ_MERGED_TARGETS"> - mod_verbatimlua=verbatimlua_lib+verbatimlua_dll mod_lua=lua_lib+lua_dll mod_wxlua=wxlua_lib+wxlua_dll --- 179,184 ---- targets so to generate only half of the DSP files --> <!-- NOTE: we use 'mod_' as prefix so that when opening the DSW file, the user immediately ! gets a good idea about what is a MODULE and what is an APP --> <set var="MSVC6PRJ_MERGED_TARGETS"> mod_lua=lua_lib+lua_dll mod_wxlua=wxlua_lib+wxlua_dll |
|
From: Francesco M. <fr...@us...> - 2006-12-19 21:12:34
|
Update of /cvsroot/wxlua/wxLua/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19847/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: now BUILDDIR is set exactly like the wxWidgets builddir system LUA is now used if available on Unix or on Windows with USE_SYSTEM_LUA=1 changed the way the lua headers are included (removed the 'lua/include' prefix) to make it possible to use external lua Now when using built-in LUA the generated library is named lua5.1 and it overwrites any eventually preexisting lua library (when installed). Fixed the "samples" directory copy when srcdir==. Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.vc,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** makefile.vc 17 Dec 2006 10:33:35 -0000 1.38 --- makefile.vc 19 Dec 2006 21:12:00 -0000 1.39 *************** *** 49,52 **** --- 49,61 ---- WX_SHARED = 0 + # Compile Unicode build of wxWidgets? [0,1] + # 1 - Unicode + WX_UNICODE = 0 + + # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] + # 0 - Release + # 1 - Debug + WX_DEBUG = 1 + # Version of the wx library to build against. WX_VERSION = 28 *************** *** 98,107 **** CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)" \ UNICODE="$(UNICODE)" SHARED="$(SHARED)" WX_DIR="$(WX_DIR)" \ ! WX_SHARED="$(WX_SHARED)" WX_VERSION="$(WX_VERSION)" \ ! WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" \ ! USE_WXBINDSTC="$(USE_WXBINDSTC)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" \ ! USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_LUAMODULE="$(USE_LUAMODULE)" \ ! USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUACANAPP="$(USE_WXLUACANAPP)" \ ! WXSTEDIT_DIR="$(WXSTEDIT_DIR)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \ USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" --- 107,118 ---- CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)" \ UNICODE="$(UNICODE)" SHARED="$(SHARED)" WX_DIR="$(WX_DIR)" \ ! WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \ ! WX_VERSION="$(WX_VERSION)" WX_MONOLITHIC="$(WX_MONOLITHIC)" \ ! USE_APPS="$(USE_APPS)" USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" \ ! LUA_DIR="$(LUA_DIR)" USE_WXBINDSTC="$(USE_WXBINDSTC)" \ ! USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" \ ! USE_LUAMODULE="$(USE_LUAMODULE)" USE_WXLUAAPP="$(USE_WXLUAAPP)" \ ! USE_WXLUACANAPP="$(USE_WXLUACANAPP)" WXSTEDIT_DIR="$(WXSTEDIT_DIR)" \ ! USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \ USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" *************** *** 123,140 **** __apps___depname = sub_apps !endif ! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "0" WXLIBPOSTFIX = d !endif ! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "1" WXLIBPOSTFIX = ud !endif - !if "$(BUILD)" == "release" && "$(UNICODE)" == "1" - WXLIBPOSTFIX = u - !endif ! all: vc$(WXLIBPOSTFIX)$(SHARED_SUFFIX) ! vc$(WXLIBPOSTFIX)$(SHARED_SUFFIX): ! -if not exist vc$(WXLIBPOSTFIX)$(SHARED_SUFFIX) mkdir vc$(WXLIBPOSTFIX)$(SHARED_SUFFIX) ### Targets: ### --- 134,151 ---- __apps___depname = sub_apps !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" ! WXLIBPOSTFIX = u ! !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0" WXLIBPOSTFIX = d !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1" WXLIBPOSTFIX = ud !endif ! all: vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX) ! vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX): ! -if not exist vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX) mkdir vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX) ### Targets: ### *************** *** 143,149 **** clean: ! -if exist vc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.obj del vc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.obj ! -if exist vc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.res del vc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.res ! -if exist vc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.pch del vc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.pch cd ..\..\modules\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) clean --- 154,160 ---- clean: ! -if exist vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.obj del vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.obj ! -if exist vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.res del vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.res ! -if exist vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.pch del vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.pch cd ..\..\modules\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) clean Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.bcc,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** makefile.bcc 17 Dec 2006 10:33:35 -0000 1.35 --- makefile.bcc 19 Dec 2006 21:12:00 -0000 1.36 *************** *** 75,78 **** --- 75,88 ---- !endif + # Compile Unicode build of wxWidgets? [0,1] + !ifndef WX_UNICODE + WX_UNICODE = 0 + !endif + + # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] + !ifndef WX_DEBUG + WX_DEBUG = 1 + !endif + # Version of the wx library to build against. !ifndef WX_VERSION *************** *** 90,93 **** --- 100,113 ---- !endif + # Should wxLua use the system-wide Lua library ? [0,1] + !ifndef USE_SYSTEM_LUA + USE_SYSTEM_LUA = 0 + !endif + + # The path to the Lua library + !ifndef LUA_DIR + LUA_DIR = modules\lua + !endif + # Does the wxLua bindings for STC need to be compiled ? [0,1] !ifndef USE_WXBINDSTC *************** *** 147,152 **** -DBUILD="$(BUILD)" -DUNICODE="$(UNICODE)" -DSHARED="$(SHARED)" \ -DWX_DIR="$(WX_DIR)" -DWX_SHARED="$(WX_SHARED)" \ -DWX_VERSION="$(WX_VERSION)" -DWX_MONOLITHIC="$(WX_MONOLITHIC)" \ ! -DUSE_APPS="$(USE_APPS)" -DUSE_WXBINDSTC="$(USE_WXBINDSTC)" \ -DUSE_WXLUADEBUG="$(USE_WXLUADEBUG)" \ -DUSE_WXLUASOCKET="$(USE_WXLUASOCKET)" -DUSE_LUAMODULE="$(USE_LUAMODULE)" \ --- 167,174 ---- -DBUILD="$(BUILD)" -DUNICODE="$(UNICODE)" -DSHARED="$(SHARED)" \ -DWX_DIR="$(WX_DIR)" -DWX_SHARED="$(WX_SHARED)" \ + -DWX_UNICODE="$(WX_UNICODE)" -DWX_DEBUG="$(WX_DEBUG)" \ -DWX_VERSION="$(WX_VERSION)" -DWX_MONOLITHIC="$(WX_MONOLITHIC)" \ ! -DUSE_APPS="$(USE_APPS)" -DUSE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" \ ! -DLUA_DIR="$(LUA_DIR)" -DUSE_WXBINDSTC="$(USE_WXBINDSTC)" \ -DUSE_WXLUADEBUG="$(USE_WXLUADEBUG)" \ -DUSE_WXLUASOCKET="$(USE_WXLUASOCKET)" -DUSE_LUAMODULE="$(USE_LUAMODULE)" \ *************** *** 157,160 **** --- 179,194 ---- ### Conditionally set variables: ### + !if "$(BUILD)" == "debug" + WX_DEBUG = 1 + !endif + !if "$(BUILD)" == "release" + WX_DEBUG = 0 + !endif + !if "$(UNICODE)" == "0" + WX_UNICODE = 0 + !endif + !if "$(UNICODE)" == "1" + WX_UNICODE = 1 + !endif !if "$(SHARED)" == "0" SHARED_SUFFIX = *************** *** 172,189 **** __apps___depname = apps !endif ! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "0" WXLIBPOSTFIX = d !endif ! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "1" WXLIBPOSTFIX = ud !endif - !if "$(BUILD)" == "release" && "$(UNICODE)" == "1" - WXLIBPOSTFIX = u - !endif ! all: bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX) ! bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX): ! -if not exist bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX) mkdir bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX) ### Targets: ### --- 206,223 ---- __apps___depname = apps !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" ! WXLIBPOSTFIX = u ! !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0" WXLIBPOSTFIX = d !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1" WXLIBPOSTFIX = ud !endif ! all: bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX) ! bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX): ! -if not exist bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX) mkdir bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX) ### Targets: ### *************** *** 192,206 **** clean: ! -if exist bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.obj del bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.obj ! -if exist bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.res del bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.res ! -if exist bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.csm del bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.csm ! @echo cd ..\..\modules\build\msw >bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\modules.bat ! @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\modules.bat ! call bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\modules.bat ! @del bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\modules.bat ! @echo cd ..\..\apps\build\msw >bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\apps.bat ! @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\apps.bat ! call bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\apps.bat ! @del bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\apps.bat ..\..\lib\bcc_dll: --- 226,240 ---- clean: ! -if exist bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.obj del bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.obj ! -if exist bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.res del bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.res ! -if exist bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.csm del bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.csm ! @echo cd ..\..\modules\build\msw >bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\modules.bat ! @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\modules.bat ! call bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\modules.bat ! @del bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\modules.bat ! @echo cd ..\..\apps\build\msw >bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\apps.bat ! @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\apps.bat ! call bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\apps.bat ! @del bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\apps.bat ..\..\lib\bcc_dll: *************** *** 214,228 **** modules: ! @echo cd ..\..\modules\build\msw >bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\modules.bat ! @echo $(MAKE) -f makefile.bcc $(MAKEARGS) >>bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\modules.bat ! call bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\modules.bat ! @del bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\modules.bat !if "$(USE_APPS)" == "1" apps: ! @echo cd ..\..\apps\build\msw >bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\apps.bat ! @echo $(MAKE) -f makefile.bcc $(MAKEARGS) >>bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\apps.bat ! call bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\apps.bat ! @del bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\apps.bat !endif --- 248,262 ---- modules: ! @echo cd ..\..\modules\build\msw >bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\modules.bat ! @echo $(MAKE) -f makefile.bcc $(MAKEARGS) >>bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\modules.bat ! call bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\modules.bat ! @del bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\modules.bat !if "$(USE_APPS)" == "1" apps: ! @echo cd ..\..\apps\build\msw >bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\apps.bat ! @echo $(MAKE) -f makefile.bcc $(MAKEARGS) >>bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\apps.bat ! call bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\apps.bat ! @del bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\apps.bat !endif Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.wat,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** makefile.wat 17 Dec 2006 10:33:35 -0000 1.37 --- makefile.wat 19 Dec 2006 21:12:00 -0000 1.38 *************** *** 49,52 **** --- 49,61 ---- WX_SHARED = 0 + # Compile Unicode build of wxWidgets? [0,1] + # 1 - Unicode + WX_UNICODE = 0 + + # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] + # 0 - Release + # 1 - Debug + WX_DEBUG = 1 + # Version of the wx library to build against. WX_VERSION = 28 *************** *** 129,145 **** !endif WXLIBPOSTFIX = ! !ifeq BUILD debug ! !ifeq UNICODE 0 ! WXLIBPOSTFIX = d !endif !endif ! !ifeq BUILD debug ! !ifeq UNICODE 1 ! WXLIBPOSTFIX = ud !endif !endif ! !ifeq BUILD release ! !ifeq UNICODE 1 ! WXLIBPOSTFIX = u !endif !endif --- 138,154 ---- !endif WXLIBPOSTFIX = ! !ifeq WX_DEBUG 0 ! !ifeq WX_UNICODE 1 ! WXLIBPOSTFIX = u !endif !endif ! !ifeq WX_DEBUG 1 ! !ifeq WX_UNICODE 0 ! WXLIBPOSTFIX = d !endif !endif ! !ifeq WX_DEBUG 1 ! !ifeq WX_UNICODE 1 ! WXLIBPOSTFIX = ud !endif !endif *************** *** 150,165 **** CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)" & UNICODE="$(UNICODE)" SHARED="$(SHARED)" WX_DIR="$(WX_DIR)" & ! WX_SHARED="$(WX_SHARED)" WX_VERSION="$(WX_VERSION)" & ! WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" & ! USE_WXBINDSTC="$(USE_WXBINDSTC)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" & ! USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_LUAMODULE="$(USE_LUAMODULE)" & ! USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUACANAPP="$(USE_WXLUACANAPP)" & ! WXSTEDIT_DIR="$(WXSTEDIT_DIR)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" & USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" ! all : wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX) ! wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX) : ! -if not exist wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX) mkdir wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX) ### Targets: ### --- 159,176 ---- CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)" & UNICODE="$(UNICODE)" SHARED="$(SHARED)" WX_DIR="$(WX_DIR)" & ! WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" & ! WX_VERSION="$(WX_VERSION)" WX_MONOLITHIC="$(WX_MONOLITHIC)" & ! USE_APPS="$(USE_APPS)" USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" & ! LUA_DIR="$(LUA_DIR)" USE_WXBINDSTC="$(USE_WXBINDSTC)" & ! USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" & ! USE_LUAMODULE="$(USE_LUAMODULE)" USE_WXLUAAPP="$(USE_WXLUAAPP)" & ! USE_WXLUACANAPP="$(USE_WXLUACANAPP)" WXSTEDIT_DIR="$(WXSTEDIT_DIR)" & ! USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" & USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" ! all : watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX) ! watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX) : ! -if not exist watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX) mkdir watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX) ### Targets: ### *************** *** 168,176 **** clean : .SYMBOLIC ! -if exist wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.obj del wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.obj ! -if exist wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.res del wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.res ! -if exist wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.lbc del wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.lbc ! -if exist wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.ilk del wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.ilk ! -if exist wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.pch del wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.pch cd ..\..\modules\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean --- 179,187 ---- clean : .SYMBOLIC ! -if exist watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.obj del watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.obj ! -if exist watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.res del watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.res ! -if exist watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.lbc del watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.lbc ! -if exist watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.ilk del watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.ilk ! -if exist watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.pch del watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.pch cd ..\..\modules\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.gcc,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** makefile.gcc 17 Dec 2006 10:33:35 -0000 1.36 --- makefile.gcc 19 Dec 2006 21:12:00 -0000 1.37 *************** *** 44,47 **** --- 44,53 ---- WX_SHARED = 0 + # Compile Unicode build of wxWidgets? [0,1] + WX_UNICODE = 0 + + # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] + WX_DEBUG = 1 + # Version of the wx library to build against. WX_VERSION = 28 *************** *** 91,100 **** CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)" \ UNICODE="$(UNICODE)" SHARED="$(SHARED)" WX_DIR="$(WX_DIR)" \ ! WX_SHARED="$(WX_SHARED)" WX_VERSION="$(WX_VERSION)" \ ! WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" \ ! USE_WXBINDSTC="$(USE_WXBINDSTC)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" \ ! USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_LUAMODULE="$(USE_LUAMODULE)" \ ! USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUACANAPP="$(USE_WXLUACANAPP)" \ ! WXSTEDIT_DIR="$(WXSTEDIT_DIR)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \ USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" --- 97,108 ---- CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)" \ UNICODE="$(UNICODE)" SHARED="$(SHARED)" WX_DIR="$(WX_DIR)" \ ! WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \ ! WX_VERSION="$(WX_VERSION)" WX_MONOLITHIC="$(WX_MONOLITHIC)" \ ! USE_APPS="$(USE_APPS)" USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" \ ! LUA_DIR="$(LUA_DIR)" USE_WXBINDSTC="$(USE_WXBINDSTC)" \ ! USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" \ ! USE_LUAMODULE="$(USE_LUAMODULE)" USE_WXLUAAPP="$(USE_WXLUAAPP)" \ ! USE_WXLUACANAPP="$(USE_WXLUACANAPP)" WXSTEDIT_DIR="$(WXSTEDIT_DIR)" \ ! USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \ USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" *************** *** 116,139 **** __apps___depname = apps endif ! ifeq ($(BUILD),debug) ! ifeq ($(UNICODE),0) ! WXLIBPOSTFIX = d endif endif ! ifeq ($(BUILD),debug) ! ifeq ($(UNICODE),1) ! WXLIBPOSTFIX = ud endif endif ! ifeq ($(BUILD),release) ! ifeq ($(UNICODE),1) ! WXLIBPOSTFIX = u endif endif ! all: gcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX) ! gcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX): ! -if not exist gcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX) mkdir gcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX) ### Targets: ### --- 124,147 ---- __apps___depname = apps endif ! ifeq ($(WX_DEBUG),0) ! ifeq ($(WX_UNICODE),1) ! WXLIBPOSTFIX = u endif endif ! ifeq ($(WX_DEBUG),1) ! ifeq ($(WX_UNICODE),0) ! WXLIBPOSTFIX = d endif endif ! ifeq ($(WX_DEBUG),1) ! ifeq ($(WX_UNICODE),1) ! WXLIBPOSTFIX = ud endif endif ! all: gccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX) ! gccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX): ! -if not exist gccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX) mkdir gccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX) ### Targets: ### *************** *** 142,147 **** clean: ! -if exist gcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.o del gcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.o ! -if exist gcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.d del gcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.d $(MAKE) -C ..\..\modules\build\msw -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C ..\..\apps\build\msw -f makefile.gcc $(MAKEARGS) clean --- 150,155 ---- clean: ! -if exist gccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.o del gccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.o ! -if exist gccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.d del gccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.d $(MAKE) -C ..\..\modules\build\msw -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C ..\..\apps\build\msw -f makefile.gcc $(MAKEARGS) clean *************** *** 183,185 **** # Dependencies tracking: ! -include gcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)/*.d --- 191,193 ---- # Dependencies tracking: ! -include gccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)/*.d |
|
From: Francesco M. <fr...@us...> - 2006-12-19 21:12:33
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19847/build/autoconf Modified Files: aclocal.m4 autoconf_inc.m4 configure.ac Log Message: now BUILDDIR is set exactly like the wxWidgets builddir system LUA is now used if available on Unix or on Windows with USE_SYSTEM_LUA=1 changed the way the lua headers are included (removed the 'lua/include' prefix) to make it possible to use external lua Now when using built-in LUA the generated library is named lua5.1 and it overwrites any eventually preexisting lua library (when installed). Fixed the "samples" directory copy when srcdir==. Index: autoconf_inc.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/autoconf_inc.m4,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** autoconf_inc.m4 11 Dec 2006 00:08:19 -0000 1.20 --- autoconf_inc.m4 19 Dec 2006 21:11:59 -0000 1.21 *************** *** 117,120 **** --- 117,126 ---- fi AC_SUBST(COND_SHARED_0) + dnl ### begin block 20_COND_SHARED_0_USE_SYSTEM_LUA_0[../../modules/build/bakefiles/modules.bkl] ### + COND_SHARED_0_USE_SYSTEM_LUA_0="#" + if test "x$SHARED" = "x0" -a "x$USE_SYSTEM_LUA" = "x0" ; then + COND_SHARED_0_USE_SYSTEM_LUA_0="" + fi + AC_SUBST(COND_SHARED_0_USE_SYSTEM_LUA_0) dnl ### begin block 20_COND_SHARED_0_USE_WXBINDSTC_1[../../modules/build/bakefiles/modules.bkl] ### COND_SHARED_0_USE_WXBINDSTC_1="#" *************** *** 147,150 **** --- 153,162 ---- fi AC_SUBST(COND_SHARED_1_USE_LUAMODULE_1) + dnl ### begin block 20_COND_SHARED_1_USE_SYSTEM_LUA_0[../../modules/build/bakefiles/modules.bkl] ### + COND_SHARED_1_USE_SYSTEM_LUA_0="#" + if test "x$SHARED" = "x1" -a "x$USE_SYSTEM_LUA" = "x0" ; then + COND_SHARED_1_USE_SYSTEM_LUA_0="" + fi + AC_SUBST(COND_SHARED_1_USE_SYSTEM_LUA_0) dnl ### begin block 20_COND_SHARED_1_USE_WXBINDSTC_1[../../modules/build/bakefiles/modules.bkl] ### COND_SHARED_1_USE_WXBINDSTC_1="#" Index: configure.ac =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** configure.ac 11 Dec 2006 00:08:19 -0000 1.33 --- configure.ac 19 Dec 2006 21:11:59 -0000 1.34 *************** *** 60,63 **** --- 60,67 ---- [], [enable_customwxbind_install=yes]) + AC_ARG_WITH([lua-prefix], + [AC_HELP_STRING([--with-lua-prefix], [Prefix where Lua is installed (optional)])], + [lua_dir="$withval"], [lua_dir=""]) + AM_YESNO_OPTCHECK([USE_WXLUAAPP], [enable_wxlua_app], [--enable-wxlua-app]) *************** *** 74,77 **** --- 78,99 ---- + + AC_MSG_CHECKING([for --with-lua-prefix option]) + if [[ $lua_dir != "" ]]; then + + # user explicitely provided a path to its own lua, check that it's an absolute path + # (or it won't work for out-of-tree builds) + case $lua_dir in + /*) continue;; + *) + AC_MSG_ERROR([ + You must provide an absolute path for the --with-lua-prefix option. + ]) + esac + fi + AC_MSG_RESULT([$lua_dir]) + + + # Global wxLua options: # we could use these to define options like --enable-all-apps but these would *************** *** 91,95 **** ##################################################################### - # check for wxWidgets # --- 113,116 ---- *************** *** 102,133 **** ! # Checks used to determine right LUA flags (see modules/lua/src/Makefile) ! luadefs= ! lualibs= ! # these do not require additional libs ! AC_CHECK_FUNC([isatty], [luadefs="$luadefs -DLUA_USE_ISATTY"]) ! AC_CHECK_FUNC([mkstemp], [luadefs="$luadefs -DLUA_USE_MKSTEMP"]) ! AC_CHECK_FUNC([popen], [luadefs="$luadefs -DLUA_USE_POPEN"]) ! AC_CHECK_FUNC([_longjmp], [luadefs="$luadefs -DLUA_USE_ULONGJMP"]) ! # these require addlibs ! AC_CHECK_LIB([dl], [dlopen], [ ! AC_CHECK_HEADER([dlfcn.h], [ ! luadefs="$luadefs -DLUA_USE_DLOPEN" ! lualibs="$lualibs -ldl" ! ]) ! ]) ! AC_CHECK_LIB([readline], [readline], [ ! luadefs="$luadefs -DLUA_USE_READLINE" ! lualibs="$lualibs -lreadline" ! ]) ! LUA_PLATFORM_SPECIFIC_CFLAGS=$luadefs ! LUA_PLATFORM_SPECIFIC_LDFLAGS=$lualibs ! AC_SUBST(LUA_PLATFORM_SPECIFIC_CFLAGS) ! AC_SUBST(LUA_PLATFORM_SPECIFIC_LDFLAGS) --- 123,190 ---- + # check for Lua + # + # NB: by default we try to use the system-wide lua 5.1; if it does not + # exist then we use our built-in lua ! if test "$lua_dir" = ""; then ! AC_MSG_CHECKING([if Lua 5.1 is installed]) ! LIBS="$LIBS -llua5.1" ! AC_LINK_IFELSE([ ! AC_LANG_PROGRAM([#include <lua.h>], ! [lua_newtable(NULL);]) ! ], ! [LUA_PRESENCE=1], [LUA_PRESENCE=0]) ! if test "$LUA_PRESENCE" = "1"; then ! AC_MSG_RESULT([yes]) ! USE_SYSTEM_LUA=1 ! else ! AC_MSG_RESULT([not found, falling back to the built-in lua]) ! USE_SYSTEM_LUA=0 ! # LUA_DIR must always be an absolute path! ! LUA_DIR="`pwd`/$srcdir/modules/lua" ! AC_SUBST([LUA_DIR]) ! fi + else + + USE_SYSTEM_LUA=1 + LUA_DIR="$lua_dir" + fi + + + if test "$USE_SYSTEM_LUA" = "0"; then + + # Checks used to determine right LUA flags (see modules/lua/src/Makefile) + luadefs= + lualibs= + + # these do not require additional libs + AC_CHECK_FUNC([isatty], [luadefs="$luadefs -DLUA_USE_ISATTY"]) + AC_CHECK_FUNC([mkstemp], [luadefs="$luadefs -DLUA_USE_MKSTEMP"]) + AC_CHECK_FUNC([popen], [luadefs="$luadefs -DLUA_USE_POPEN"]) + AC_CHECK_FUNC([_longjmp], [luadefs="$luadefs -DLUA_USE_ULONGJMP"]) + + # these require addlibs + AC_CHECK_LIB([dl], [dlopen], [ + AC_CHECK_HEADER([dlfcn.h], [ + luadefs="$luadefs -DLUA_USE_DLOPEN" + lualibs="$lualibs -ldl" + ]) + ]) + AC_CHECK_LIB([readline], [readline], [ + luadefs="$luadefs -DLUA_USE_READLINE" + lualibs="$lualibs -lreadline" + ]) + + LUA_PLATFORM_SPECIFIC_CFLAGS=$luadefs + LUA_PLATFORM_SPECIFIC_LDFLAGS=$lualibs + AC_SUBST(LUA_PLATFORM_SPECIFIC_CFLAGS) + AC_SUBST(LUA_PLATFORM_SPECIFIC_LDFLAGS) + + fi *************** *** 334,338 **** # the wx.so library in ../lib; thus we need to copy the sample(s) to the # build directory to preserve the relative path correctness ! if [[ "$top_srcdir" != "." ]]; then AC_MSG_NOTICE([configure: copying $srcdir/samples to ./samples]) --- 391,399 ---- # the wx.so library in ../lib; thus we need to copy the sample(s) to the # build directory to preserve the relative path correctness ! # ! # NOTE: we cannot check $top_srcdir here since it's not defined yet at this ! # point of the configure script ! # ! if [[ ! -d "samples" ]]; then AC_MSG_NOTICE([configure: copying $srcdir/samples to ./samples]) *************** *** 374,377 **** --- 435,446 ---- # modules echo + + if test "$USE_SYSTEM_LUA" = "1"; then + echo " - Using SYSTEM lua library (prefix is $lua_dir)" + else + echo " - Using BUILT-IN lua library" + fi + + AM_BOOLOPT_SUMMARY([USE_WXBINDSTC], [" - wxBindSTC module: yes"], |
|
From: Francesco M. <fr...@us...> - 2006-12-19 21:12:32
|
Update of /cvsroot/wxlua/wxLua/apps/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19847/apps/wxlua/src Modified Files: wxlua.cpp Log Message: now BUILDDIR is set exactly like the wxWidgets builddir system LUA is now used if available on Unix or on Windows with USE_SYSTEM_LUA=1 changed the way the lua headers are included (removed the 'lua/include' prefix) to make it possible to use external lua Now when using built-in LUA the generated library is named lua5.1 and it overwrites any eventually preexisting lua library (when installed). Fixed the "samples" directory copy when srcdir==. Index: wxlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxlua.cpp,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** wxlua.cpp 12 Dec 2006 01:23:40 -0000 1.43 --- wxlua.cpp 19 Dec 2006 21:11:59 -0000 1.44 *************** *** 33,37 **** extern "C" { ! #include "lua/include/lualib.h" } --- 33,37 ---- extern "C" { ! #include "lualib.h" } |
|
From: Francesco M. <fr...@us...> - 2006-12-19 21:12:31
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19847/apps Modified Files: Makefile.in Log Message: now BUILDDIR is set exactly like the wxWidgets builddir system LUA is now used if available on Unix or on Windows with USE_SYSTEM_LUA=1 changed the way the lua headers are included (removed the 'lua/include' prefix) to make it possible to use external lua Now when using built-in LUA the generated library is named lua5.1 and it overwrites any eventually preexisting lua library (when installed). Fixed the "samples" directory copy when srcdir==. Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** Makefile.in 12 Dec 2006 14:53:47 -0000 1.46 --- Makefile.in 19 Dec 2006 21:11:57 -0000 1.47 *************** *** 38,41 **** --- 38,42 ---- WX_VERSION_MINOR = @WX_VERSION_MINOR@ WX_GTKPORT_VERSION = @WX_GTKPORT_VERSION@ + LUA_DIR = @LUA_DIR@ LUA_PLATFORM_SPECIFIC_CFLAGS = @LUA_PLATFORM_SPECIFIC_CFLAGS@ LUA_PLATFORM_SPECIFIC_LDFLAGS = @LUA_PLATFORM_SPECIFIC_LDFLAGS@ *************** *** 45,54 **** DESTDIR = APP_VERBATIMLUA_CFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(top_srcdir)/modules/lua/include $(WX_CFLAGS) \ $(LUA_PLATFORM_SPECIFIC_CFLAGS) $(CPPFLAGS) $(CFLAGS) APP_VERBATIMLUA_OBJECTS = \ app_verbatimlua_lua.o ! APP_WXLUA_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) $(WX_CXXFLAGS) \ ! $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ app_wxlua_wxlua.o \ --- 46,55 ---- DESTDIR = APP_VERBATIMLUA_CFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(LUA_DIR)/include -I$(top_srcdir)/modules/lua/include $(WX_CFLAGS) \ $(LUA_PLATFORM_SPECIFIC_CFLAGS) $(CPPFLAGS) $(CFLAGS) APP_VERBATIMLUA_OBJECTS = \ app_verbatimlua_lua.o ! APP_WXLUA_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(LUA_DIR)/include $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ app_wxlua_wxlua.o \ *************** *** 56,60 **** $(__app_wxlua___win32rc) APP_WXLUAEDIT_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ app_wxluaedit_wxledit.o \ --- 57,61 ---- $(__app_wxlua___win32rc) APP_WXLUAEDIT_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(LUA_DIR)/include $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ app_wxluaedit_wxledit.o \ *************** *** 62,66 **** $(__app_wxluaedit___win32rc) APP_WXLUACAN_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(top_srcdir)/modules/wxbind/setup $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ app_wxluacan_wxluacan.o \ --- 63,68 ---- $(__app_wxluaedit___win32rc) APP_WXLUACAN_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(LUA_DIR)/include -I$(top_srcdir)/modules/wxbind/setup $(WX_CXXFLAGS) \ ! $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ app_wxluacan_wxluacan.o \ *************** *** 71,75 **** $(__app_wxluacan___win32rc) APP_WXLUAFREEZE_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ app_wxluafreeze_wxluafreeze.o \ --- 73,77 ---- $(__app_wxluacan___win32rc) APP_WXLUAFREEZE_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(LUA_DIR)/include $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ app_wxluafreeze_wxluafreeze.o \ *************** *** 180,184 **** $(top_builddir)/bin/wxlua-lua$(EXEEXT): $(APP_VERBATIMLUA_OBJECTS) ! $(CC) -o $@ $(APP_VERBATIMLUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) -lm -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(__app_verbatimlua___mac_setfilecmd) --- 182,186 ---- $(top_builddir)/bin/wxlua-lua$(EXEEXT): $(APP_VERBATIMLUA_OBJECTS) ! $(CC) -o $@ $(APP_VERBATIMLUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) -lm -llua5.1 $(__app_verbatimlua___mac_setfilecmd) *************** *** 192,196 **** @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@$(top_builddir)/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 $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(__app_wxlua___mac_setfilecmd) --- 194,198 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@$(top_builddir)/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) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(__app_wxlua___mac_setfilecmd) *************** *** 205,209 **** @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@$(top_builddir)/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 $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwx_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_stedit-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_setfilecmd) --- 207,211 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@$(top_builddir)/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) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 -lwx_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_stedit-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_setfilecmd) *************** *** 218,222 **** @COND_USE_WXLUACANAPP_1@$(top_builddir)/bin/wxluacan$(EXEEXT): $(APP_WXLUACAN_OBJECTS) $(__app_wxluacan___win32rc) ! @COND_USE_WXLUACANAPP_1@ $(CXX) -o $@ $(APP_WXLUACAN_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_USE_WXLUACANAPP_1@ @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_setfilecmd) --- 220,224 ---- @COND_USE_WXLUACANAPP_1@$(top_builddir)/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) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_USE_WXLUACANAPP_1@ @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_setfilecmd) *************** *** 231,235 **** @COND_USE_WXLUAFREEZEAPP_1@$(top_builddir)/bin/wxluafreeze$(EXEEXT): $(APP_WXLUAFREEZE_OBJECTS) $(__app_wxluafreeze___win32rc) ! @COND_USE_WXLUAFREEZEAPP_1@ $(CXX) -o $@ $(APP_WXLUAFREEZE_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_USE_WXLUAFREEZEAPP_1@ @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_setfilecmd) --- 233,237 ---- @COND_USE_WXLUAFREEZEAPP_1@$(top_builddir)/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) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_USE_WXLUAFREEZEAPP_1@ @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_setfilecmd) *************** *** 253,257 **** app_wxlua_wxlua_rc.o: $(srcdir)/wxlua/src/wxlua.rc ! $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) app_wxluaedit_wxledit.o: $(srcdir)/wxluaedit/src/wxledit.cpp --- 255,259 ---- app_wxlua_wxlua_rc.o: $(srcdir)/wxlua/src/wxlua.rc ! $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) --include-dir $(LUA_DIR)/include app_wxluaedit_wxledit.o: $(srcdir)/wxluaedit/src/wxledit.cpp *************** *** 262,266 **** app_wxluaedit_wxluaedit_rc.o: $(srcdir)/wxluaedit/src/wxluaedit.rc ! $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) app_wxluacan_wxluacan.o: $(srcdir)/wxluacan/src/wxluacan.cpp --- 264,268 ---- app_wxluaedit_wxluaedit_rc.o: $(srcdir)/wxluaedit/src/wxluaedit.rc ! $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) --include-dir $(LUA_DIR)/include app_wxluacan_wxluacan.o: $(srcdir)/wxluacan/src/wxluacan.cpp *************** *** 280,284 **** app_wxluacan_cansim_rc.o: $(srcdir)/wxluacan/src/cansim.rc ! $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) --include-dir $(top_srcdir)/modules/wxbind/setup app_wxluafreeze_wxluafreeze.o: $(srcdir)/wxluafreeze/src/wxluafreeze.cpp --- 282,286 ---- app_wxluacan_cansim_rc.o: $(srcdir)/wxluacan/src/cansim.rc ! $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) --include-dir $(LUA_DIR)/include --include-dir $(top_srcdir)/modules/wxbind/setup app_wxluafreeze_wxluafreeze.o: $(srcdir)/wxluafreeze/src/wxluafreeze.cpp *************** *** 286,290 **** app_wxluafreeze_wxluafreeze_rc.o: $(srcdir)/wxluafreeze/src/wxluafreeze.rc ! $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) --- 288,292 ---- app_wxluafreeze_wxluafreeze_rc.o: $(srcdir)/wxluafreeze/src/wxluafreeze.rc ! $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) --include-dir $(LUA_DIR)/include |
|
From: Francesco M. <fr...@us...> - 2006-12-19 21:12:31
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19847 Modified Files: configure Log Message: now BUILDDIR is set exactly like the wxWidgets builddir system LUA is now used if available on Unix or on Windows with USE_SYSTEM_LUA=1 changed the way the lua headers are included (removed the 'lua/include' prefix) to make it possible to use external lua Now when using built-in LUA the generated library is named lua5.1 and it overwrites any eventually preexisting lua library (when installed). Fixed the "samples" directory copy when srcdir==. Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** configure 11 Dec 2006 00:08:17 -0000 1.42 --- configure 19 Dec 2006 21:11:57 -0000 1.43 *************** *** 682,685 **** --- 682,686 ---- WX_GTKPORT_VERSION WXLIBS_REQUIRED + LUA_DIR GREP EGREP *************** *** 754,757 **** --- 755,759 ---- COND_PLATFORM_WIN32_1 COND_SHARED_0 + COND_SHARED_0_USE_SYSTEM_LUA_0 COND_SHARED_0_USE_WXBINDSTC_1 COND_SHARED_0_USE_WXLUADEBUG_1 *************** *** 759,762 **** --- 761,765 ---- COND_SHARED_1 COND_SHARED_1_USE_LUAMODULE_1 + COND_SHARED_1_USE_SYSTEM_LUA_0 COND_SHARED_1_USE_WXBINDSTC_1 COND_SHARED_1_USE_WXLUADEBUG_1 *************** *** 1401,1404 **** --- 1404,1408 ---- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-lua-prefix Prefix where Lua is installed (optional) --with-wxdir=PATH Use uninstalled version of wxWidgets in PATH --with-wx-config=CONFIG wx-config script to use (optional) *************** *** 2072,2075 **** --- 2076,2088 ---- + # Check whether --with-lua-prefix was given. + if test "${with_lua_prefix+set}" = set; then + withval=$with_lua_prefix; lua_dir="$withval" + else + lua_dir="" + fi + + + { echo "$as_me:$LINENO: checking for --enable-wxlua-app option" >&5 *************** *** 2193,2196 **** --- 2206,2233 ---- + + { echo "$as_me:$LINENO: checking for --with-lua-prefix option" >&5 + echo $ECHO_N "checking for --with-lua-prefix option... $ECHO_C" >&6; } + if [ $lua_dir != "" ]; then + + # user explicitely provided a path to its own lua, check that it's an absolute path + # (or it won't work for out-of-tree builds) + case $lua_dir in + /*) continue;; + *) + { { echo "$as_me:$LINENO: error: + You must provide an absolute path for the --with-lua-prefix option. + " >&5 + echo "$as_me: error: + You must provide an absolute path for the --with-lua-prefix option. + " >&2;} + { (exit 1); exit 1; }; } + esac + fi + { echo "$as_me:$LINENO: result: $lua_dir" >&5 + echo "${ECHO_T}$lua_dir" >&6; } + + + # Global wxLua options: # we could use these to define options like --enable-all-apps but these would *************** *** 2590,2594 **** ##################################################################### - # check for wxWidgets # --- 2627,2630 ---- *************** *** 5627,5638 **** ! # Checks used to determine right LUA flags (see modules/lua/src/Makefile) ! luadefs= ! lualibs= ! # these do not require additional libs ! { echo "$as_me:$LINENO: checking for isatty" >&5 echo $ECHO_N "checking for isatty... $ECHO_C" >&6; } if test "${ac_cv_func_isatty+set}" = set; then --- 5663,5768 ---- + # check for Lua + # + # NB: by default we try to use the system-wide lua 5.1; if it does not + # exist then we use our built-in lua ! if test "$lua_dir" = ""; then ! { echo "$as_me:$LINENO: checking if Lua 5.1 is installed" >&5 ! echo $ECHO_N "checking if Lua 5.1 is installed... $ECHO_C" >&6; } ! LIBS="$LIBS -llua5.1" ! cat >conftest.$ac_ext <<_ACEOF ! ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ ! #include <lua.h> ! int ! main () ! { ! lua_newtable(NULL); ! ; ! return 0; ! } ! ! _ACEOF ! rm -f conftest.$ac_objext conftest$ac_exeext ! if { (ac_try="$ac_link" ! case "(($ac_try" in ! *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ! *) ac_try_echo=$ac_try;; ! esac ! eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ! (eval "$ac_link") 2>conftest.er1 ! ac_status=$? ! grep -v '^ *+' conftest.er1 >conftest.err ! rm -f conftest.er1 ! cat conftest.err >&5 ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); } && ! { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' ! { (case "(($ac_try" in ! *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ! *) ac_try_echo=$ac_try;; ! esac ! eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ! (eval "$ac_try") 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; } && ! { ac_try='test -s conftest$ac_exeext' ! { (case "(($ac_try" in ! *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ! *) ac_try_echo=$ac_try;; ! esac ! eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ! (eval "$ac_try") 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; }; then ! LUA_PRESENCE=1 ! else ! echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ! LUA_PRESENCE=0 ! fi ! ! rm -f core conftest.err conftest.$ac_objext \ ! conftest$ac_exeext conftest.$ac_ext ! ! if test "$LUA_PRESENCE" = "1"; then ! { echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6; } ! USE_SYSTEM_LUA=1 ! else ! { echo "$as_me:$LINENO: result: not found, falling back to the built-in lua" >&5 ! echo "${ECHO_T}not found, falling back to the built-in lua" >&6; } ! USE_SYSTEM_LUA=0 ! ! # LUA_DIR must always be an absolute path! ! LUA_DIR="`pwd`/$srcdir/modules/lua" ! ! fi ! ! else ! ! USE_SYSTEM_LUA=1 ! LUA_DIR="$lua_dir" ! fi ! ! ! if test "$USE_SYSTEM_LUA" = "0"; then ! ! # Checks used to determine right LUA flags (see modules/lua/src/Makefile) ! luadefs= ! lualibs= ! ! # these do not require additional libs ! { echo "$as_me:$LINENO: checking for isatty" >&5 echo $ECHO_N "checking for isatty... $ECHO_C" >&6; } if test "${ac_cv_func_isatty+set}" = set; then *************** *** 5735,5739 **** fi ! { echo "$as_me:$LINENO: checking for mkstemp" >&5 echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6; } if test "${ac_cv_func_mkstemp+set}" = set; then --- 5865,5869 ---- fi ! { echo "$as_me:$LINENO: checking for mkstemp" >&5 echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6; } if test "${ac_cv_func_mkstemp+set}" = set; then *************** *** 5836,5840 **** fi ! { echo "$as_me:$LINENO: checking for popen" >&5 echo $ECHO_N "checking for popen... $ECHO_C" >&6; } if test "${ac_cv_func_popen+set}" = set; then --- 5966,5970 ---- fi ! { echo "$as_me:$LINENO: checking for popen" >&5 echo $ECHO_N "checking for popen... $ECHO_C" >&6; } if test "${ac_cv_func_popen+set}" = set; then *************** *** 5937,5941 **** fi ! { echo "$as_me:$LINENO: checking for _longjmp" >&5 echo $ECHO_N "checking for _longjmp... $ECHO_C" >&6; } if test "${ac_cv_func__longjmp+set}" = set; then --- 6067,6071 ---- fi ! { echo "$as_me:$LINENO: checking for _longjmp" >&5 echo $ECHO_N "checking for _longjmp... $ECHO_C" >&6; } if test "${ac_cv_func__longjmp+set}" = set; then *************** *** 6039,6043 **** ! # these require addlibs { echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 --- 6169,6173 ---- ! # these require addlibs { echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 *************** *** 6559,6563 **** if test $ac_cv_lib_dl_dlopen = yes; then ! if test "${ac_cv_header_dlfcn_h+set}" = set; then { echo "$as_me:$LINENO: checking for dlfcn.h" >&5 echo $ECHO_N "checking for dlfcn.h... $ECHO_C" >&6; } --- 6689,6693 ---- if test $ac_cv_lib_dl_dlopen = yes; then ! if test "${ac_cv_header_dlfcn_h+set}" = set; then { echo "$as_me:$LINENO: checking for dlfcn.h" >&5 echo $ECHO_N "checking for dlfcn.h... $ECHO_C" >&6; } *************** *** 6715,6720 **** if test $ac_cv_header_dlfcn_h = yes; then ! luadefs="$luadefs -DLUA_USE_DLOPEN" ! lualibs="$lualibs -ldl" fi --- 6845,6850 ---- if test $ac_cv_header_dlfcn_h = yes; then ! luadefs="$luadefs -DLUA_USE_DLOPEN" ! lualibs="$lualibs -ldl" fi *************** *** 6724,6728 **** fi ! { echo "$as_me:$LINENO: checking for readline in -lreadline" >&5 echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6; } if test "${ac_cv_lib_readline_readline+set}" = set; then --- 6854,6858 ---- fi ! { echo "$as_me:$LINENO: checking for readline in -lreadline" >&5 echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6; } if test "${ac_cv_lib_readline_readline+set}" = set; then *************** *** 6803,6817 **** if test $ac_cv_lib_readline_readline = yes; then ! luadefs="$luadefs -DLUA_USE_READLINE" ! lualibs="$lualibs -lreadline" fi ! LUA_PLATFORM_SPECIFIC_CFLAGS=$luadefs ! LUA_PLATFORM_SPECIFIC_LDFLAGS=$lualibs --- 6933,6948 ---- if test $ac_cv_lib_readline_readline = yes; then ! luadefs="$luadefs -DLUA_USE_READLINE" ! lualibs="$lualibs -lreadline" fi ! LUA_PLATFORM_SPECIFIC_CFLAGS=$luadefs ! LUA_PLATFORM_SPECIFIC_LDFLAGS=$lualibs + fi *************** *** 9676,9679 **** --- 9807,9815 ---- fi + COND_SHARED_0_USE_SYSTEM_LUA_0="#" + if test "x$SHARED" = "x0" -a "x$USE_SYSTEM_LUA" = "x0" ; then + COND_SHARED_0_USE_SYSTEM_LUA_0="" + fi + COND_SHARED_0_USE_WXBINDSTC_1="#" if test "x$SHARED" = "x0" -a "x$USE_WXBINDSTC" = "x1" ; then *************** *** 9701,9704 **** --- 9837,9845 ---- fi + COND_SHARED_1_USE_SYSTEM_LUA_0="#" + if test "x$SHARED" = "x1" -a "x$USE_SYSTEM_LUA" = "x0" ; then + COND_SHARED_1_USE_SYSTEM_LUA_0="" + fi + COND_SHARED_1_USE_WXBINDSTC_1="#" if test "x$SHARED" = "x1" -a "x$USE_WXBINDSTC" = "x1" ; then *************** *** 9861,9865 **** # the wx.so library in ../lib; thus we need to copy the sample(s) to the # build directory to preserve the relative path correctness ! if [ "$top_srcdir" != "." ]; then { echo "$as_me:$LINENO: configure: copying $srcdir/samples to ./samples" >&5 --- 10002,10010 ---- # the wx.so library in ../lib; thus we need to copy the sample(s) to the # build directory to preserve the relative path correctness ! # ! # NOTE: we cannot check $top_srcdir here since it's not defined yet at this ! # point of the configure script ! # ! if [ ! -d "samples" ]; then { echo "$as_me:$LINENO: configure: copying $srcdir/samples to ./samples" >&5 *************** *** 10573,10576 **** --- 10718,10722 ---- WX_GTKPORT_VERSION!$WX_GTKPORT_VERSION$ac_delim WXLIBS_REQUIRED!$WXLIBS_REQUIRED$ac_delim + LUA_DIR!$LUA_DIR$ac_delim GREP!$GREP$ac_delim EGREP!$EGREP$ac_delim *************** *** 10587,10591 **** NM!$NM$ac_delim INSTALL_DIR!$INSTALL_DIR$ac_delim - LDFLAGS_GUI!$LDFLAGS_GUI$ac_delim _ACEOF --- 10733,10736 ---- *************** *** 10629,10632 **** --- 10774,10778 ---- for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF + LDFLAGS_GUI!$LDFLAGS_GUI$ac_delim IF_GNU_MAKE!$IF_GNU_MAKE$ac_delim PLATFORM_UNIX!$PLATFORM_UNIX$ac_delim *************** *** 10686,10689 **** --- 10832,10836 ---- COND_PLATFORM_WIN32_1!$COND_PLATFORM_WIN32_1$ac_delim COND_SHARED_0!$COND_SHARED_0$ac_delim + COND_SHARED_0_USE_SYSTEM_LUA_0!$COND_SHARED_0_USE_SYSTEM_LUA_0$ac_delim COND_SHARED_0_USE_WXBINDSTC_1!$COND_SHARED_0_USE_WXBINDSTC_1$ac_delim COND_SHARED_0_USE_WXLUADEBUG_1!$COND_SHARED_0_USE_WXLUADEBUG_1$ac_delim *************** *** 10691,10694 **** --- 10838,10842 ---- COND_SHARED_1!$COND_SHARED_1$ac_delim COND_SHARED_1_USE_LUAMODULE_1!$COND_SHARED_1_USE_LUAMODULE_1$ac_delim + COND_SHARED_1_USE_SYSTEM_LUA_0!$COND_SHARED_1_USE_SYSTEM_LUA_0$ac_delim COND_SHARED_1_USE_WXBINDSTC_1!$COND_SHARED_1_USE_WXBINDSTC_1$ac_delim COND_SHARED_1_USE_WXLUADEBUG_1!$COND_SHARED_1_USE_WXLUADEBUG_1$ac_delim *************** *** 10723,10727 **** _ACEOF ! if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 92; then break elif $ac_last_try; then --- 10871,10875 ---- _ACEOF ! if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 95; then break elif $ac_last_try; then *************** *** 11141,11144 **** --- 11289,11300 ---- echo + if test "$USE_SYSTEM_LUA" = "1"; then + echo " - Using SYSTEM lua library (prefix is $lua_dir)" + else + echo " - Using BUILT-IN lua library" + fi + + + if [ "x$USE_WXBINDSTC" = "x1" ]; then echo " - wxBindSTC module: yes" |
|
From: Francesco M. <fr...@us...> - 2006-12-19 21:12:31
|
Update of /cvsroot/wxlua/wxLua/apps/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19847/apps/build/bakefiles Modified Files: apps.bkl Log Message: now BUILDDIR is set exactly like the wxWidgets builddir system LUA is now used if available on Unix or on Windows with USE_SYSTEM_LUA=1 changed the way the lua headers are included (removed the 'lua/include' prefix) to make it possible to use external lua Now when using built-in LUA the generated library is named lua5.1 and it overwrites any eventually preexisting lua library (when installed). Fixed the "samples" directory copy when srcdir==. Index: apps.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** apps.bkl 11 Dec 2006 00:08:18 -0000 1.44 --- apps.bkl 19 Dec 2006 21:11:57 -0000 1.45 *************** *** 63,66 **** --- 63,68 ---- <!-- apps-specific options --> <include file="options.bkl"/> + + <!-- module-specific options --> <include file="../../../modules/build/bakefiles/options.bkl"/> |
|
From: Francesco M. <fr...@us...> - 2006-12-19 21:12:12
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19847/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat modules.dsw modules_mod_luamodule.dsp modules_mod_verbatimlua.dsp modules_mod_wxbind.dsp modules_mod_wxbindstc.dsp modules_mod_wxlua.dsp modules_mod_wxluadebug.dsp modules_mod_wxluasocket.dsp Log Message: now BUILDDIR is set exactly like the wxWidgets builddir system LUA is now used if available on Unix or on Windows with USE_SYSTEM_LUA=1 changed the way the lua headers are included (removed the 'lua/include' prefix) to make it possible to use external lua Now when using built-in LUA the generated library is named lua5.1 and it overwrites any eventually preexisting lua library (when installed). Fixed the "samples" directory copy when srcdir==. Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** makefile.bcc 17 Dec 2006 10:33:35 -0000 1.57 --- makefile.bcc 19 Dec 2006 21:12:01 -0000 1.58 *************** *** 75,78 **** --- 75,88 ---- !endif + # Compile Unicode build of wxWidgets? [0,1] + !ifndef WX_UNICODE + WX_UNICODE = 0 + !endif + + # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] + !ifndef WX_DEBUG [...2045 lines suppressed...] $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_dll_dummy.obj: ..\..\wxluasocket\src\dummy.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) -H $** ! bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_dll_wxldtarg.obj: ..\..\wxluasocket\src\wxldtarg.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_dll_wxldserv.obj: ..\..\wxluasocket\src\wxldserv.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_dll_dservice.obj: ..\..\wxluasocket\src\dservice.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_dll_wxluasocket.obj: ..\..\wxluasocket\src\wxluasocket.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\mod_luamodule_luamodule.obj: ..\..\luamodule\src\luamodule.cpp $(CXX) -q -c -P -o$@ $(MOD_LUAMODULE_CXXFLAGS) $** Index: modules_mod_verbatimlua.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/modules_mod_verbatimlua.dsp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** modules_mod_verbatimlua.dsp 17 Dec 2006 10:33:36 -0000 1.6 --- modules_mod_verbatimlua.dsp 19 Dec 2006 21:12:02 -0000 1.7 *************** *** 49,61 **** # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "vcuddll\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "vcuddll\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw28ud_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw28ud_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 --- 49,61 ---- # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "vcmsw_uddll\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "vcmsw_uddll\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 *************** *** 66,71 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28ud_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_lua.lib" /debug ! # ADD LINK32 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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28ud_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_lua.lib" /debug !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 DLL Unicode Debug Multilib" --- 66,71 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib" /debug ! # ADD LINK32 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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib" /debug !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 DLL Unicode Debug Multilib" *************** *** 74,86 **** # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "vcuddll\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "vcuddll\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw28ud_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw28ud_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 --- 74,86 ---- # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "vcmsw_uddll\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "vcmsw_uddll\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 *************** *** 91,96 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase28ud.lib wxmsw28ud_core.lib wxbase28ud_xml.lib wxbase28ud_net.lib wxmsw28ud_adv.lib wxmsw28ud_media.lib wxmsw28ud_html.lib wxmsw28ud_xrc.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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28ud_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_lua.lib" /debug ! # ADD LINK32 wxbase28ud.lib wxmsw28ud_core.lib wxbase28ud_xml.lib wxbase28ud_net.lib wxmsw28ud_adv.lib wxmsw28ud_media.lib wxmsw28ud_html.lib wxmsw28ud_xrc.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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28ud_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_lua.lib" /debug !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 DLL Unicode Release Monolithic" --- 91,96 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase28ud.lib wxmsw28ud_core.lib wxbase28ud_xml.lib wxbase28ud_net.lib wxmsw28ud_adv.lib wxmsw28ud_media.lib wxmsw28ud_html.lib wxmsw28ud_xrc.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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib" /debug ! # ADD LINK32 wxbase28ud.lib wxmsw28ud_core.lib wxbase28ud_xml.lib wxbase28ud_net.lib wxmsw28ud_adv.lib wxmsw28ud_media.lib wxmsw28ud_html.lib wxmsw28ud_xrc.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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib" /debug !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 DLL Unicode Release Monolithic" *************** *** 99,111 **** # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "vcudll\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "vcudll\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw28u_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw28u_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 --- 99,111 ---- # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "vcmsw_udll\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "vcmsw_udll\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 *************** *** 116,121 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28u_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_lua.lib" ! # ADD LINK32 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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28u_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_lua.lib" !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 DLL Unicode Release Multilib" --- 116,121 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib" ! # ADD LINK32 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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib" !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 DLL Unicode Release Multilib" *************** *** 124,136 **** # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "vcudll\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "vcudll\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw28u_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw28u_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 --- 124,136 ---- # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "vcmsw_udll\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "vcmsw_udll\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 *************** *** 141,146 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase28u.lib wxmsw28u_core.lib wxbase28u_xml.lib wxbase28u_net.lib wxmsw28u_adv.lib wxmsw28u_media.lib wxmsw28u_html.lib wxmsw28u_xrc.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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28u_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_lua.lib" ! # ADD LINK32 wxbase28u.lib wxmsw28u_core.lib wxbase28u_xml.lib wxbase28u_net.lib wxmsw28u_adv.lib wxmsw28u_media.lib wxmsw28u_html.lib wxmsw28u_xrc.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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28u_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_lua.lib" !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 DLL Debug Monolithic" --- 141,146 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase28u.lib wxmsw28u_core.lib wxbase28u_xml.lib wxbase28u_net.lib wxmsw28u_adv.lib wxmsw28u_media.lib wxmsw28u_html.lib wxmsw28u_xrc.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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib" ! # ADD LINK32 wxbase28u.lib wxmsw28u_core.lib wxbase28u_xml.lib wxbase28u_net.lib wxmsw28u_adv.lib wxmsw28u_media.lib wxmsw28u_html.lib wxmsw28u_xrc.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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib" !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 DLL Debug Monolithic" *************** *** 149,161 **** # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "vcddll\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "vcddll\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw28d_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw28d_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 --- 149,161 ---- # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "vcmsw_ddll\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "vcmsw_ddll\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 *************** *** 166,171 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28d_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw28d_lua.lib" /debug ! # ADD LINK32 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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28d_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw28d_lua.lib" /debug !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 DLL Debug Multilib" --- 166,171 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib" /debug ! # ADD LINK32 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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib" /debug !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 DLL Debug Multilib" *************** *** 174,186 **** # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "vcddll\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "vcddll\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw28d_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw28d_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 --- 174,186 ---- # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "vcmsw_ddll\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "vcmsw_ddll\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 *************** *** 191,196 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase28d.lib wxmsw28d_core.lib wxbase28d_xml.lib wxbase28d_net.lib wxmsw28d_adv.lib wxmsw28d_media.lib wxmsw28d_html.lib wxmsw28d_xrc.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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28d_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw28d_lua.lib" /debug ! # ADD LINK32 wxbase28d.lib wxmsw28d_core.lib wxbase28d_xml.lib wxbase28d_net.lib wxmsw28d_adv.lib wxmsw28d_media.lib wxmsw28d_html.lib wxmsw28d_xrc.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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28d_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw28d_lua.lib" /debug !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 DLL Release Monolithic" --- 191,196 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase28d.lib wxmsw28d_core.lib wxbase28d_xml.lib wxbase28d_net.lib wxmsw28d_adv.lib wxmsw28d_media.lib wxmsw28d_html.lib wxmsw28d_xrc.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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib" /debug ! # ADD LINK32 wxbase28d.lib wxmsw28d_core.lib wxbase28d_xml.lib wxbase28d_net.lib wxmsw28d_adv.lib wxmsw28d_media.lib wxmsw28d_html.lib wxmsw28d_xrc.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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib" /debug !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 DLL Release Monolithic" *************** *** 199,211 **** # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "vcdll\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "vcdll\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw28_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw28_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 --- 199,211 ---- # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "vcmsw_dll\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "vcmsw_dll\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 *************** *** 216,221 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw28_lua.lib" ! # ADD LINK32 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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw28_lua.lib" !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 DLL Release Multilib" --- 216,221 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib" ! # ADD LINK32 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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib" !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 DLL Release Multilib" *************** *** 224,236 **** # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "vcdll\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "vcdll\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw28_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw28_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 --- 224,236 ---- # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "vcmsw_dll\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "vcmsw_dll\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 *************** *** 241,246 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase28.lib wxmsw28_core.lib wxbase28_xml.lib wxbase28_net.lib wxmsw28_adv.lib wxmsw28_media.lib wxmsw28_html.lib wxmsw28_xrc.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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw28_lua.lib" ! # ADD LINK32 wxbase28.lib wxmsw28_core.lib wxbase28_xml.lib wxbase28_net.lib wxmsw28_adv.lib wxmsw28_media.lib wxmsw28_html.lib wxmsw28_xrc.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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw28_lua.lib" !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 Unicode Debug Monolithic" --- 241,246 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase28.lib wxmsw28_core.lib wxbase28_xml.lib wxbase28_net.lib wxmsw28_adv.lib wxmsw28_media.lib wxmsw28_html.lib wxmsw28_xrc.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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib" ! # ADD LINK32 wxbase28.lib wxmsw28_core.lib wxbase28_xml.lib wxbase28_net.lib wxmsw28_adv.lib wxmsw28_media.lib wxmsw28_html.lib wxmsw28_xrc.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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib" !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 Unicode Debug Monolithic" *************** *** 249,261 **** # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" ! # PROP BASE Intermediate_Dir "vcud\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_lib" ! # PROP Intermediate_Dir "vcud\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw28ud_lua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw28ud_lua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 249,261 ---- # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" ! # PROP BASE Intermediate_Dir "vcmsw_ud\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_lib" ! # PROP Intermediate_Dir "vcmsw_ud\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\lua5.1.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\lua5.1.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 264,269 **** # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw28ud_lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw28ud_lua.lib" !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 Unicode Debug Multilib" --- 264,269 ---- # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\lua5.1.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\lua5.1.lib" !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 Unicode Debug Multilib" *************** *** 272,284 **** # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" ! # PROP BASE Intermediate_Dir "vcud\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_lib" ! # PROP Intermediate_Dir "vcud\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw28ud_lua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw28ud_lua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 272,284 ---- # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" ! # PROP BASE Intermediate_Dir "vcmsw_ud\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_lib" ! # PROP Intermediate_Dir "vcmsw_ud\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\lua5.1.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\lua5.1.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 287,292 **** # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw28ud_lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw28ud_lua.lib" !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 Unicode Release Monolithic" --- 287,292 ---- # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\lua5.1.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\lua5.1.lib" !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 Unicode Release Monolithic" *************** *** 295,307 **** # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" ! # PROP BASE Intermediate_Dir "vcu\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_lib" ! # PROP Intermediate_Dir "vcu\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw28u_lua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw28u_lua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 295,307 ---- # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" ! # PROP BASE Intermediate_Dir "vcmsw_u\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_lib" ! # PROP Intermediate_Dir "vcmsw_u\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\lua5.1.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\lua5.1.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 310,315 **** # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw28u_lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw28u_lua.lib" !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 Unicode Release Multilib" --- 310,315 ---- # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\lua5.1.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\lua5.1.lib" !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 Unicode Release Multilib" *************** *** 318,330 **** # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" ! # PROP BASE Intermediate_Dir "vcu\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_lib" ! # PROP Intermediate_Dir "vcu\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw28u_lua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw28u_lua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 318,330 ---- # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" ! # PROP BASE Intermediate_Dir "vcmsw_u\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_lib" ! # PROP Intermediate_Dir "vcmsw_u\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\lua5.1.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\lua5.1.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 333,338 **** # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw28u_lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw28u_lua.lib" !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 Debug Monolithic" --- 333,338 ---- # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\lua5.1.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\lua5.1.lib" !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 Debug Monolithic" *************** *** 341,353 **** # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" ! # PROP BASE Intermediate_Dir "vcd\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_lib" ! # PROP Intermediate_Dir "vcd\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw28d_lua.pdb /D "WIN32" /D "_LIB" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw28d_lua.pdb /D "WIN32" /D "_LIB" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 341,353 ---- # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" ! # PROP BASE Intermediate_Dir "vcmsw_d\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_lib" ! # PROP Intermediate_Dir "vcmsw_d\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\lua5.1.pdb /D "WIN32" /D "_LIB" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\lua5.1.pdb /D "WIN32" /D "_LIB" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 356,361 **** # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw28d_lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw28d_lua.lib" !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 Debug Multilib" --- 356,361 ---- # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\lua5.1.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\lua5.1.lib" !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 Debug Multilib" *************** *** 364,376 **** # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" ! # PROP BASE Intermediate_Dir "vcd\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_lib" ! # PROP Intermediate_Dir "vcd\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw28d_lua.pdb /D "WIN32" /D "_LIB" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw28d_lua.pdb /D "WIN32" /D "_LIB" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 364,376 ---- # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" ! # PROP BASE Intermediate_Dir "vcmsw_d\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_lib" ! # PROP Intermediate_Dir "vcmsw_d\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WX... [truncated message content] |
|
From: Francesco M. <fr...@us...> - 2006-12-19 21:12:07
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19847/modules/wxlua/include Modified Files: wxlbind.h wxlstate.h Log Message: now BUILDDIR is set exactly like the wxWidgets builddir system LUA is now used if available on Unix or on Windows with USE_SYSTEM_LUA=1 changed the way the lua headers are included (removed the 'lua/include' prefix) to make it possible to use external lua Now when using built-in LUA the generated library is named lua5.1 and it overwrites any eventually preexisting lua library (when installed). Fixed the "samples" directory copy when srcdir==. Index: wxlbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** wxlbind.h 17 Dec 2006 07:47:17 -0000 1.32 --- wxlbind.h 19 Dec 2006 21:12:03 -0000 1.33 *************** *** 14,19 **** extern "C" { ! #include "lua/include/lualib.h" ! #include "lua/include/lauxlib.h" } --- 14,19 ---- extern "C" { ! #include "lualib.h" ! #include "lauxlib.h" } Index: wxlstate.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** wxlstate.h 14 Dec 2006 01:01:26 -0000 1.57 --- wxlstate.h 19 Dec 2006 21:12:03 -0000 1.58 *************** *** 29,35 **** extern "C" { ! #include "lua/include/lua.h" ! #include "lua/include/lualib.h" ! #include "lua/include/lauxlib.h" // To not include "lua.h" use these --- 29,35 ---- extern "C" { ! #include "lua.h" ! #include "lualib.h" ! #include "lauxlib.h" // To not include "lua.h" use these |
|
From: Francesco M. <fr...@us...> - 2006-12-19 17:53:43
|
Update of /cvsroot/wxlua/wxLua/modules/luamodule/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5330 Modified Files: luamoduledefs.h Log Message: fix GCC warning about missing newline Index: luamoduledefs.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/luamodule/include/luamoduledefs.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** luamoduledefs.h 21 May 2006 14:43:36 -0000 1.1 --- luamoduledefs.h 19 Dec 2006 17:53:39 -0000 1.2 *************** *** 30,32 **** #endif ! #endif // __WX_LUAMODULEDEFS_H__ \ No newline at end of file --- 30,32 ---- #endif ! #endif // __WX_LUAMODULEDEFS_H__ |
|
From: John L. <jr...@us...> - 2006-12-19 17:06:24
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14743/wxLua/docs Modified Files: wxlua.html Log Message: update docs Index: wxlua.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxlua.html,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** wxlua.html 8 Dec 2006 23:12:15 -0000 1.10 --- wxlua.html 19 Dec 2006 17:06:16 -0000 1.11 *************** *** 20,24 **** language wrapper around the <a href="http://www.wxwidgets.org">wxWidgets</a> cross-platform GU ! I library. It consists of two IDE editors, an executable for running standalone wxLua scripts, and a library for extending C++ programs with a fast, small, --- 20,25 ---- language wrapper around the <a href="http://www.wxwidgets.org">wxWidgets</a> cross-platform GU ! I library. It consists of two IDE type editors, an executable for ! running standalone wxLua scripts, and a library for extending C++ programs with a fast, small, *************** *** 116,120 **** <li>Line comments are marked by --</li> ! <li>Block Comments are --[[ multiple line comment ]]</li> </ul> --- 117,121 ---- <li>Line comments are marked by --</li> ! <li>Block Comments are <i>--[[ multiple line comment ]]</i></li> </ul> *************** *** 149,153 **** <ul> ! <li>Note: "a = 0; if a then print(a) end" evaluates "a" to true since it has a value, eg. not nil.</li> --- 150,155 ---- <ul> ! <li>Note: <i>"a = 0; if a then print(a) end"</i> ! evaluates "a" to true since it has a value, eg. not nil.</li> *************** *** 163,167 **** <ul> ! <li>mynumber = (1+ 2 * 3 / (4 * 1) )*math.pow(2, 4)</li> </ul> --- 165,169 ---- <ul> ! <li><i>mynumber = (1+ 2 * 3 / (4 * 1) )*math.pow(2, 4)</i></li> </ul> *************** *** 172,179 **** <ul> ! <li>mystring = "How are 'you'!" or mystring = 'How ! are\t"You"!\n' are both valid</li> ! <li>mystring = [[How are "'you'"!]] means take everything including new lines and whitespace literally.</li> --- 174,183 ---- <ul> ! <li><i>mystring = "How are 'you'!"</i> or <i>mystring ! = 'How ! are\t"You"!\n'</i> are both valid</li> ! <li><i>mystring = [[How are "'you'"!]]</i> ! means take everything including new lines and whitespace literally.</li> *************** *** 182,187 **** <ul> ! <li>str1 = "hello"; str2 = "number"; str3 = str1.." ! "..str2.." "..tostring(2).."!"</li> </ul> --- 186,192 ---- <ul> ! <li><i>str1 = "hello"; str2 = "number"; str3 = ! str1.." ! "..str2.." "..tostring(2).."!"</i></li> </ul> *************** *** 194,213 **** <ul> ! <li>mytable = {} a default empty table, must declare table variable before using it's indexes.</li> ! <li>mytable = { ["index1"] = 1, "first value", "second ! value", ["index2"] = 2 }</li> <ul> ! <li>print(mytable.index1, mytable["index1"], mytable[1], ! mytable[2], mytable.index2, mytable.index10)</li> <li>Outputs this : "1, 1, first value, second value, 2, nil"</li> ! <li>Set values as : mytable.index1 = 2; ! mytable["index10"] = 3; mytable[10] = 4</li> <li>New values that don't already exist are automatically --- 199,221 ---- <ul> ! <li><i>mytable = {}</i> a default empty table, ! must declare table variable before using it's indexes.</li> ! <li><i>mytable = { ["index1"] = 1, "first value", ! "second ! value", ["index2"] = 2 }</i></li> <ul> ! <li><i>print(mytable.index1, mytable["index1"], ! mytable[1], ! mytable[2], mytable.index2, mytable.index10)</i></li> <li>Outputs this : "1, 1, first value, second value, 2, nil"</li> ! <li>Set values as : <i>mytable.index1 = 2; ! mytable["index10"] = 3; mytable[10] = 4</i></li> <li>New values that don't already exist are automatically *************** *** 217,220 **** --- 225,232 ---- = nil</li> + <li>The length operator <i>#mytable</i> + returns 2 since there are only two contiguous numeric table indexes + starting from 1.</li> + </ul> *************** *** 230,233 **** --- 242,254 ---- table "namespace".</li> + <li>The global table is called _G and you can display it + or any table using </li> + + <ul> + + <li><i>for k, v in pairs(_G) do print(k, v) end</i></li> + + </ul> + </ul> *************** *** 238,242 **** <ul> ! <li>Variables can be assigned to functions if desired.</li> </ul> --- 259,288 ---- <ul> ! <li><i>function SumDiff(num1, num2) print(num1, ! num2); ! return num1+num2, num1-num2 end</i></li> ! ! <ul> ! ! <li><i>num_sum, num_diff = SumDiff(2, 3)</i></li> ! ! </ul> ! ! <li>Can return multiple values and be passed less variables ! than specified. The unhandled returns or inputs are set to ! nil. </li> ! ! <li>Variables can be assigned to functions if desired or ! functions can be put into tables</li> ! ! <ul> ! ! <li><i>PrintWarning = function(msg) print("Warning: ! "..msg) end</i></li> ! ! <li><i>FuncTable = {}; FuncTable["Warning"] = ! PrintWarning; FuncTable.Warning("I'm broke")</i></li> ! ! </ul> </ul> *************** *** 244,251 **** <ul> ! <li>Can return multiple values</li> ! ! <li>Values cannot be returned through input variables ! unless they are tables</li> </ul> --- 290,295 ---- <ul> ! <li>Values passed to functions are local and not ! modified unless they are tables</li> </ul> *************** *** 253,258 **** <ul> ! <li>function DoStuff(input1, input2) print(input2, input2); ! return input1+input2, input1 end</li> </ul> --- 297,312 ---- <ul> ! <ul> ! ! <li><i>function AppendToTable(atable, val) ! atable[#atable+1] = val end</i></li> ! ! <li><i>mytable = {}; AppendToTable(mytable, "hello")</i> ! adds "hello" to index 1, eg. mytable[1] == "hello"</li> ! ! <li>Note that the table is not returned, but modified ! inplace.</li> ! ! </ul> </ul> *************** *** 1106,1109 **** --- 1160,1165 ---- nice editor using the wxStyledTextCtrl.</li> + <li>The lua code for it is in samples/editor.wx.lua</li> + <li>You can fully debug lua programs, step through them line by *************** *** 1214,1218 **** <li>This is the same table the lua executable ! creates, where 0 = the name of the lua program run and positive indices are args to the lua program and the most negative index is the name of the executable.</li> --- 1270,1275 ---- <li>This is the same table the lua executable ! creates, where arg[0] is the name of the lua program run and positive ! indices are args to the lua program and the most negative index is the name of the executable.</li> *************** *** 1328,1332 **** </ul> ! <h2><u>wxLua Modules</u></h2> wxLua is broken up into "modules" that are compiled into libraries so --- 1385,1389 ---- </ul> ! <h2><u>wxLua Sourcecode Modules</u></h2> wxLua is broken up into "modules" that are compiled into libraries so *************** *** 1425,1430 **** <h2><u>wxLua Programming in C++</u></h2> ! The documentation for the wxLua library is in the header files above ! each function, enum, etc. Please read through them to get a feel for what functions wxLua provides, but note that most of them are for internal use and are not generally useful. Below is just a quick --- 1482,1488 ---- <h2><u>wxLua Programming in C++</u></h2> ! The documentation for the wxLua library is in the header files and ! descriptions are given for each function, enum, etc. Please ! read through them to get a feel for what functions wxLua provides, but note that most of them are for internal use and are not generally useful. Below is just a quick |
|
From: John L. <jr...@us...> - 2006-12-19 06:18:37
|
Update of /cvsroot/wxlua/wxLua/bindings/wxstc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15689/wxLua/bindings/wxstc Modified Files: wxstc_datatypes.lua Log Message: update wxluaref.html add wxIconBundle Index: wxstc_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_datatypes.lua,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** wxstc_datatypes.lua 14 Dec 2006 22:02:57 -0000 1.38 --- wxstc_datatypes.lua 19 Dec 2006 06:18:02 -0000 1.39 *************** *** 1598,1601 **** --- 1598,1607 ---- Name = "wxIcon", }, + wxIconBundle = { + Condition = "wxLUA_USE_wxIcon", + DefType = "class", + IsNumber = false, + Name = "wxIconBundle", + }, wxIconizeEvent = { BaseClass = "wxEvent", |
|
From: John L. <jr...@us...> - 2006-12-19 06:18:37
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15689/wxLua/bindings Modified Files: genidocs.lua Log Message: update wxluaref.html add wxIconBundle Index: genidocs.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genidocs.lua,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** genidocs.lua 2 Nov 2006 23:38:08 -0000 1.4 --- genidocs.lua 19 Dec 2006 06:18:01 -0000 1.5 *************** *** 10,16 **** wxWidgetsClassRefTable = {} -- a list of wx classes from the alphabetical class list ! typeDefs = {} -- filled from the data cache files ! dataTypes = {} ! conditions = {} classColour = "AA0000" --- 10,16 ---- wxWidgetsClassRefTable = {} -- a list of wx classes from the alphabetical class list ! typedefTable = {} -- filled from the data cache files ! dataTypeTable = {} ! preprocConditionTable = {} classColour = "AA0000" *************** *** 71,75 **** table.insert(fileTable, "<body>") ! table.insert(fileTable, "<h1>wxLua 2.6.3.0 Class Reference for wxWidgets 2.6.3</h1>") return fileTable --- 71,75 ---- table.insert(fileTable, "<body>") ! table.insert(fileTable, "<h1>wxLua 2.8.0.0 Class Reference for wxWidgets 2.8.0</h1>") return fileTable *************** *** 93,97 **** allClasses[k] = false -- wxWidgets classes end ! for k, v in pairs(dataTypes) do -- hack for special classes if (v.DefType == "class") or (v.DefType == "wx2lua") then --- 93,97 ---- allClasses[k] = false -- wxWidgets classes end ! for k, v in pairs(dataTypeTable) do -- hack for special classes if (v.DefType == "class") or (v.DefType == "wx2lua") then *************** *** 128,132 **** table.insert(fileTable, "<h2>wxWidgets Enums</h2>") ! for k, v in pairs(dataTypes) do if v.DefType == "enum" then table.insert(names, k) --- 128,132 ---- table.insert(fileTable, "<h2>wxWidgets Enums</h2>") ! for k, v in pairs(dataTypeTable) do if v.DefType == "enum" then table.insert(names, k) *************** *** 239,263 **** used[cname] = true - local function replace_pattern(w) - - end - for w in string.gmatch(line, "([%w_]+)") do if ((string.len(cname) == 0) or (not string.find(w, cname, 1, 1))) and (not used[w]) and ! dataTypes[w] and (dataTypes[w].DefType ~= "builtin") and (dataTypes[w].DefType ~= "wxtypedef") then used[w] = true -- replace the classname with a link, but not if it's part of a name --out_line = string.gsub(out_line, w, MakeLink(w)) ! local pat = "[ %&%*%(%)%{%}%[%]%+%-%=%<%>%.%-%+%|%/]" ! local s, e = string.find(out_line, w..pat, 1) while s do local link = MakeLink(w) out_line = string.sub(out_line, 1, s-1)..link..string.sub(out_line, e) ! s, e = string.find(out_line, w..pat, s+string.len(link)) end end end out_line = string.gsub(out_line, "(%%[%w_]+)", function(s) return "<i>"..s.."</i>" end) --- 239,262 ---- used[cname] = true for w in string.gmatch(line, "([%w_]+)") do if ((string.len(cname) == 0) or (not string.find(w, cname, 1, 1))) and (not used[w]) and ! dataTypeTable[w] and (dataTypeTable[w].DefType ~= "number") and ! (dataTypeTable[w].DefType ~= "wxtypedef") and (dataTypeTable[w].DefType ~= "special") then used[w] = true -- replace the classname with a link, but not if it's part of a name --out_line = string.gsub(out_line, w, MakeLink(w)) ! local pat = "[ %&%*%(%)%{%}%[%]%+%-%=%<%>%.%-%+%|%/%,]" ! -- need extra ending space to find words at end of line ! local s, e = string.find(out_line.." ", w..pat, 1) while s do local link = MakeLink(w) out_line = string.sub(out_line, 1, s-1)..link..string.sub(out_line, e) ! s, e = string.find(out_line.." ", w..pat, s+string.len(link)) end end end + -- italicize the %keywords out_line = string.gsub(out_line, "(%%[%w_]+)", function(s) return "<i>"..s.."</i>" end) *************** *** 323,326 **** --- 322,327 ---- end + dataTypeTable["wxString"].DefType = "class" -- FIXME hack for wxString DefType as "special" + -- load any cached settings from other wrappers if datatype_cache_input_fileTable then |
|
From: John L. <jr...@us...> - 2006-12-19 06:18:37
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15689/wxLua/bindings/wxwidgets Modified Files: appframe.i gdi.i wx_datatypes.lua Log Message: update wxluaref.html add wxIconBundle Index: appframe.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/appframe.i,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** appframe.i 7 Dec 2006 06:32:42 -0000 1.24 --- appframe.i 19 Dec 2006 06:18:02 -0000 1.25 *************** *** 117,121 **** %wxchkver27 wxWindow* SetDefaultItem(wxWindow *win) void SetIcon(const wxIcon& icon) ! //void SetIcons(const wxIconBundle& icons) //void SetLeftMenu(int id = wxID_ANY, const wxString& label = wxEmptyString, wxMenu * subMenu = NULL) //void SetRightMenu(int id = wxID_ANY, const wxString& label = wxEmptyString, wxMenu * subMenu = NULL) --- 117,121 ---- %wxchkver27 wxWindow* SetDefaultItem(wxWindow *win) void SetIcon(const wxIcon& icon) ! void SetIcons(const wxIconBundle& icons) //void SetLeftMenu(int id = wxID_ANY, const wxString& label = wxEmptyString, wxMenu * subMenu = NULL) //void SetRightMenu(int id = wxID_ANY, const wxString& label = wxEmptyString, wxMenu * subMenu = NULL) Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** wx_datatypes.lua 14 Dec 2006 22:02:57 -0000 1.43 --- wx_datatypes.lua 19 Dec 2006 06:18:02 -0000 1.44 *************** *** 1598,1601 **** --- 1598,1607 ---- Name = "wxIcon", }, + wxIconBundle = { + Condition = "wxLUA_USE_wxIcon", + DefType = "class", + IsNumber = false, + Name = "wxIconBundle", + }, wxIconizeEvent = { BaseClass = "wxEvent", Index: gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** gdi.i 7 Dec 2006 06:32:42 -0000 1.32 --- gdi.i 19 Dec 2006 06:18:02 -0000 1.33 *************** *** 682,685 **** --- 682,702 ---- %endclass + //----------------------------------------------------------------------------- + // wxIconBundle + + %class %delete %noclassinfo %encapsulate wxIconBundle + %constructor wxDefaultIconBundle() + //wxIconBundle( const wxString& file, long type ) use default and call AddIcon(file, type) + wxIconBundle( const wxIcon& icon ) + %constructor wxIconBundleCopy( const wxIconBundle& ic ) + + %overload void AddIcon( const wxString& file, long type ) + %overload void AddIcon( const wxIcon& icon ); + + const wxIcon& GetIcon( const wxSize& size ) const; + // equivalent to GetIcon( wxSize( size, size ) ) + //const wxIcon& GetIcon( wxCoord size = wxDefaultCoord ) const + %endclass + %endif //wxLUA_USE_wxIcon |
|
From: John L. <jr...@us...> - 2006-12-19 06:18:08
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15689/wxLua/modules/wxbind/src Modified Files: appframe.cpp gdi.cpp wx_bind.cpp Log Message: update wxluaref.html add wxIconBundle Index: wx_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v retrieving revision 1.70 retrieving revision 1.71 diff -C2 -d -r1.70 -r1.71 *** wx_bind.cpp 17 Dec 2006 07:47:16 -0000 1.70 --- wx_bind.cpp 19 Dec 2006 06:18:03 -0000 1.71 *************** *** 5944,5947 **** --- 5944,5948 ---- #if wxLUA_USE_wxIcon { "wxIcon", wxIcon_methods, wxIcon_methodCount, -1, CLASSINFO(wxIcon), &s_wxluatag_wxIcon, "wxGDIObject" }, + { "wxIconBundle", wxIconBundle_methods, wxIconBundle_methodCount, -1, NULL, &s_wxluatag_wxIconBundle, NULL }, #endif // wxLUA_USE_wxIcon *************** *** 6616,6619 **** --- 6617,6625 ---- + #if wxLUA_USE_wxIcon + wxLUA_IMPLEMENT_ENCAPSULATION(wxIconBundle, wxIconBundle) + #endif // wxLUA_USE_wxIcon + + #if wxLUA_USE_wxPointSizeRect wxLUA_IMPLEMENT_ENCAPSULATION(wxPoint, wxPoint) Index: gdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/gdi.cpp,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** gdi.cpp 17 Dec 2006 07:47:15 -0000 1.39 --- gdi.cpp 19 Dec 2006 06:18:02 -0000 1.40 *************** *** 5514,5517 **** --- 5514,5698 ---- + #if wxLUA_USE_wxIcon + // ------------------------------------------------------------------------------------------------- + // Bind class wxIconBundle + // ------------------------------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class 'wxIconBundle' + int s_wxluatag_wxIconBundle = -1; + + + #if (wxLUA_USE_wxIcon) && (wxLUA_USE_wxPointSizeRect) + static wxLuaArgTag s_wxluatagArray_wxLua_wxIconBundle_GetIcon[] = { &s_wxluatag_wxSize, 0 }; + // const wxIcon& GetIcon( const wxSize& size ) const; + static int LUACALL wxLua_wxIconBundle_GetIcon(lua_State *L) + { + wxLuaState wxlState(L); + const wxIcon *returns; + // const wxSize size + const wxSize * size = (const wxSize *)wxlState.GetUserDataType(2, s_wxluatag_wxSize); + // get this + wxIconBundle * self = (wxIconBundle *)wxlState.GetUserDataType(1, s_wxluatag_wxIconBundle); + // call GetIcon + returns = &self->GetIcon(*size); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxIcon, returns); + + return 1; + } + + #endif // (wxLUA_USE_wxIcon) && (wxLUA_USE_wxPointSizeRect) + + static wxLuaArgTag s_wxluatagArray_wxLua_wxDefaultIconBundle_constructor[] = { 0 }; + // %constructor wxDefaultIconBundle() + static int LUACALL wxLua_wxDefaultIconBundle_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxIconBundle *returns; + // call constructor + returns = new wxIconBundle(); + // add to tracked memory list + wxLua_AddTrackedObject(wxlState, (wxIconBundle *)returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxIconBundle, returns); + + return 1; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxIconBundle_constructor[] = { &s_wxluatag_wxIcon, 0 }; + // wxIconBundle( const wxIcon& icon ) + static int LUACALL wxLua_wxIconBundle_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxIconBundle *returns; + // const wxIcon icon + const wxIcon * icon = (const wxIcon *)wxlState.GetUserDataType(1, s_wxluatag_wxIcon); + // call constructor + returns = new wxIconBundle(*icon); + // add to tracked memory list + wxLua_AddTrackedObject(wxlState, (wxIconBundle *)returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxIconBundle, returns); + + return 1; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxIconBundleCopy_constructor[] = { &s_wxluatag_wxIconBundle, 0 }; + // %constructor wxIconBundleCopy( const wxIconBundle& ic ) + static int LUACALL wxLua_wxIconBundleCopy_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxIconBundle *returns; + // const wxIconBundle ic + const wxIconBundle * ic = (const wxIconBundle *)wxlState.GetUserDataType(1, s_wxluatag_wxIconBundle); + // call constructor + returns = new wxIconBundle(*ic); + // add to tracked memory list + wxLua_AddTrackedObject(wxlState, (wxIconBundle *)returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxIconBundle, returns); + + return 1; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxIconBundle_AddIcon1[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; + // %overload void AddIcon( const wxString& file, long type ) + static int LUACALL wxLua_wxIconBundle_AddIcon1(lua_State *L) + { + wxLuaState wxlState(L); + // long type + long type = (long)wxlState.GetNumberType(3); + // const wxString file + const wxString file = lua2wx(wxlState.GetStringType(2)); + // get this + wxIconBundle * self = (wxIconBundle *)wxlState.GetUserDataType(1, s_wxluatag_wxIconBundle); + // call AddIcon + self->AddIcon(file, type); + + return 0; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxIconBundle_AddIcon2[] = { &s_wxluatag_wxIcon, 0 }; + // %overload void AddIcon( const wxIcon& icon ); + static int LUACALL wxLua_wxIconBundle_AddIcon2(lua_State *L) + { + wxLuaState wxlState(L); + // const wxIcon icon + const wxIcon * icon = (const wxIcon *)wxlState.GetUserDataType(2, s_wxluatag_wxIcon); + // get this + wxIconBundle * self = (wxIconBundle *)wxlState.GetUserDataType(1, s_wxluatag_wxIconBundle); + // call AddIcon + self->AddIcon(*icon); + + return 0; + } + + static int LUACALL wxLua_wxIconBundle_destructor(lua_State *L) + { + wxLuaState wxlState(L); + wxIconBundle * self = (wxIconBundle *)wxlState.GetUserDataType(1, s_wxluatag_wxIconBundle); + + // remove from tracked memory list + if (self != 0) + wxlState.RemoveTrackedObject(self); + return 0; + } + + static int LUACALL wxLua_wxIconBundle_Delete(lua_State *L) + { + wxLuaState wxlState(L); + wxIconBundle * self = (wxIconBundle *)wxlState.GetUserDataType(1, s_wxluatag_wxIconBundle); + // remove from tracked memory list + if (self != 0) + if (wxlState.RemoveTrackedObject(self)) + { // if removed, reset the tag so that gc() is not called on this object. + lua_pushnil(L); + lua_setmetatable(L, -2); + } + return 0; + } + + + + // Overloaded function bindings + + #if (wxLUA_USE_wxIcon) + // Overloaded functions for wxLua_wxIconBundle_AddIcon + static int LUACALL wxLua_wxIconBundle_AddIcon(lua_State *L) + { + // function overload table + static WXLUAMETHOD overloaded_methods[] = + { + { LuaMethod, "AddIcon", wxLua_wxIconBundle_AddIcon1, 2, 2, s_wxluatagArray_wxLua_wxIconBundle_AddIcon1 }, + { LuaMethod, "AddIcon", wxLua_wxIconBundle_AddIcon2, 1, 1, s_wxluatagArray_wxLua_wxIconBundle_AddIcon2 }, + }; + static int overloaded_methodCount = sizeof(overloaded_methods)/sizeof(overloaded_methods[0]); + wxLuaState wxlState(L); + return wxlState.CallOverloadedFunction(overloaded_methods, overloaded_methodCount); + } + #endif // (wxLUA_USE_wxIcon) + + + + // Map Lua Class Methods to C Binding Functions + WXLUAMETHOD wxIconBundle_methods[] = { + + #if (wxLUA_USE_wxIcon) && (wxLUA_USE_wxPointSizeRect) + { LuaMethod, "GetIcon", wxLua_wxIconBundle_GetIcon, 1, 1, s_wxluatagArray_wxLua_wxIconBundle_GetIcon }, + #endif // (wxLUA_USE_wxIcon) && (wxLUA_USE_wxPointSizeRect) + + { LuaConstructor, "wxDefaultIconBundle", wxLua_wxDefaultIconBundle_constructor, 0, 0, s_wxluatagArray_wxLua_wxDefaultIconBundle_constructor }, + { LuaConstructor, "wxIconBundle", wxLua_wxIconBundle_constructor, 1, 1, s_wxluatagArray_wxLua_wxIconBundle_constructor }, + { LuaConstructor, "wxIconBundleCopy", wxLua_wxIconBundleCopy_constructor, 1, 1, s_wxluatagArray_wxLua_wxIconBundleCopy_constructor }, + { LuaMethod, "AddIcon", wxLua_wxIconBundle_AddIcon, 2, 2, s_wxluatagArray_wxLua_wxIconBundle_AddIcon1 }, + { LuaMethod, "AddIcon", wxLua_wxIconBundle_AddIcon, 1, 1, s_wxluatagArray_wxLua_wxIconBundle_AddIcon2 }, + { LuaDelete, "wxIconBundle", wxLua_wxIconBundle_destructor, 0, 0, s_wxluaargArray_None }, + { LuaMethod, "Delete", wxLua_wxIconBundle_Delete, 0, 0, s_wxluaargArray_None }, + }; + + int wxIconBundle_methodCount = sizeof(wxIconBundle_methods)/sizeof(wxIconBundle_methods[0]); + #endif // wxLUA_USE_wxIcon + + #if (defined(__WXMSW__)) && (wxLUA_USE_wxBitmap) // ------------------------------------------------------------------------------------------------- Index: appframe.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/appframe.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** appframe.cpp 17 Dec 2006 07:47:14 -0000 1.28 --- appframe.cpp 19 Dec 2006 06:18:02 -0000 1.29 *************** *** 513,516 **** --- 513,531 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxTopLevelWindow_SetIcons[] = { &s_wxluatag_wxIconBundle, 0 }; + // void SetIcons(const wxIconBundle& icons) + static int LUACALL wxLua_wxTopLevelWindow_SetIcons(lua_State *L) + { + wxLuaState wxlState(L); + // const wxIconBundle icons + const wxIconBundle * icons = (const wxIconBundle *)wxlState.GetUserDataType(2, s_wxluatag_wxIconBundle); + // get this + wxTopLevelWindow * self = (wxTopLevelWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxTopLevelWindow); + // call SetIcons + self->SetIcons(*icons); + + return 0; + } + #endif // (wxLUA_USE_wxIcon) && (wxLUA_USE_wxFrame || wxLUA_USE_wxDialog) *************** *** 711,714 **** --- 726,730 ---- { LuaMethod, "GetIcon", wxLua_wxTopLevelWindow_GetIcon, 0, 0, s_wxluatagArray_wxLua_wxTopLevelWindow_GetIcon }, { LuaMethod, "SetIcon", wxLua_wxTopLevelWindow_SetIcon, 1, 1, s_wxluatagArray_wxLua_wxTopLevelWindow_SetIcon }, + { LuaMethod, "SetIcons", wxLua_wxTopLevelWindow_SetIcons, 1, 1, s_wxluatagArray_wxLua_wxTopLevelWindow_SetIcons }, #endif // (wxLUA_USE_wxIcon) && (wxLUA_USE_wxFrame || wxLUA_USE_wxDialog) |
|
From: John L. <jr...@us...> - 2006-12-19 06:18:07
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15689/wxLua/modules/wxbind/include Modified Files: wxbind.h Log Message: update wxluaref.html add wxIconBundle Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** wxbind.h 17 Dec 2006 07:47:14 -0000 1.48 --- wxbind.h 19 Dec 2006 06:18:02 -0000 1.49 *************** *** 1070,1073 **** --- 1070,1074 ---- #if wxLUA_USE_wxIcon extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxIcon; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxIconBundle; #endif // wxLUA_USE_wxIcon *************** *** 2089,2092 **** --- 2090,2095 ---- extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxIcon_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxIcon_methodCount; + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxIconBundle_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxIconBundle_methodCount; #endif // wxLUA_USE_wxIcon *************** *** 2705,2708 **** --- 2708,2715 ---- #endif // wxLUA_USE_wxGrid + #if wxLUA_USE_wxIcon + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxIconBundle, wxIconBundle) + #endif // wxLUA_USE_wxIcon + #if wxLUA_USE_wxPointSizeRect wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxPoint, wxPoint) |
