From: Francesco M. <fr...@us...> - 2006-01-23 19:38:44
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24398/apps/build/msw Modified Files: apps_app_wxlua.dsp apps_app_wxluaedit.dsp makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: updated bakefiles Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** makefile.bcc 30 Nov 2005 23:52:30 -0000 1.13 --- makefile.bcc 23 Jan 2006 19:38:29 -0000 1.14 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.2.0 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= *************** *** 62,66 **** # Version of the wx library to build against. !ifndef WX_VERSION ! WX_VERSION = 26 !endif --- 62,66 ---- # Version of the wx library to build against. !ifndef WX_VERSION ! WX_VERSION = 27 !endif *************** *** 86,91 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG_1) $(__DEBUGINFO) \ ! -tWM $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj \ --- 86,91 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_1) \ ! -I..\..\..\modules $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj \ *************** *** 94,100 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG_1) $(__DEBUGINFO) \ ! -tWM $(__WX_SHAREDDEFINE_p) -I$(WXSTEDIT)\include \ ! -I$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ borland$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj \ --- 94,100 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_1) \ ! -I..\..\..\modules -I$(WXSTEDIT)\include -I$(WX_DIR)\contrib\include \ ! $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ borland$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj \ *************** *** 109,115 **** --- 109,127 ---- __app_wxlua___depname = ..\..\..\bin\wxlua.exe !endif + !if "$(WX_SHARED)" == "0" + __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\bcc_lib$(WXLIBPOSTFIX) + !endif + !if "$(WX_SHARED)" == "1" + __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\bcc_dll$(WXLIBPOSTFIX) + !endif !if "$(USE_WXLUAEDITAPP)" == "1" __app_wxluaedit___depname = ..\..\..\bin\wxluaedit.exe !endif + !if "$(WX_SHARED)" == "0" + __WXLUA_OUTPUT_FOLDER_FILENAMES_1 = lib\bcc_lib$(WXLIBPOSTFIX) + !endif + !if "$(WX_SHARED)" == "1" + __WXLUA_OUTPUT_FOLDER_FILENAMES_1 = lib\bcc_dll$(WXLIBPOSTFIX) + !endif !if "$(WX_UNICODE)" == "1" __WXUNICODE_DEFINE_p = -D_UNICODE *************** *** 124,153 **** __WXDEBUG_DEFINE_p_0 = -d__WXDEBUG__ !endif ! !if "$(WX_DEBUG)" == "0" ! __OPTIMIZEFLAG_1 = -O2 ! !endif ! !if "$(WX_DEBUG)" == "1" ! __OPTIMIZEFLAG_1 = -Od ! !endif ! !if "$(WX_SHARED)" == "1" ! __WX_SHAREDDEFINE_p = -DWXUSINGDLL !endif !if "$(WX_SHARED)" == "1" ! __WX_SHAREDDEFINE_p_0 = -dWXUSINGDLL !endif !if "$(WX_SHARED)" == "0" ! __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\bcc_lib !endif !if "$(WX_SHARED)" == "1" ! __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\bcc_dll ! !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 "$(WX_SHARED)" == "0" --- 136,156 ---- __WXDEBUG_DEFINE_p_0 = -d__WXDEBUG__ !endif ! !if "$(WX_SHARED)" == "0" ! ____WX_SHARED = !endif !if "$(WX_SHARED)" == "1" ! ____WX_SHARED = -DWXUSINGDLL !endif !if "$(WX_SHARED)" == "0" ! ____WX_SHARED_0 = !endif !if "$(WX_SHARED)" == "1" ! ____WX_SHARED_0 = -dWXUSINGDLL !endif ! !if "$(WX_DEBUG)" == "0" ! ____WX_DEBUG = -O2 !endif ! !if "$(WX_DEBUG)" == "1" ! ____WX_DEBUG = -Od !endif !if "$(WX_SHARED)" == "0" *************** *** 158,165 **** !endif !if "$(WX_DEBUG)" == "0" ! __DEBUGINFO = -v- !endif !if "$(WX_DEBUG)" == "1" ! __DEBUGINFO = -v !endif --- 161,177 ---- !endif !if "$(WX_DEBUG)" == "0" ! ____WX_DEBUG_1 = -v- !endif !if "$(WX_DEBUG)" == "1" ! ____WX_DEBUG_1 = -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 *************** *** 192,197 **** !if "$(USE_WXLUAAPP)" == "1" ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| ! c0w32.obj $(APP_WXLUA_OBJECTS),$@,, wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32mt.lib,, borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res | !endif --- 204,209 ---- !if "$(USE_WXLUAAPP)" == "1" ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_1) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| ! c0w32.obj $(APP_WXLUA_OBJECTS),$@,, wxluasocket.lib wxluadebug.lib wxlua.lib wxbind.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res | !endif *************** *** 199,204 **** !if "$(USE_WXLUAEDITAPP)" == "1" ..\..\..\bin\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| ! c0w32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32mt.lib,, borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res | !endif --- 211,216 ---- !if "$(USE_WXLUAEDITAPP)" == "1" ..\..\..\bin\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_1) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES_1) -aa @&&| ! c0w32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res | !endif *************** *** 211,215 **** borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_0) $(__WXDEBUG_DEFINE_p_0) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules $(__WX_SHAREDDEFINE_p_0) $** borland$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp --- 223,227 ---- borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_0) $(__WXDEBUG_DEFINE_p_0) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____WX_SHARED_0) -i..\..\..\modules $** borland$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp *************** *** 220,223 **** borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_0) $(__WXDEBUG_DEFINE_p_0) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules $(__WX_SHAREDDEFINE_p_0) $** --- 232,235 ---- borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_0) $(__WXDEBUG_DEFINE_p_0) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____WX_SHARED_0) -i..\..\..\modules $** Index: apps_app_wxlua.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/apps_app_wxlua.dsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** apps_app_wxlua.dsp 28 Dec 2005 23:02:49 -0000 1.3 --- apps_app_wxlua.dsp 23 Jan 2006 19:38:29 -0000 1.4 *************** *** 8,21 **** !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "apps_app_wxlua.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "apps_app_wxlua.mak" CFG="app_wxlua - Win32 Release" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "app_wxlua - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application") !MESSAGE "app_wxlua - Win32 DLL Unicode Release" (based on "Win32 (x86) Application") --- 8,21 ---- !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "apps_app_wxlua.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "apps_app_wxlua.mak" CFG="app_wxlua - Win32 Release" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "app_wxlua - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application") !MESSAGE "app_wxlua - Win32 DLL Unicode Release" (based on "Win32 (x86) Application") *************** *** 26,30 **** !MESSAGE "app_wxlua - Win32 Debug" (based on "Win32 (x86) Application") !MESSAGE "app_wxlua - Win32 Release" (based on "Win32 (x86) Application") ! !MESSAGE # Begin Project --- 26,30 ---- !MESSAGE "app_wxlua - Win32 Debug" (based on "Win32 (x86) Application") !MESSAGE "app_wxlua - Win32 Release" (based on "Win32 (x86) Application") ! !MESSAGE # Begin Project *************** *** 48,63 **** # PROP Intermediate_Dir "msvc6prjud\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "_WINDOWS" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_DEBUG" /d "WXUSINGDLL" /d _WINDOWS ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_DEBUG" /d "WXUSINGDLL" /d _WINDOWS BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_adv.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.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\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug /nodefaultlib:"MSVCRT.lib" ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_adv.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.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\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug /nodefaultlib:"MSVCRT.lib" !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Unicode Release" --- 48,63 ---- # PROP Intermediate_Dir "msvc6prjud\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" /Zi /Gm /GZ /Fd..\..\..\bin\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" /Zi /Gm /GZ /Fd..\..\..\bin\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" /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" /d "_WINDOWS" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxlua.lib wxbind.lib lua.lib wxmsw27ud_xrc.lib wxmsw27ud_html.lib wxmsw27ud_media.lib wxmsw27ud_adv.lib wxbase27ud_net.lib wxbase27ud_xml.lib wxmsw27ud_core.lib wxbase27ud.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\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllud" /subsystem:windows /debug /nodefaultlib:"MSVCRT.lib" ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxlua.lib wxbind.lib lua.lib wxmsw27ud_xrc.lib wxmsw27ud_html.lib wxmsw27ud_media.lib wxmsw27ud_adv.lib wxbase27ud_net.lib wxbase27ud_xml.lib wxmsw27ud_core.lib wxbase27ud.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\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllud" /subsystem:windows /debug /nodefaultlib:"MSVCRT.lib" !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Unicode Release" *************** *** 73,88 **** # PROP Intermediate_Dir "msvc6prju\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\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" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\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" /i "..\..\..\modules" /d "WXUSINGDLL" /d _WINDOWS ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "WXUSINGDLL" /d _WINDOWS BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_adv.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.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\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /nodefaultlib:"MSVCRT.lib" ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_adv.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.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\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /nodefaultlib:"MSVCRT.lib" !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Debug" --- 73,88 ---- # PROP Intermediate_Dir "msvc6prju\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" /Fd..\..\..\bin\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" /Fd..\..\..\bin\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" /d _WINDOWS ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /d _WINDOWS BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxlua.lib wxbind.lib lua.lib wxmsw27u_xrc.lib wxmsw27u_html.lib wxmsw27u_media.lib wxmsw27u_adv.lib wxbase27u_net.lib wxbase27u_xml.lib wxmsw27u_core.lib wxbase27u.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\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllu" /subsystem:windows /nodefaultlib:"MSVCRT.lib" ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxlua.lib wxbind.lib lua.lib wxmsw27u_xrc.lib wxmsw27u_html.lib wxmsw27u_media.lib wxmsw27u_adv.lib wxbase27u_net.lib wxbase27u_xml.lib wxmsw27u_core.lib wxbase27u.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\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllu" /subsystem:windows /nodefaultlib:"MSVCRT.lib" !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Debug" *************** *** 98,113 **** # PROP Intermediate_Dir "msvc6prjd\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "_WINDOWS" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_DEBUG" /d "WXUSINGDLL" /d _WINDOWS ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_DEBUG" /d "WXUSINGDLL" /d _WINDOWS BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26d_stc.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_media.lib wxmsw26d_adv.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.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\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug /nodefaultlib:"MSVCRT.lib" ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26d_stc.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_media.lib wxmsw26d_adv.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.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\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug /nodefaultlib:"MSVCRT.lib" !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Release" --- 98,113 ---- # PROP Intermediate_Dir "msvc6prjd\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" /Zi /Gm /GZ /Fd..\..\..\bin\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" /Zi /Gm /GZ /Fd..\..\..\bin\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" /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" /d "_WINDOWS" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxlua.lib wxbind.lib lua.lib wxmsw27d_xrc.lib wxmsw27d_html.lib wxmsw27d_media.lib wxmsw27d_adv.lib wxbase27d_net.lib wxbase27d_xml.lib wxmsw27d_core.lib wxbase27d.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\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dlld" /subsystem:windows /debug /nodefaultlib:"MSVCRT.lib" ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxlua.lib wxbind.lib lua.lib wxmsw27d_xrc.lib wxmsw27d_html.lib wxmsw27d_media.lib wxmsw27d_adv.lib wxbase27d_net.lib wxbase27d_xml.lib wxmsw27d_core.lib wxbase27d.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\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dlld" /subsystem:windows /debug /nodefaultlib:"MSVCRT.lib" !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Release" *************** *** 123,138 **** # PROP Intermediate_Dir "msvc6prj\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\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" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\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" /i "..\..\..\modules" /d "WXUSINGDLL" /d _WINDOWS ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "WXUSINGDLL" /d _WINDOWS BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26_stc.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_media.lib wxmsw26_adv.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.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\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /nodefaultlib:"MSVCRT.lib" ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26_stc.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_media.lib wxmsw26_adv.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.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\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /nodefaultlib:"MSVCRT.lib" !ELSEIF "$(CFG)" == "app_wxlua - Win32 Unicode Debug" --- 123,138 ---- # PROP Intermediate_Dir "msvc6prj\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" /Fd..\..\..\bin\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" /Fd..\..\..\bin\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" /d _WINDOWS ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /d _WINDOWS BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxlua.lib wxbind.lib lua.lib wxmsw27_xrc.lib wxmsw27_html.lib wxmsw27_media.lib wxmsw27_adv.lib wxbase27_net.lib wxbase27_xml.lib wxmsw27_core.lib wxbase27.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\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /nodefaultlib:"MSVCRT.lib" ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxlua.lib wxbind.lib lua.lib wxmsw27_xrc.lib wxmsw27_html.lib wxmsw27_media.lib wxmsw27_adv.lib wxbase27_net.lib wxbase27_xml.lib wxmsw27_core.lib wxbase27.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\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /nodefaultlib:"MSVCRT.lib" !ELSEIF "$(CFG)" == "app_wxlua - Win32 Unicode Debug" *************** *** 148,163 **** # PROP Intermediate_Dir "msvc6prjud\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "_WINDOWS" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_DEBUG" /d _WINDOWS ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_DEBUG" /d _WINDOWS BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_adv.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.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\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug /nodefaultlib:"MSVCRT.lib" ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_adv.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.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\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug /nodefaultlib:"MSVCRT.lib" !ELSEIF "$(CFG)" == "app_wxlua - Win32 Unicode Release" --- 148,163 ---- # PROP Intermediate_Dir "msvc6prjud\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_WINDOWS" /d _DEBUG ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_WINDOWS" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxlua.lib wxbind.lib lua.lib wxmsw27ud_xrc.lib wxmsw27ud_html.lib wxmsw27ud_media.lib wxmsw27ud_adv.lib wxbase27ud_net.lib wxbase27ud_xml.lib wxmsw27ud_core.lib wxbase27ud.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\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_libud" /subsystem:windows /debug /nodefaultlib:"MSVCRT.lib" ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxlua.lib wxbind.lib lua.lib wxmsw27ud_xrc.lib wxmsw27ud_html.lib wxmsw27ud_media.lib wxmsw27ud_adv.lib wxbase27ud_net.lib wxbase27ud_xml.lib wxmsw27ud_core.lib wxbase27ud.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\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_libud" /subsystem:windows /debug /nodefaultlib:"MSVCRT.lib" !ELSEIF "$(CFG)" == "app_wxlua - Win32 Unicode Release" *************** *** 173,178 **** # PROP Intermediate_Dir "msvc6prju\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 --- 173,178 ---- # PROP Intermediate_Dir "msvc6prju\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 *************** *** 183,188 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_adv.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.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\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /nodefaultlib:"MSVCRT.lib" ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_adv.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.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\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /nodefaultlib:"MSVCRT.lib" !ELSEIF "$(CFG)" == "app_wxlua - Win32 Debug" --- 183,188 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxlua.lib wxbind.lib lua.lib wxmsw27u_xrc.lib wxmsw27u_html.lib wxmsw27u_media.lib wxmsw27u_adv.lib wxbase27u_net.lib wxbase27u_xml.lib wxmsw27u_core.lib wxbase27u.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\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_libu" /subsystem:windows /nodefaultlib:"MSVCRT.lib" ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxlua.lib wxbind.lib lua.lib wxmsw27u_xrc.lib wxmsw27u_html.lib wxmsw27u_media.lib wxmsw27u_adv.lib wxbase27u_net.lib wxbase27u_xml.lib wxmsw27u_core.lib wxbase27u.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\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_libu" /subsystem:windows /nodefaultlib:"MSVCRT.lib" !ELSEIF "$(CFG)" == "app_wxlua - Win32 Debug" *************** *** 198,213 **** # PROP Intermediate_Dir "msvc6prjd\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "_WINDOWS" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_DEBUG" /d _WINDOWS ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_DEBUG" /d _WINDOWS BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26d_stc.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_media.lib wxmsw26d_adv.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.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\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug /nodefaultlib:"MSVCRT.lib" ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26d_stc.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_media.lib wxmsw26d_adv.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.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\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug /nodefaultlib:"MSVCRT.lib" !ELSEIF "$(CFG)" == "app_wxlua - Win32 Release" --- 198,213 ---- # PROP Intermediate_Dir "msvc6prjd\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_WINDOWS" /d _DEBUG ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_WINDOWS" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxlua.lib wxbind.lib lua.lib wxmsw27d_xrc.lib wxmsw27d_html.lib wxmsw27d_media.lib wxmsw27d_adv.lib wxbase27d_net.lib wxbase27d_xml.lib wxmsw27d_core.lib wxbase27d.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\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_libd" /subsystem:windows /debug /nodefaultlib:"MSVCRT.lib" ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxlua.lib wxbind.lib lua.lib wxmsw27d_xrc.lib wxmsw27d_html.lib wxmsw27d_media.lib wxmsw27d_adv.lib wxbase27d_net.lib wxbase27d_xml.lib wxmsw27d_core.lib wxbase27d.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\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_libd" /subsystem:windows /debug /nodefaultlib:"MSVCRT.lib" !ELSEIF "$(CFG)" == "app_wxlua - Win32 Release" *************** *** 223,228 **** # PROP Intermediate_Dir "msvc6prj\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 --- 223,228 ---- # PROP Intermediate_Dir "msvc6prj\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 *************** *** 233,238 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26_stc.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_media.lib wxmsw26_adv.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.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\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /nodefaultlib:"MSVCRT.lib" ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26_stc.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_media.lib wxmsw26_adv.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.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\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /nodefaultlib:"MSVCRT.lib" !ENDIF --- 233,238 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxlua.lib wxbind.lib lua.lib wxmsw27_xrc.lib wxmsw27_html.lib wxmsw27_media.lib wxmsw27_adv.lib wxbase27_net.lib wxbase27_xml.lib wxmsw27_core.lib wxbase27.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\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /nodefaultlib:"MSVCRT.lib" ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxlua.lib wxbind.lib lua.lib wxmsw27_xrc.lib wxmsw27_html.lib wxmsw27_media.lib wxmsw27_adv.lib wxbase27_net.lib wxbase27_xml.lib wxmsw27_core.lib wxbase27.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\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /nodefaultlib:"MSVCRT.lib" !ENDIF Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** makefile.wat 30 Nov 2005 23:52:30 -0000 1.13 --- makefile.wat 23 Jan 2006 19:38:29 -0000 1.14 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.2.0 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= *************** *** 27,40 **** # Use DLL build of wx library to use? [0,1] 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 = 26 # Compile the wxLua app ? [0,1] --- 27,44 ---- # Use DLL build of wx library to use? [0,1] + # 1 - DLL 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 = 27 # Compile the wxLua app ? [0,1] *************** *** 75,116 **** __app_wxlua___depname = ..\..\..\bin\wxlua.exe !endif __app_wxluaedit___depname = !ifeq USE_WXLUAEDITAPP 1 __app_wxluaedit___depname = ..\..\..\bin\wxluaedit.exe !endif ! __WARNINGS = ! !ifeq WX_DEBUG 0 ! __WARNINGS = !endif ! !ifeq WX_DEBUG 1 ! __WARNINGS = -wx !endif ! __OPTIMIZEFLAG = !ifeq WX_DEBUG 0 ! __OPTIMIZEFLAG = -ot -ox !endif !ifeq WX_DEBUG 1 ! __OPTIMIZEFLAG = -od !endif ! __DEBUGINFO = !ifeq WX_DEBUG 0 ! __DEBUGINFO = -d0 !endif !ifeq WX_DEBUG 1 ! __DEBUGINFO = -d2 !endif ! __DEBUGINFO_0 = !ifeq WX_DEBUG 0 ! __DEBUGINFO_0 = !endif !ifeq WX_DEBUG 1 ! __DEBUGINFO_0 = debug all !endif ! __WXLUA_OUTPUT_FOLDER_FILENAMES = ! !ifeq WX_SHARED 0 ! __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\wat_lib !endif ! !ifeq WX_SHARED 1 ! __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\wat_dll !endif __WXUNICODE_DEFINE_p = --- 79,127 ---- __app_wxlua___depname = ..\..\..\bin\wxlua.exe !endif + __WXLUA_OUTPUT_FOLDER_FILENAMES = + !ifeq WX_SHARED 0 + __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\wat_lib$(WXLIBPOSTFIX) + !endif + !ifeq WX_SHARED 1 + __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\wat_dll$(WXLIBPOSTFIX) + !endif __app_wxluaedit___depname = !ifeq USE_WXLUAEDITAPP 1 __app_wxluaedit___depname = ..\..\..\bin\wxluaedit.exe !endif ! __WXLUA_OUTPUT_FOLDER_FILENAMES_1 = ! !ifeq WX_SHARED 0 ! __WXLUA_OUTPUT_FOLDER_FILENAMES_1 = lib\wat_lib$(WXLIBPOSTFIX) !endif ! !ifeq WX_SHARED 1 ! __WXLUA_OUTPUT_FOLDER_FILENAMES_1 = lib\wat_dll$(WXLIBPOSTFIX) !endif ! ____WX_DEBUG_1 = !ifeq WX_DEBUG 0 ! ____WX_DEBUG_1 = !endif !ifeq WX_DEBUG 1 ! ____WX_DEBUG_1 = -wx !endif ! ____WX_DEBUG = !ifeq WX_DEBUG 0 ! ____WX_DEBUG = -ot -ox !endif !ifeq WX_DEBUG 1 ! ____WX_DEBUG = -od !endif ! ____WX_DEBUG_0 = !ifeq WX_DEBUG 0 ! ____WX_DEBUG_0 = -d0 !endif !ifeq WX_DEBUG 1 ! ____WX_DEBUG_0 = -d2 !endif ! ____WX_DEBUG_2 = ! !ifeq WX_DEBUG 0 ! ____WX_DEBUG_2 = !endif ! !ifeq WX_DEBUG 1 ! ____WX_DEBUG_2 = debug all !endif __WXUNICODE_DEFINE_p = *************** *** 122,125 **** --- 133,150 ---- __WXDEBUG_DEFINE_p = -d__WXDEBUG__ !endif + __WXLIBPATH_FILENAMES = + !ifeq WX_SHARED 0 + __WXLIBPATH_FILENAMES = \lib\wat_lib + !endif + !ifeq WX_SHARED 1 + __WXLIBPATH_FILENAMES = \lib\wat_dll + !endif + ____WX_SHARED = + !ifeq WX_SHARED 0 + ____WX_SHARED = + !endif + !ifeq WX_SHARED 1 + ____WX_SHARED = -dWXUSINGDLL + !endif WXLIBPOSTFIX = !ifeq WX_DEBUG 0 *************** *** 138,152 **** !endif !endif - __WXLIBPATH_FILENAMES = - !ifeq WX_SHARED 0 - __WXLIBPATH_FILENAMES = \lib\wat_lib - !endif - !ifeq WX_SHARED 1 - __WXLIBPATH_FILENAMES = \lib\wat_dll - !endif - __WX_SHAREDDEFINE_p = - !ifeq WX_SHARED 1 - __WX_SHAREDDEFINE_p = -dWXUSINGDLL - !endif ### Variables: ### --- 163,166 ---- *************** *** 154,159 **** APP_WXLUA_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include -i=..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) & ! $(__DEBUGINFO) -bm $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = & watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj & --- 168,173 ---- APP_WXLUA_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) & ! $(____WX_DEBUG_0) -i=..\..\..\modules $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = & watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj & *************** *** 161,166 **** APP_WXLUAEDIT_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include -i=..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) & ! $(__DEBUGINFO) -bm $(__WX_SHAREDDEFINE_p) -i=$(%WXSTEDIT)\include & -i=$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = & --- 175,180 ---- APP_WXLUAEDIT_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) & ! $(____WX_DEBUG_0) -i=..\..\..\modules -i=$(%WXSTEDIT)\include & -i=$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = & *************** *** 192,198 **** @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc name $^@ @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc option caseexact ! @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_0) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUA_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc file %i ! @for %i in ( wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).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) do @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc library %i @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc option resource=watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.res wlink @watcom$(WXLIBPOSTFIX)\app_wxlua.lbc --- 206,212 ---- @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc name $^@ @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc option caseexact ! @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_2) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUA_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc file %i ! @for %i in ( wxluasocket.lib wxluadebug.lib wxlua.lib wxbind.lib lua.... [truncated message content] |