Menu
▾
▴
[Wxlua-commit] wxLua/apps/build/msw apps_app_lua.dsp, 1.3, 1.4 apps.dsw, 1.13, 1.14 apps_app_wxlua.dsp, 1.30, 1.31 apps_app_wxluacan.dsp, 1.23, 1.24 apps_app_wxluaedit.dsp, 1.37, 1.38 apps_app_wxluafreeze.dsp, 1.8, 1.9 makefile.bcc, 1.57, 1.58 makefile.gcc, 1.58, 1.59 makefile.vc, 1.57, 1.58 makefile.wat, 1.58, 1.59 apps_app_verbatimlua.dsp, 1.7, NONE
|
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] |
