From: Vadim Zeitlin Date: Tue, 27 Aug 2013 22:49:34 +0000 (+0000) Subject: Use $(OutDir) instead of explicit directories in VC10 project files. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9e2e5d0759966cdcdb7dd1ffcae65e359e447e89 Use $(OutDir) instead of explicit directories in VC10 project files. This makes it simpler to use a different output directory as it only needs to be changed in one place. See #15439. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74718 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/build/msw/wx_vc10_adv.vcxproj b/build/msw/wx_vc10_adv.vcxproj index ff17afcb47..3a2014d18f 100644 --- a/build/msw/wx_vc10_adv.vcxproj +++ b/build/msw/wx_vc10_adv.vcxproj @@ -80,12 +80,12 @@ WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -96,7 +96,7 @@ wx/wxprec.h vc_mswud\wxprec_advlib.pch vc_mswud\adv\ - ..\..\lib\vc_lib\wxmsw29ud_adv.pdb + $(OutDir)wxmsw29ud_adv.pdb Level4 true ProgramDatabase @@ -104,26 +104,26 @@ _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxmsw29ud_adv.lib + $(OutDir)wxmsw29ud_adv.lib true - ..\..\lib\vc_lib\wx_vc9_adv.bsc + $(OutDir)wx_vc9_adv.bsc true WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MaxSpeed - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) Sync MultiThreadedDLL @@ -132,7 +132,7 @@ wx/wxprec.h vc_mswu\wxprec_advlib.pch vc_mswu\adv\ - ..\..\lib\vc_lib\wxmsw29u_adv.pdb + $(OutDir)wxmsw29u_adv.pdb Level4 true ProgramDatabase @@ -140,26 +140,26 @@ _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxmsw29u_adv.lib + $(OutDir)wxmsw29u_adv.lib true - ..\..\lib\vc_lib\wx_vc9_adv.bsc + $(OutDir)wx_vc9_adv.bsc true WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -170,7 +170,7 @@ wx/wxprec.h vc_mswuddll\wxprec_advdll.pch vc_mswuddll\adv\ - ..\..\lib\vc_dll\wxmsw295ud_adv_vc_custom.pdb + $(OutDir)wxmsw295ud_adv_vc_custom.pdb Level4 true ProgramDatabase @@ -178,33 +178,33 @@ _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - 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;wininet.lib;..\..\lib\vc_dll\wxmsw29ud_core.lib;..\..\lib\vc_dll\wxbase29ud.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmsw295ud_adv_vc_custom.dll - ..\..\lib\vc_dll\wxmsw29ud_adv.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;wininet.lib;$(OutDir)wxmsw29ud_core.lib;$(OutDir)wxbase29ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw295ud_adv_vc_custom.dll + $(OutDir)wxmsw29ud_adv.lib true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) + $(OutDir);%(AdditionalLibraryDirectories) true - ..\..\lib\vc_dll\wxmsw295ud_adv_vc_custom.pdb + $(OutDir)wxmsw295ud_adv_vc_custom.pdb MachineX86 - ..\..\lib\vc_dll\wx_vc9_adv.bsc + $(OutDir)wx_vc9_adv.bsc true WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MaxSpeed - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) Sync MultiThreadedDLL @@ -213,7 +213,7 @@ wx/wxprec.h vc_mswudll\wxprec_advdll.pch vc_mswudll\adv\ - ..\..\lib\vc_dll\wxmsw295u_adv_vc_custom.pdb + $(OutDir)wxmsw295u_adv_vc_custom.pdb Level4 true ProgramDatabase @@ -221,23 +221,23 @@ _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - 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;wininet.lib;..\..\lib\vc_dll\wxmsw29u_core.lib;..\..\lib\vc_dll\wxbase29u.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmsw295u_adv_vc_custom.dll - ..\..\lib\vc_dll\wxmsw29u_adv.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;wininet.lib;$(OutDir)wxmsw29u_core.lib;$(OutDir)wxbase29u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw295u_adv_vc_custom.dll + $(OutDir)wxmsw29u_adv.lib true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) + $(OutDir);%(AdditionalLibraryDirectories) true - ..\..\lib\vc_dll\wxmsw295u_adv_vc_custom.pdb + $(OutDir)wxmsw295u_adv_vc_custom.pdb MachineX86 true true - ..\..\lib\vc_dll\wx_vc9_adv.bsc + $(OutDir)wx_vc9_adv.bsc true @@ -306,18 +306,18 @@ - Creating ..\..\lib\vc_dll\mswud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswud\wx\setup.h - ..\..\lib\vc_dll\mswud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswu\wx\setup.h - ..\..\lib\vc_dll\mswu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswud\wx\setup.h - ..\..\lib\vc_lib\mswud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswu\wx\setup.h - ..\..\lib\vc_lib\mswu\wx\setup.h;%(Outputs) + Creating $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + $(OutDir)mswud\wx\setup.h;%(Outputs) + Creating $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + $(OutDir)mswu\wx\setup.h;%(Outputs) + Creating $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + $(OutDir)mswud\wx\setup.h;%(Outputs) + Creating $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + $(OutDir)mswu\wx\setup.h;%(Outputs) @@ -325,22 +325,22 @@ - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswu\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswud\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswu\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswud\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswu\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) diff --git a/build/msw/wx_vc10_aui.vcxproj b/build/msw/wx_vc10_aui.vcxproj index b422f043c7..7e01a52176 100644 --- a/build/msw/wx_vc10_aui.vcxproj +++ b/build/msw/wx_vc10_aui.vcxproj @@ -80,12 +80,12 @@ WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -96,7 +96,7 @@ wx/wxprec.h vc_mswud\wxprec_auilib.pch vc_mswud\aui\ - ..\..\lib\vc_lib\wxmsw29ud_aui.pdb + $(OutDir)wxmsw29ud_aui.pdb Level4 true ProgramDatabase @@ -104,26 +104,26 @@ _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxmsw29ud_aui.lib + $(OutDir)wxmsw29ud_aui.lib true - ..\..\lib\vc_lib\wx_vc9_aui.bsc + $(OutDir)wx_vc9_aui.bsc true WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MaxSpeed - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) Sync MultiThreadedDLL @@ -132,7 +132,7 @@ wx/wxprec.h vc_mswu\wxprec_auilib.pch vc_mswu\aui\ - ..\..\lib\vc_lib\wxmsw29u_aui.pdb + $(OutDir)wxmsw29u_aui.pdb Level4 true ProgramDatabase @@ -140,26 +140,26 @@ _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxmsw29u_aui.lib + $(OutDir)wxmsw29u_aui.lib true - ..\..\lib\vc_lib\wx_vc9_aui.bsc + $(OutDir)wx_vc9_aui.bsc true WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -170,7 +170,7 @@ wx/wxprec.h vc_mswuddll\wxprec_auidll.pch vc_mswuddll\aui\ - ..\..\lib\vc_dll\wxmsw295ud_aui_vc_custom.pdb + $(OutDir)wxmsw295ud_aui_vc_custom.pdb Level4 true ProgramDatabase @@ -178,33 +178,33 @@ _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - 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;wininet.lib;..\..\lib\vc_dll\wxmsw29ud_adv.lib;..\..\lib\vc_dll\wxmsw29ud_core.lib;..\..\lib\vc_dll\wxbase29ud.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmsw295ud_aui_vc_custom.dll - ..\..\lib\vc_dll\wxmsw29ud_aui.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;wininet.lib;$(OutDir)wxmsw29ud_adv.lib;$(OutDir)wxmsw29ud_core.lib;$(OutDir)wxbase29ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw295ud_aui_vc_custom.dll + $(OutDir)wxmsw29ud_aui.lib true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) + $(OutDir);%(AdditionalLibraryDirectories) true - ..\..\lib\vc_dll\wxmsw295ud_aui_vc_custom.pdb + $(OutDir)wxmsw295ud_aui_vc_custom.pdb MachineX86 - ..\..\lib\vc_dll\wx_vc9_aui.bsc + $(OutDir)wx_vc9_aui.bsc true WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MaxSpeed - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) Sync MultiThreadedDLL @@ -213,7 +213,7 @@ wx/wxprec.h vc_mswudll\wxprec_auidll.pch vc_mswudll\aui\ - ..\..\lib\vc_dll\wxmsw295u_aui_vc_custom.pdb + $(OutDir)wxmsw295u_aui_vc_custom.pdb Level4 true ProgramDatabase @@ -221,23 +221,23 @@ _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - 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;wininet.lib;..\..\lib\vc_dll\wxmsw29u_adv.lib;..\..\lib\vc_dll\wxmsw29u_core.lib;..\..\lib\vc_dll\wxbase29u.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmsw295u_aui_vc_custom.dll - ..\..\lib\vc_dll\wxmsw29u_aui.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;wininet.lib;$(OutDir)wxmsw29u_adv.lib;$(OutDir)wxmsw29u_core.lib;$(OutDir)wxbase29u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw295u_aui_vc_custom.dll + $(OutDir)wxmsw29u_aui.lib true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) + $(OutDir);%(AdditionalLibraryDirectories) true - ..\..\lib\vc_dll\wxmsw295u_aui_vc_custom.pdb + $(OutDir)wxmsw295u_aui_vc_custom.pdb MachineX86 true true - ..\..\lib\vc_dll\wx_vc9_aui.bsc + $(OutDir)wx_vc9_aui.bsc true @@ -264,36 +264,36 @@ - Creating ..\..\lib\vc_dll\mswud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswud\wx\setup.h - ..\..\lib\vc_dll\mswud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswu\wx\setup.h - ..\..\lib\vc_dll\mswu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswud\wx\setup.h - ..\..\lib\vc_lib\mswud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswu\wx\setup.h - ..\..\lib\vc_lib\mswu\wx\setup.h;%(Outputs) + Creating $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + $(OutDir)mswud\wx\setup.h;%(Outputs) + Creating $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + $(OutDir)mswu\wx\setup.h;%(Outputs) + Creating $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + $(OutDir)mswud\wx\setup.h;%(Outputs) + Creating $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + $(OutDir)mswu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswu\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswud\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswu\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswud\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswu\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) diff --git a/build/msw/wx_vc10_base.vcxproj b/build/msw/wx_vc10_base.vcxproj index 0eddd24d82..30480f4fe9 100644 --- a/build/msw/wx_vc10_base.vcxproj +++ b/build/msw/wx_vc10_base.vcxproj @@ -81,12 +81,12 @@ WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -97,7 +97,7 @@ wx/wxprec.h vc_mswud\wxprec_baselib.pch vc_mswud\base\ - ..\..\lib\vc_lib\wxbase29ud.pdb + $(OutDir)wxbase29ud.pdb Level4 true ProgramDatabase @@ -105,26 +105,26 @@ _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxbase29ud.lib + $(OutDir)wxbase29ud.lib true - ..\..\lib\vc_lib\wx_vc9_base.bsc + $(OutDir)wx_vc9_base.bsc true WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MaxSpeed - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) Sync MultiThreadedDLL @@ -133,7 +133,7 @@ wx/wxprec.h vc_mswu\wxprec_baselib.pch vc_mswu\base\ - ..\..\lib\vc_lib\wxbase29u.pdb + $(OutDir)wxbase29u.pdb Level4 true ProgramDatabase @@ -141,26 +141,26 @@ _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxbase29u.lib + $(OutDir)wxbase29u.lib true - ..\..\lib\vc_lib\wx_vc9_base.bsc + $(OutDir)wx_vc9_base.bsc true WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -171,7 +171,7 @@ wx/wxprec.h vc_mswuddll\wxprec_basedll.pch vc_mswuddll\base\ - ..\..\lib\vc_dll\wxbase295ud_vc_custom.pdb + $(OutDir)wxbase295ud_vc_custom.pdb Level4 true ProgramDatabase @@ -179,33 +179,33 @@ _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase295ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) 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;wininet.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxbase295ud_vc_custom.dll - ..\..\lib\vc_dll\wxbase29ud.lib + $(OutDir)wxbase295ud_vc_custom.dll + $(OutDir)wxbase29ud.lib true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) + $(OutDir);%(AdditionalLibraryDirectories) true - ..\..\lib\vc_dll\wxbase295ud_vc_custom.pdb + $(OutDir)wxbase295ud_vc_custom.pdb MachineX86 - ..\..\lib\vc_dll\wx_vc9_base.bsc + $(OutDir)wx_vc9_base.bsc true WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MaxSpeed - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) Sync MultiThreadedDLL @@ -214,7 +214,7 @@ wx/wxprec.h vc_mswudll\wxprec_basedll.pch vc_mswudll\base\ - ..\..\lib\vc_dll\wxbase295u_vc_custom.pdb + $(OutDir)wxbase295u_vc_custom.pdb Level4 true ProgramDatabase @@ -222,23 +222,23 @@ _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase295u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) 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;wininet.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxbase295u_vc_custom.dll - ..\..\lib\vc_dll\wxbase29u.lib + $(OutDir)wxbase295u_vc_custom.dll + $(OutDir)wxbase29u.lib true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) + $(OutDir);%(AdditionalLibraryDirectories) true - ..\..\lib\vc_dll\wxbase295u_vc_custom.pdb + $(OutDir)wxbase295u_vc_custom.pdb MachineX86 true true - ..\..\lib\vc_dll\wx_vc9_base.bsc + $(OutDir)wx_vc9_base.bsc true @@ -379,18 +379,18 @@ - Creating ..\..\lib\vc_dll\mswud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswud\wx\setup.h - ..\..\lib\vc_dll\mswud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswu\wx\setup.h - ..\..\lib\vc_dll\mswu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswud\wx\setup.h - ..\..\lib\vc_lib\mswud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswu\wx\setup.h - ..\..\lib\vc_lib\mswu\wx\setup.h;%(Outputs) + Creating $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + $(OutDir)mswud\wx\setup.h;%(Outputs) + Creating $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + $(OutDir)mswu\wx\setup.h;%(Outputs) + Creating $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + $(OutDir)mswud\wx\setup.h;%(Outputs) + Creating $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + $(OutDir)mswu\wx\setup.h;%(Outputs) @@ -402,22 +402,22 @@ - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswu\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswud\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswu\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswud\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswu\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) diff --git a/build/msw/wx_vc10_core.vcxproj b/build/msw/wx_vc10_core.vcxproj index c4c5c75d45..14bb733b92 100644 --- a/build/msw/wx_vc10_core.vcxproj +++ b/build/msw/wx_vc10_core.vcxproj @@ -81,12 +81,12 @@ WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -97,7 +97,7 @@ wx/wxprec.h vc_mswud\wxprec_corelib.pch vc_mswud\core\ - ..\..\lib\vc_lib\wxmsw29ud_core.pdb + $(OutDir)wxmsw29ud_core.pdb Level4 true ProgramDatabase @@ -105,26 +105,26 @@ _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxmsw29ud_core.lib + $(OutDir)wxmsw29ud_core.lib true - ..\..\lib\vc_lib\wx_vc9_core.bsc + $(OutDir)wx_vc9_core.bsc true WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MaxSpeed - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) Sync MultiThreadedDLL @@ -133,7 +133,7 @@ wx/wxprec.h vc_mswu\wxprec_corelib.pch vc_mswu\core\ - ..\..\lib\vc_lib\wxmsw29u_core.pdb + $(OutDir)wxmsw29u_core.pdb Level4 true ProgramDatabase @@ -141,26 +141,26 @@ _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxmsw29u_core.lib + $(OutDir)wxmsw29u_core.lib true - ..\..\lib\vc_lib\wx_vc9_core.bsc + $(OutDir)wx_vc9_core.bsc true WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -171,7 +171,7 @@ wx/wxprec.h vc_mswuddll\wxprec_coredll.pch vc_mswuddll\core\ - ..\..\lib\vc_dll\wxmsw295ud_core_vc_custom.pdb + $(OutDir)wxmsw295ud_core_vc_custom.pdb Level4 true ProgramDatabase @@ -179,33 +179,33 @@ _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - 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;wininet.lib;..\..\lib\vc_dll\wxbase29ud.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmsw295ud_core_vc_custom.dll - ..\..\lib\vc_dll\wxmsw29ud_core.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;wininet.lib;$(OutDir)wxbase29ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw295ud_core_vc_custom.dll + $(OutDir)wxmsw29ud_core.lib true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) + $(OutDir);%(AdditionalLibraryDirectories) true - ..\..\lib\vc_dll\wxmsw295ud_core_vc_custom.pdb + $(OutDir)wxmsw295ud_core_vc_custom.pdb MachineX86 - ..\..\lib\vc_dll\wx_vc9_core.bsc + $(OutDir)wx_vc9_core.bsc true WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MaxSpeed - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) Sync MultiThreadedDLL @@ -214,7 +214,7 @@ wx/wxprec.h vc_mswudll\wxprec_coredll.pch vc_mswudll\core\ - ..\..\lib\vc_dll\wxmsw295u_core_vc_custom.pdb + $(OutDir)wxmsw295u_core_vc_custom.pdb Level4 true ProgramDatabase @@ -222,23 +222,23 @@ _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - 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;wininet.lib;..\..\lib\vc_dll\wxbase29u.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmsw295u_core_vc_custom.dll - ..\..\lib\vc_dll\wxmsw29u_core.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;wininet.lib;$(OutDir)wxbase29u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw295u_core_vc_custom.dll + $(OutDir)wxmsw29u_core.lib true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) + $(OutDir);%(AdditionalLibraryDirectories) true - ..\..\lib\vc_dll\wxmsw295u_core_vc_custom.pdb + $(OutDir)wxmsw295u_core_vc_custom.pdb MachineX86 true true - ..\..\lib\vc_dll\wx_vc9_core.bsc + $(OutDir)wx_vc9_core.bsc true @@ -736,18 +736,18 @@ - Creating ..\..\lib\vc_dll\mswud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswud\wx\setup.h - ..\..\lib\vc_dll\mswud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswu\wx\setup.h - ..\..\lib\vc_dll\mswu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswud\wx\setup.h - ..\..\lib\vc_lib\mswud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswu\wx\setup.h - ..\..\lib\vc_lib\mswu\wx\setup.h;%(Outputs) + Creating $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + $(OutDir)mswud\wx\setup.h;%(Outputs) + Creating $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + $(OutDir)mswu\wx\setup.h;%(Outputs) + Creating $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + $(OutDir)mswud\wx\setup.h;%(Outputs) + Creating $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + $(OutDir)mswu\wx\setup.h;%(Outputs) @@ -801,22 +801,22 @@ - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswu\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswud\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswu\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswud\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswu\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) diff --git a/build/msw/wx_vc10_gl.vcxproj b/build/msw/wx_vc10_gl.vcxproj index b07e35b5c0..8b315edb8d 100644 --- a/build/msw/wx_vc10_gl.vcxproj +++ b/build/msw/wx_vc10_gl.vcxproj @@ -80,12 +80,12 @@ WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -96,7 +96,7 @@ wx/wxprec.h vc_mswud\wxprec_gllib.pch vc_mswud\gl\ - ..\..\lib\vc_lib\wxmsw29ud_gl.pdb + $(OutDir)wxmsw29ud_gl.pdb Level4 true ProgramDatabase @@ -104,26 +104,26 @@ _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxmsw29ud_gl.lib + $(OutDir)wxmsw29ud_gl.lib true - ..\..\lib\vc_lib\wx_vc9_gl.bsc + $(OutDir)wx_vc9_gl.bsc true WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MaxSpeed - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) Sync MultiThreadedDLL @@ -132,7 +132,7 @@ wx/wxprec.h vc_mswu\wxprec_gllib.pch vc_mswu\gl\ - ..\..\lib\vc_lib\wxmsw29u_gl.pdb + $(OutDir)wxmsw29u_gl.pdb Level4 true ProgramDatabase @@ -140,26 +140,26 @@ _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxmsw29u_gl.lib + $(OutDir)wxmsw29u_gl.lib true - ..\..\lib\vc_lib\wx_vc9_gl.bsc + $(OutDir)wx_vc9_gl.bsc true WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -170,7 +170,7 @@ wx/wxprec.h vc_mswuddll\wxprec_gldll.pch vc_mswuddll\gl\ - ..\..\lib\vc_dll\wxmsw295ud_gl_vc_custom.pdb + $(OutDir)wxmsw295ud_gl_vc_custom.pdb Level4 true ProgramDatabase @@ -178,33 +178,33 @@ _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) 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;wininet.lib;wxmsw29ud_core.lib;wxbase29ud.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmsw295ud_gl_vc_custom.dll - ..\..\lib\vc_dll\wxmsw29ud_gl.lib + $(OutDir)wxmsw295ud_gl_vc_custom.dll + $(OutDir)wxmsw29ud_gl.lib true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) + $(OutDir);%(AdditionalLibraryDirectories) true - ..\..\lib\vc_dll\wxmsw295ud_gl_vc_custom.pdb + $(OutDir)wxmsw295ud_gl_vc_custom.pdb MachineX86 - ..\..\lib\vc_dll\wx_vc9_gl.bsc + $(OutDir)wx_vc9_gl.bsc true WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MaxSpeed - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) Sync MultiThreadedDLL @@ -213,7 +213,7 @@ wx/wxprec.h vc_mswudll\wxprec_gldll.pch vc_mswudll\gl\ - ..\..\lib\vc_dll\wxmsw295u_gl_vc_custom.pdb + $(OutDir)wxmsw295u_gl_vc_custom.pdb Level4 true ProgramDatabase @@ -221,23 +221,23 @@ _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) 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;wininet.lib;wxmsw29u_core.lib;wxbase29u.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmsw295u_gl_vc_custom.dll - ..\..\lib\vc_dll\wxmsw29u_gl.lib + $(OutDir)wxmsw295u_gl_vc_custom.dll + $(OutDir)wxmsw29u_gl.lib true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) + $(OutDir);%(AdditionalLibraryDirectories) true - ..\..\lib\vc_dll\wxmsw295u_gl_vc_custom.pdb + $(OutDir)wxmsw295u_gl_vc_custom.pdb MachineX86 true true - ..\..\lib\vc_dll\wx_vc9_gl.bsc + $(OutDir)wx_vc9_gl.bsc true @@ -259,36 +259,36 @@ - Creating ..\..\lib\vc_dll\mswud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswud\wx\setup.h - ..\..\lib\vc_dll\mswud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswu\wx\setup.h - ..\..\lib\vc_dll\mswu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswud\wx\setup.h - ..\..\lib\vc_lib\mswud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswu\wx\setup.h - ..\..\lib\vc_lib\mswu\wx\setup.h;%(Outputs) + Creating $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + $(OutDir)mswud\wx\setup.h;%(Outputs) + Creating $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + $(OutDir)mswu\wx\setup.h;%(Outputs) + Creating $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + $(OutDir)mswud\wx\setup.h;%(Outputs) + Creating $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + $(OutDir)mswu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswu\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswud\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswu\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswud\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswu\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) diff --git a/build/msw/wx_vc10_html.vcxproj b/build/msw/wx_vc10_html.vcxproj index f3228713e0..00b4369f25 100644 --- a/build/msw/wx_vc10_html.vcxproj +++ b/build/msw/wx_vc10_html.vcxproj @@ -80,12 +80,12 @@ WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -96,7 +96,7 @@ wx/wxprec.h vc_mswud\wxprec_htmllib.pch vc_mswud\html\ - ..\..\lib\vc_lib\wxmsw29ud_html.pdb + $(OutDir)wxmsw29ud_html.pdb Level4 true ProgramDatabase @@ -104,26 +104,26 @@ _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxmsw29ud_html.lib + $(OutDir)wxmsw29ud_html.lib true - ..\..\lib\vc_lib\wx_vc9_html.bsc + $(OutDir)wx_vc9_html.bsc true WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MaxSpeed - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) Sync MultiThreadedDLL @@ -132,7 +132,7 @@ wx/wxprec.h vc_mswu\wxprec_htmllib.pch vc_mswu\html\ - ..\..\lib\vc_lib\wxmsw29u_html.pdb + $(OutDir)wxmsw29u_html.pdb Level4 true ProgramDatabase @@ -140,26 +140,26 @@ _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxmsw29u_html.lib + $(OutDir)wxmsw29u_html.lib true - ..\..\lib\vc_lib\wx_vc9_html.bsc + $(OutDir)wx_vc9_html.bsc true WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -170,7 +170,7 @@ wx/wxprec.h vc_mswuddll\wxprec_htmldll.pch vc_mswuddll\html\ - ..\..\lib\vc_dll\wxmsw295ud_html_vc_custom.pdb + $(OutDir)wxmsw295ud_html_vc_custom.pdb Level4 true ProgramDatabase @@ -178,33 +178,33 @@ _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - 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;wininet.lib;..\..\lib\vc_dll\wxmsw29ud_core.lib;..\..\lib\vc_dll\wxbase29ud.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmsw295ud_html_vc_custom.dll - ..\..\lib\vc_dll\wxmsw29ud_html.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;wininet.lib;$(OutDir)wxmsw29ud_core.lib;$(OutDir)wxbase29ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw295ud_html_vc_custom.dll + $(OutDir)wxmsw29ud_html.lib true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) + $(OutDir);%(AdditionalLibraryDirectories) true - ..\..\lib\vc_dll\wxmsw295ud_html_vc_custom.pdb + $(OutDir)wxmsw295ud_html_vc_custom.pdb MachineX86 - ..\..\lib\vc_dll\wx_vc9_html.bsc + $(OutDir)wx_vc9_html.bsc true WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MaxSpeed - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) Sync MultiThreadedDLL @@ -213,7 +213,7 @@ wx/wxprec.h vc_mswudll\wxprec_htmldll.pch vc_mswudll\html\ - ..\..\lib\vc_dll\wxmsw295u_html_vc_custom.pdb + $(OutDir)wxmsw295u_html_vc_custom.pdb Level4 true ProgramDatabase @@ -221,23 +221,23 @@ _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - 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;wininet.lib;..\..\lib\vc_dll\wxmsw29u_core.lib;..\..\lib\vc_dll\wxbase29u.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmsw295u_html_vc_custom.dll - ..\..\lib\vc_dll\wxmsw29u_html.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;wininet.lib;$(OutDir)wxmsw29u_core.lib;$(OutDir)wxbase29u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw295u_html_vc_custom.dll + $(OutDir)wxmsw29u_html.lib true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) + $(OutDir);%(AdditionalLibraryDirectories) true - ..\..\lib\vc_dll\wxmsw295u_html_vc_custom.pdb + $(OutDir)wxmsw295u_html_vc_custom.pdb MachineX86 true true - ..\..\lib\vc_dll\wx_vc9_html.bsc + $(OutDir)wx_vc9_html.bsc true @@ -283,36 +283,36 @@ - Creating ..\..\lib\vc_dll\mswud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswud\wx\setup.h - ..\..\lib\vc_dll\mswud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswu\wx\setup.h - ..\..\lib\vc_dll\mswu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswud\wx\setup.h - ..\..\lib\vc_lib\mswud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswu\wx\setup.h - ..\..\lib\vc_lib\mswu\wx\setup.h;%(Outputs) + Creating $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + $(OutDir)mswud\wx\setup.h;%(Outputs) + Creating $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + $(OutDir)mswu\wx\setup.h;%(Outputs) + Creating $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + $(OutDir)mswud\wx\setup.h;%(Outputs) + Creating $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + $(OutDir)mswu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswu\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswud\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswu\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswud\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswu\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) diff --git a/build/msw/wx_vc10_media.vcxproj b/build/msw/wx_vc10_media.vcxproj index 746a9270fc..e7b1541569 100644 --- a/build/msw/wx_vc10_media.vcxproj +++ b/build/msw/wx_vc10_media.vcxproj @@ -80,12 +80,12 @@ WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -96,7 +96,7 @@ wx/wxprec.h vc_mswud\wxprec_medialib.pch vc_mswud\media\ - ..\..\lib\vc_lib\wxmsw29ud_media.pdb + $(OutDir)wxmsw29ud_media.pdb Level4 true ProgramDatabase @@ -104,26 +104,26 @@ _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxmsw29ud_media.lib + $(OutDir)wxmsw29ud_media.lib true - ..\..\lib\vc_lib\wx_vc9_media.bsc + $(OutDir)wx_vc9_media.bsc true WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MaxSpeed - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) Sync MultiThreadedDLL @@ -132,7 +132,7 @@ wx/wxprec.h vc_mswu\wxprec_medialib.pch vc_mswu\media\ - ..\..\lib\vc_lib\wxmsw29u_media.pdb + $(OutDir)wxmsw29u_media.pdb Level4 true ProgramDatabase @@ -140,26 +140,26 @@ _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxmsw29u_media.lib + $(OutDir)wxmsw29u_media.lib true - ..\..\lib\vc_lib\wx_vc9_media.bsc + $(OutDir)wx_vc9_media.bsc true WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -170,7 +170,7 @@ wx/wxprec.h vc_mswuddll\wxprec_mediadll.pch vc_mswuddll\media\ - ..\..\lib\vc_dll\wxmsw295ud_media_vc_custom.pdb + $(OutDir)wxmsw295ud_media_vc_custom.pdb Level4 true ProgramDatabase @@ -178,33 +178,33 @@ _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - 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;wininet.lib;..\..\lib\vc_dll\wxmsw29ud_core.lib;..\..\lib\vc_dll\wxbase29ud.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmsw295ud_media_vc_custom.dll - ..\..\lib\vc_dll\wxmsw29ud_media.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;wininet.lib;$(OutDir)wxmsw29ud_core.lib;$(OutDir)wxbase29ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw295ud_media_vc_custom.dll + $(OutDir)wxmsw29ud_media.lib true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) + $(OutDir);%(AdditionalLibraryDirectories) true - ..\..\lib\vc_dll\wxmsw295ud_media_vc_custom.pdb + $(OutDir)wxmsw295ud_media_vc_custom.pdb MachineX86 - ..\..\lib\vc_dll\wx_vc9_media.bsc + $(OutDir)wx_vc9_media.bsc true WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MaxSpeed - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) Sync MultiThreadedDLL @@ -213,7 +213,7 @@ wx/wxprec.h vc_mswudll\wxprec_mediadll.pch vc_mswudll\media\ - ..\..\lib\vc_dll\wxmsw295u_media_vc_custom.pdb + $(OutDir)wxmsw295u_media_vc_custom.pdb Level4 true ProgramDatabase @@ -221,23 +221,23 @@ _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - 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;wininet.lib;..\..\lib\vc_dll\wxmsw29u_core.lib;..\..\lib\vc_dll\wxbase29u.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmsw295u_media_vc_custom.dll - ..\..\lib\vc_dll\wxmsw29u_media.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;wininet.lib;$(OutDir)wxmsw29u_core.lib;$(OutDir)wxbase29u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw295u_media_vc_custom.dll + $(OutDir)wxmsw29u_media.lib true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) + $(OutDir);%(AdditionalLibraryDirectories) true - ..\..\lib\vc_dll\wxmsw295u_media_vc_custom.pdb + $(OutDir)wxmsw295u_media_vc_custom.pdb MachineX86 true true - ..\..\lib\vc_dll\wx_vc9_media.bsc + $(OutDir)wx_vc9_media.bsc true @@ -261,36 +261,36 @@ - Creating ..\..\lib\vc_dll\mswud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswud\wx\setup.h - ..\..\lib\vc_dll\mswud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswu\wx\setup.h - ..\..\lib\vc_dll\mswu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswud\wx\setup.h - ..\..\lib\vc_lib\mswud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswu\wx\setup.h - ..\..\lib\vc_lib\mswu\wx\setup.h;%(Outputs) + Creating $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + $(OutDir)mswud\wx\setup.h;%(Outputs) + Creating $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + $(OutDir)mswu\wx\setup.h;%(Outputs) + Creating $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + $(OutDir)mswud\wx\setup.h;%(Outputs) + Creating $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + $(OutDir)mswu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswu\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswud\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswu\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswud\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswu\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) diff --git a/build/msw/wx_vc10_net.vcxproj b/build/msw/wx_vc10_net.vcxproj index e428d1c82f..e99b99953e 100644 --- a/build/msw/wx_vc10_net.vcxproj +++ b/build/msw/wx_vc10_net.vcxproj @@ -80,12 +80,12 @@ WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -96,7 +96,7 @@ wx/wxprec.h vc_mswud\wxprec_netlib.pch vc_mswud\net\ - ..\..\lib\vc_lib\wxbase29ud_net.pdb + $(OutDir)wxbase29ud_net.pdb Level4 true ProgramDatabase @@ -104,26 +104,26 @@ _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxbase29ud_net.lib + $(OutDir)wxbase29ud_net.lib true - ..\..\lib\vc_lib\wx_vc9_net.bsc + $(OutDir)wx_vc9_net.bsc true WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MaxSpeed - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) Sync MultiThreadedDLL @@ -132,7 +132,7 @@ wx/wxprec.h vc_mswu\wxprec_netlib.pch vc_mswu\net\ - ..\..\lib\vc_lib\wxbase29u_net.pdb + $(OutDir)wxbase29u_net.pdb Level4 true ProgramDatabase @@ -140,26 +140,26 @@ _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxbase29u_net.lib + $(OutDir)wxbase29u_net.lib true - ..\..\lib\vc_lib\wx_vc9_net.bsc + $(OutDir)wx_vc9_net.bsc true WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -170,7 +170,7 @@ wx/wxprec.h vc_mswuddll\wxprec_netdll.pch vc_mswuddll\net\ - ..\..\lib\vc_dll\wxbase295ud_net_vc_custom.pdb + $(OutDir)wxbase295ud_net_vc_custom.pdb Level4 true ProgramDatabase @@ -178,33 +178,33 @@ _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase295ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - 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;wininet.lib;..\..\lib\vc_dll\wxbase29ud.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxbase295ud_net_vc_custom.dll - ..\..\lib\vc_dll\wxbase29ud_net.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;wininet.lib;$(OutDir)wxbase29ud.lib;%(AdditionalDependencies) + $(OutDir)wxbase295ud_net_vc_custom.dll + $(OutDir)wxbase29ud_net.lib true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) + $(OutDir);%(AdditionalLibraryDirectories) true - ..\..\lib\vc_dll\wxbase295ud_net_vc_custom.pdb + $(OutDir)wxbase295ud_net_vc_custom.pdb MachineX86 - ..\..\lib\vc_dll\wx_vc9_net.bsc + $(OutDir)wx_vc9_net.bsc true WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MaxSpeed - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) Sync MultiThreadedDLL @@ -213,7 +213,7 @@ wx/wxprec.h vc_mswudll\wxprec_netdll.pch vc_mswudll\net\ - ..\..\lib\vc_dll\wxbase295u_net_vc_custom.pdb + $(OutDir)wxbase295u_net_vc_custom.pdb Level4 true ProgramDatabase @@ -221,23 +221,23 @@ _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase295u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - 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;wininet.lib;..\..\lib\vc_dll\wxbase29u.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxbase295u_net_vc_custom.dll - ..\..\lib\vc_dll\wxbase29u_net.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;wininet.lib;$(OutDir)wxbase29u.lib;%(AdditionalDependencies) + $(OutDir)wxbase295u_net_vc_custom.dll + $(OutDir)wxbase29u_net.lib true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) + $(OutDir);%(AdditionalLibraryDirectories) true - ..\..\lib\vc_dll\wxbase295u_net_vc_custom.pdb + $(OutDir)wxbase295u_net_vc_custom.pdb MachineX86 true true - ..\..\lib\vc_dll\wx_vc9_net.bsc + $(OutDir)wx_vc9_net.bsc true @@ -269,36 +269,36 @@ - Creating ..\..\lib\vc_dll\mswud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswud\wx\setup.h - ..\..\lib\vc_dll\mswud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswu\wx\setup.h - ..\..\lib\vc_dll\mswu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswud\wx\setup.h - ..\..\lib\vc_lib\mswud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswu\wx\setup.h - ..\..\lib\vc_lib\mswu\wx\setup.h;%(Outputs) + Creating $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + $(OutDir)mswud\wx\setup.h;%(Outputs) + Creating $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + $(OutDir)mswu\wx\setup.h;%(Outputs) + Creating $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + $(OutDir)mswud\wx\setup.h;%(Outputs) + Creating $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + $(OutDir)mswu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswu\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswud\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswu\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswud\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswu\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) diff --git a/build/msw/wx_vc10_propgrid.vcxproj b/build/msw/wx_vc10_propgrid.vcxproj index 65987c2db5..190ef102fd 100644 --- a/build/msw/wx_vc10_propgrid.vcxproj +++ b/build/msw/wx_vc10_propgrid.vcxproj @@ -80,12 +80,12 @@ WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -96,7 +96,7 @@ wx/wxprec.h vc_mswud\wxprec_propgridlib.pch vc_mswud\propgrid\ - ..\..\lib\vc_lib\wxmsw29ud_propgrid.pdb + $(OutDir)wxmsw29ud_propgrid.pdb Level4 true ProgramDatabase @@ -104,26 +104,26 @@ _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxmsw29ud_propgrid.lib + $(OutDir)wxmsw29ud_propgrid.lib true - ..\..\lib\vc_lib\wx_vc9_propgrid.bsc + $(OutDir)wx_vc9_propgrid.bsc true WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MaxSpeed - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) Sync MultiThreadedDLL @@ -132,7 +132,7 @@ wx/wxprec.h vc_mswu\wxprec_propgridlib.pch vc_mswu\propgrid\ - ..\..\lib\vc_lib\wxmsw29u_propgrid.pdb + $(OutDir)wxmsw29u_propgrid.pdb Level4 true ProgramDatabase @@ -140,26 +140,26 @@ _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxmsw29u_propgrid.lib + $(OutDir)wxmsw29u_propgrid.lib true - ..\..\lib\vc_lib\wx_vc9_propgrid.bsc + $(OutDir)wx_vc9_propgrid.bsc true WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -170,7 +170,7 @@ wx/wxprec.h vc_mswuddll\wxprec_propgriddll.pch vc_mswuddll\propgrid\ - ..\..\lib\vc_dll\wxmsw295ud_propgrid_vc_custom.pdb + $(OutDir)wxmsw295ud_propgrid_vc_custom.pdb Level4 true ProgramDatabase @@ -178,33 +178,33 @@ _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - 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;wininet.lib;..\..\lib\vc_dll\wxmsw29ud_adv.lib;..\..\lib\vc_dll\wxmsw29ud_core.lib;..\..\lib\vc_dll\wxbase29ud.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmsw295ud_propgrid_vc_custom.dll - ..\..\lib\vc_dll\wxmsw29ud_propgrid.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;wininet.lib;$(OutDir)wxmsw29ud_adv.lib;$(OutDir)wxmsw29ud_core.lib;$(OutDir)wxbase29ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw295ud_propgrid_vc_custom.dll + $(OutDir)wxmsw29ud_propgrid.lib true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) + $(OutDir);%(AdditionalLibraryDirectories) true - ..\..\lib\vc_dll\wxmsw295ud_propgrid_vc_custom.pdb + $(OutDir)wxmsw295ud_propgrid_vc_custom.pdb MachineX86 - ..\..\lib\vc_dll\wx_vc9_propgrid.bsc + $(OutDir)wx_vc9_propgrid.bsc true WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MaxSpeed - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) Sync MultiThreadedDLL @@ -213,7 +213,7 @@ wx/wxprec.h vc_mswudll\wxprec_propgriddll.pch vc_mswudll\propgrid\ - ..\..\lib\vc_dll\wxmsw295u_propgrid_vc_custom.pdb + $(OutDir)wxmsw295u_propgrid_vc_custom.pdb Level4 true ProgramDatabase @@ -221,23 +221,23 @@ _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - 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;wininet.lib;..\..\lib\vc_dll\wxmsw29u_adv.lib;..\..\lib\vc_dll\wxmsw29u_core.lib;..\..\lib\vc_dll\wxbase29u.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmsw295u_propgrid_vc_custom.dll - ..\..\lib\vc_dll\wxmsw29u_propgrid.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;wininet.lib;$(OutDir)wxmsw29u_adv.lib;$(OutDir)wxmsw29u_core.lib;$(OutDir)wxbase29u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw295u_propgrid_vc_custom.dll + $(OutDir)wxmsw29u_propgrid.lib true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) + $(OutDir);%(AdditionalLibraryDirectories) true - ..\..\lib\vc_dll\wxmsw295u_propgrid_vc_custom.pdb + $(OutDir)wxmsw295u_propgrid_vc_custom.pdb MachineX86 true true - ..\..\lib\vc_dll\wx_vc9_propgrid.bsc + $(OutDir)wx_vc9_propgrid.bsc true @@ -265,36 +265,36 @@ - Creating ..\..\lib\vc_dll\mswud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswud\wx\setup.h - ..\..\lib\vc_dll\mswud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswu\wx\setup.h - ..\..\lib\vc_dll\mswu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswud\wx\setup.h - ..\..\lib\vc_lib\mswud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswu\wx\setup.h - ..\..\lib\vc_lib\mswu\wx\setup.h;%(Outputs) + Creating $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + $(OutDir)mswud\wx\setup.h;%(Outputs) + Creating $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + $(OutDir)mswu\wx\setup.h;%(Outputs) + Creating $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + $(OutDir)mswud\wx\setup.h;%(Outputs) + Creating $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + $(OutDir)mswu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswu\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswud\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswu\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswud\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswu\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) diff --git a/build/msw/wx_vc10_qa.vcxproj b/build/msw/wx_vc10_qa.vcxproj index b4f753f10d..ded9c21ff4 100644 --- a/build/msw/wx_vc10_qa.vcxproj +++ b/build/msw/wx_vc10_qa.vcxproj @@ -80,12 +80,12 @@ WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -96,7 +96,7 @@ wx/wxprec.h vc_mswud\wxprec_qalib.pch vc_mswud\qa\ - ..\..\lib\vc_lib\wxmsw29ud_qa.pdb + $(OutDir)wxmsw29ud_qa.pdb Level4 true ProgramDatabase @@ -104,26 +104,26 @@ _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxmsw29ud_qa.lib + $(OutDir)wxmsw29ud_qa.lib true - ..\..\lib\vc_lib\wx_vc9_qa.bsc + $(OutDir)wx_vc9_qa.bsc true WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MaxSpeed - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) Sync MultiThreadedDLL @@ -132,7 +132,7 @@ wx/wxprec.h vc_mswu\wxprec_qalib.pch vc_mswu\qa\ - ..\..\lib\vc_lib\wxmsw29u_qa.pdb + $(OutDir)wxmsw29u_qa.pdb Level4 true ProgramDatabase @@ -140,26 +140,26 @@ _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxmsw29u_qa.lib + $(OutDir)wxmsw29u_qa.lib true - ..\..\lib\vc_lib\wx_vc9_qa.bsc + $(OutDir)wx_vc9_qa.bsc true WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -170,7 +170,7 @@ wx/wxprec.h vc_mswuddll\wxprec_qadll.pch vc_mswuddll\qa\ - ..\..\lib\vc_dll\wxmsw295ud_qa_vc_custom.pdb + $(OutDir)wxmsw295ud_qa_vc_custom.pdb Level4 true ProgramDatabase @@ -178,33 +178,33 @@ _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - 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;wininet.lib;..\..\lib\vc_dll\wxmsw29ud_core.lib;..\..\lib\vc_dll\wxbase29ud.lib;..\..\lib\vc_dll\wxbase29ud_xml.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmsw295ud_qa_vc_custom.dll - ..\..\lib\vc_dll\wxmsw29ud_qa.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;wininet.lib;$(OutDir)wxmsw29ud_core.lib;$(OutDir)wxbase29ud.lib;$(OutDir)wxbase29ud_xml.lib;%(AdditionalDependencies) + $(OutDir)wxmsw295ud_qa_vc_custom.dll + $(OutDir)wxmsw29ud_qa.lib true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) + $(OutDir);%(AdditionalLibraryDirectories) true - ..\..\lib\vc_dll\wxmsw295ud_qa_vc_custom.pdb + $(OutDir)wxmsw295ud_qa_vc_custom.pdb MachineX86 - ..\..\lib\vc_dll\wx_vc9_qa.bsc + $(OutDir)wx_vc9_qa.bsc true WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MaxSpeed - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) Sync MultiThreadedDLL @@ -213,7 +213,7 @@ wx/wxprec.h vc_mswudll\wxprec_qadll.pch vc_mswudll\qa\ - ..\..\lib\vc_dll\wxmsw295u_qa_vc_custom.pdb + $(OutDir)wxmsw295u_qa_vc_custom.pdb Level4 true ProgramDatabase @@ -221,23 +221,23 @@ _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - 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;wininet.lib;..\..\lib\vc_dll\wxmsw29u_core.lib;..\..\lib\vc_dll\wxbase29u.lib;..\..\lib\vc_dll\wxbase29u_xml.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmsw295u_qa_vc_custom.dll - ..\..\lib\vc_dll\wxmsw29u_qa.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;wininet.lib;$(OutDir)wxmsw29u_core.lib;$(OutDir)wxbase29u.lib;$(OutDir)wxbase29u_xml.lib;%(AdditionalDependencies) + $(OutDir)wxmsw295u_qa_vc_custom.dll + $(OutDir)wxmsw29u_qa.lib true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) + $(OutDir);%(AdditionalLibraryDirectories) true - ..\..\lib\vc_dll\wxmsw295u_qa_vc_custom.pdb + $(OutDir)wxmsw295u_qa_vc_custom.pdb MachineX86 true true - ..\..\lib\vc_dll\wx_vc9_qa.bsc + $(OutDir)wx_vc9_qa.bsc true @@ -259,36 +259,36 @@ - Creating ..\..\lib\vc_dll\mswud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswud\wx\setup.h - ..\..\lib\vc_dll\mswud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswu\wx\setup.h - ..\..\lib\vc_dll\mswu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswud\wx\setup.h - ..\..\lib\vc_lib\mswud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswu\wx\setup.h - ..\..\lib\vc_lib\mswu\wx\setup.h;%(Outputs) + Creating $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + $(OutDir)mswud\wx\setup.h;%(Outputs) + Creating $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + $(OutDir)mswu\wx\setup.h;%(Outputs) + Creating $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + $(OutDir)mswud\wx\setup.h;%(Outputs) + Creating $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + $(OutDir)mswu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswu\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswud\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswu\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswud\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswu\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) diff --git a/build/msw/wx_vc10_ribbon.vcxproj b/build/msw/wx_vc10_ribbon.vcxproj index c2b372f2a0..15d1236830 100644 --- a/build/msw/wx_vc10_ribbon.vcxproj +++ b/build/msw/wx_vc10_ribbon.vcxproj @@ -80,12 +80,12 @@ WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -96,7 +96,7 @@ wx/wxprec.h vc_mswud\wxprec_ribbonlib.pch vc_mswud\ribbon\ - ..\..\lib\vc_lib\wxmsw29ud_ribbon.pdb + $(OutDir)wxmsw29ud_ribbon.pdb Level4 true ProgramDatabase @@ -104,26 +104,26 @@ _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxmsw29ud_ribbon.lib + $(OutDir)wxmsw29ud_ribbon.lib true - ..\..\lib\vc_lib\wx_vc9_ribbon.bsc + $(OutDir)wx_vc9_ribbon.bsc true WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MaxSpeed - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) Sync MultiThreadedDLL @@ -132,7 +132,7 @@ wx/wxprec.h vc_mswu\wxprec_ribbonlib.pch vc_mswu\ribbon\ - ..\..\lib\vc_lib\wxmsw29u_ribbon.pdb + $(OutDir)wxmsw29u_ribbon.pdb Level4 true ProgramDatabase @@ -140,26 +140,26 @@ _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxmsw29u_ribbon.lib + $(OutDir)wxmsw29u_ribbon.lib true - ..\..\lib\vc_lib\wx_vc9_ribbon.bsc + $(OutDir)wx_vc9_ribbon.bsc true WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -170,7 +170,7 @@ wx/wxprec.h vc_mswuddll\wxprec_ribbondll.pch vc_mswuddll\ribbon\ - ..\..\lib\vc_dll\wxmsw295ud_ribbon_vc_custom.pdb + $(OutDir)wxmsw295ud_ribbon_vc_custom.pdb Level4 true ProgramDatabase @@ -178,33 +178,33 @@ _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - 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;wininet.lib;..\..\lib\vc_dll\wxmsw29ud_adv.lib;..\..\lib\vc_dll\wxmsw29ud_core.lib;..\..\lib\vc_dll\wxbase29ud.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmsw295ud_ribbon_vc_custom.dll - ..\..\lib\vc_dll\wxmsw29ud_ribbon.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;wininet.lib;$(OutDir)wxmsw29ud_adv.lib;$(OutDir)wxmsw29ud_core.lib;$(OutDir)wxbase29ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw295ud_ribbon_vc_custom.dll + $(OutDir)wxmsw29ud_ribbon.lib true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) + $(OutDir);%(AdditionalLibraryDirectories) true - ..\..\lib\vc_dll\wxmsw295ud_ribbon_vc_custom.pdb + $(OutDir)wxmsw295ud_ribbon_vc_custom.pdb MachineX86 - ..\..\lib\vc_dll\wx_vc9_ribbon.bsc + $(OutDir)wx_vc9_ribbon.bsc true WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MaxSpeed - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) Sync MultiThreadedDLL @@ -213,7 +213,7 @@ wx/wxprec.h vc_mswudll\wxprec_ribbondll.pch vc_mswudll\ribbon\ - ..\..\lib\vc_dll\wxmsw295u_ribbon_vc_custom.pdb + $(OutDir)wxmsw295u_ribbon_vc_custom.pdb Level4 true ProgramDatabase @@ -221,23 +221,23 @@ _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - 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;wininet.lib;..\..\lib\vc_dll\wxmsw29u_adv.lib;..\..\lib\vc_dll\wxmsw29u_core.lib;..\..\lib\vc_dll\wxbase29u.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmsw295u_ribbon_vc_custom.dll - ..\..\lib\vc_dll\wxmsw29u_ribbon.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;wininet.lib;$(OutDir)wxmsw29u_adv.lib;$(OutDir)wxmsw29u_core.lib;$(OutDir)wxbase29u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw295u_ribbon_vc_custom.dll + $(OutDir)wxmsw29u_ribbon.lib true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) + $(OutDir);%(AdditionalLibraryDirectories) true - ..\..\lib\vc_dll\wxmsw295u_ribbon_vc_custom.pdb + $(OutDir)wxmsw295u_ribbon_vc_custom.pdb MachineX86 true true - ..\..\lib\vc_dll\wx_vc9_ribbon.bsc + $(OutDir)wx_vc9_ribbon.bsc true @@ -267,36 +267,36 @@ - Creating ..\..\lib\vc_dll\mswud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswud\wx\setup.h - ..\..\lib\vc_dll\mswud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswu\wx\setup.h - ..\..\lib\vc_dll\mswu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswud\wx\setup.h - ..\..\lib\vc_lib\mswud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswu\wx\setup.h - ..\..\lib\vc_lib\mswu\wx\setup.h;%(Outputs) + Creating $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + $(OutDir)mswud\wx\setup.h;%(Outputs) + Creating $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + $(OutDir)mswu\wx\setup.h;%(Outputs) + Creating $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + $(OutDir)mswud\wx\setup.h;%(Outputs) + Creating $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + $(OutDir)mswu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswu\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswud\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswu\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswud\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswu\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) diff --git a/build/msw/wx_vc10_richtext.vcxproj b/build/msw/wx_vc10_richtext.vcxproj index a0e86e6073..756f2b2a19 100644 --- a/build/msw/wx_vc10_richtext.vcxproj +++ b/build/msw/wx_vc10_richtext.vcxproj @@ -80,12 +80,12 @@ WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -96,7 +96,7 @@ wx/wxprec.h vc_mswud\wxprec_richtextlib.pch vc_mswud\richtext\ - ..\..\lib\vc_lib\wxmsw29ud_richtext.pdb + $(OutDir)wxmsw29ud_richtext.pdb Level4 true ProgramDatabase @@ -104,26 +104,26 @@ _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxmsw29ud_richtext.lib + $(OutDir)wxmsw29ud_richtext.lib true - ..\..\lib\vc_lib\wx_vc9_richtext.bsc + $(OutDir)wx_vc9_richtext.bsc true WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MaxSpeed - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) Sync MultiThreadedDLL @@ -132,7 +132,7 @@ wx/wxprec.h vc_mswu\wxprec_richtextlib.pch vc_mswu\richtext\ - ..\..\lib\vc_lib\wxmsw29u_richtext.pdb + $(OutDir)wxmsw29u_richtext.pdb Level4 true ProgramDatabase @@ -140,26 +140,26 @@ _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxmsw29u_richtext.lib + $(OutDir)wxmsw29u_richtext.lib true - ..\..\lib\vc_lib\wx_vc9_richtext.bsc + $(OutDir)wx_vc9_richtext.bsc true WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -170,7 +170,7 @@ wx/wxprec.h vc_mswuddll\wxprec_richtextdll.pch vc_mswuddll\richtext\ - ..\..\lib\vc_dll\wxmsw295ud_richtext_vc_custom.pdb + $(OutDir)wxmsw295ud_richtext_vc_custom.pdb Level4 true ProgramDatabase @@ -178,33 +178,33 @@ _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - 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;wininet.lib;..\..\lib\vc_dll\wxmsw29ud_adv.lib;..\..\lib\vc_dll\wxmsw29ud_html.lib;..\..\lib\vc_dll\wxbase29ud_xml.lib;..\..\lib\vc_dll\wxmsw29ud_core.lib;..\..\lib\vc_dll\wxbase29ud.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmsw295ud_richtext_vc_custom.dll - ..\..\lib\vc_dll\wxmsw29ud_richtext.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;wininet.lib;$(OutDir)wxmsw29ud_adv.lib;$(OutDir)wxmsw29ud_html.lib;$(OutDir)wxbase29ud_xml.lib;$(OutDir)wxmsw29ud_core.lib;$(OutDir)wxbase29ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw295ud_richtext_vc_custom.dll + $(OutDir)wxmsw29ud_richtext.lib true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) + $(OutDir);%(AdditionalLibraryDirectories) true - ..\..\lib\vc_dll\wxmsw295ud_richtext_vc_custom.pdb + $(OutDir)wxmsw295ud_richtext_vc_custom.pdb MachineX86 - ..\..\lib\vc_dll\wx_vc9_richtext.bsc + $(OutDir)wx_vc9_richtext.bsc true WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MaxSpeed - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) Sync MultiThreadedDLL @@ -213,7 +213,7 @@ wx/wxprec.h vc_mswudll\wxprec_richtextdll.pch vc_mswudll\richtext\ - ..\..\lib\vc_dll\wxmsw295u_richtext_vc_custom.pdb + $(OutDir)wxmsw295u_richtext_vc_custom.pdb Level4 true ProgramDatabase @@ -221,23 +221,23 @@ _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - 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;wininet.lib;..\..\lib\vc_dll\wxmsw29u_adv.lib;..\..\lib\vc_dll\wxmsw29u_html.lib;..\..\lib\vc_dll\wxbase29u_xml.lib;..\..\lib\vc_dll\wxmsw29u_core.lib;..\..\lib\vc_dll\wxbase29u.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmsw295u_richtext_vc_custom.dll - ..\..\lib\vc_dll\wxmsw29u_richtext.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;wininet.lib;$(OutDir)wxmsw29u_adv.lib;$(OutDir)wxmsw29u_html.lib;$(OutDir)wxbase29u_xml.lib;$(OutDir)wxmsw29u_core.lib;$(OutDir)wxbase29u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw295u_richtext_vc_custom.dll + $(OutDir)wxmsw29u_richtext.lib true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) + $(OutDir);%(AdditionalLibraryDirectories) true - ..\..\lib\vc_dll\wxmsw295u_richtext_vc_custom.pdb + $(OutDir)wxmsw295u_richtext_vc_custom.pdb MachineX86 true true - ..\..\lib\vc_dll\wx_vc9_richtext.bsc + $(OutDir)wx_vc9_richtext.bsc true @@ -267,36 +267,36 @@ - Creating ..\..\lib\vc_dll\mswud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswud\wx\setup.h - ..\..\lib\vc_dll\mswud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswu\wx\setup.h - ..\..\lib\vc_dll\mswu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswud\wx\setup.h - ..\..\lib\vc_lib\mswud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswu\wx\setup.h - ..\..\lib\vc_lib\mswu\wx\setup.h;%(Outputs) + Creating $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + $(OutDir)mswud\wx\setup.h;%(Outputs) + Creating $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + $(OutDir)mswu\wx\setup.h;%(Outputs) + Creating $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + $(OutDir)mswud\wx\setup.h;%(Outputs) + Creating $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + $(OutDir)mswu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswu\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswud\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswu\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswud\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswu\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) diff --git a/build/msw/wx_vc10_stc.vcxproj b/build/msw/wx_vc10_stc.vcxproj index 0ef7cb600b..b926ac2945 100644 --- a/build/msw/wx_vc10_stc.vcxproj +++ b/build/msw/wx_vc10_stc.vcxproj @@ -80,12 +80,12 @@ WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -96,7 +96,7 @@ wx/wxprec.h vc_mswud\wxprec_stclib.pch vc_mswud\stc\ - ..\..\lib\vc_lib\wxmsw29ud_stc.pdb + $(OutDir)wxmsw29ud_stc.pdb Level4 true ProgramDatabase @@ -104,26 +104,26 @@ _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxmsw29ud_stc.lib + $(OutDir)wxmsw29ud_stc.lib true - ..\..\lib\vc_lib\wx_vc9_stc.bsc + $(OutDir)wx_vc9_stc.bsc true WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MaxSpeed - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) Sync MultiThreadedDLL @@ -132,7 +132,7 @@ wx/wxprec.h vc_mswu\wxprec_stclib.pch vc_mswu\stc\ - ..\..\lib\vc_lib\wxmsw29u_stc.pdb + $(OutDir)wxmsw29u_stc.pdb Level4 true ProgramDatabase @@ -140,26 +140,26 @@ _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxmsw29u_stc.lib + $(OutDir)wxmsw29u_stc.lib true - ..\..\lib\vc_lib\wx_vc9_stc.bsc + $(OutDir)wx_vc9_stc.bsc true WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -170,7 +170,7 @@ wx/wxprec.h vc_mswuddll\wxprec_stcdll.pch vc_mswuddll\stc\ - ..\..\lib\vc_dll\wxmsw295ud_stc_vc_custom.pdb + $(OutDir)wxmsw295ud_stc_vc_custom.pdb Level4 true ProgramDatabase @@ -178,33 +178,33 @@ _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) %(AdditionalOptions) - 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;wininet.lib;..\..\lib\vc_dll\wxscintillad.lib;..\..\lib\vc_dll\wxmsw29ud_core.lib;..\..\lib\vc_dll\wxbase29ud.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmsw295ud_stc_vc_custom.dll - ..\..\lib\vc_dll\wxmsw29ud_stc.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;wininet.lib;$(OutDir)wxscintillad.lib;$(OutDir)wxmsw29ud_core.lib;$(OutDir)wxbase29ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw295ud_stc_vc_custom.dll + $(OutDir)wxmsw29ud_stc.lib true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) + $(OutDir);%(AdditionalLibraryDirectories) true - ..\..\lib\vc_dll\wxmsw295ud_stc_vc_custom.pdb + $(OutDir)wxmsw295ud_stc_vc_custom.pdb MachineX86 - ..\..\lib\vc_dll\wx_vc9_stc.bsc + $(OutDir)wx_vc9_stc.bsc true WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MaxSpeed - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) Sync MultiThreadedDLL @@ -213,7 +213,7 @@ wx/wxprec.h vc_mswudll\wxprec_stcdll.pch vc_mswudll\stc\ - ..\..\lib\vc_dll\wxmsw295u_stc_vc_custom.pdb + $(OutDir)wxmsw295u_stc_vc_custom.pdb Level4 true ProgramDatabase @@ -221,23 +221,23 @@ _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) %(AdditionalOptions) - 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;wininet.lib;..\..\lib\vc_dll\wxscintilla.lib;..\..\lib\vc_dll\wxmsw29u_core.lib;..\..\lib\vc_dll\wxbase29u.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmsw295u_stc_vc_custom.dll - ..\..\lib\vc_dll\wxmsw29u_stc.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;wininet.lib;$(OutDir)wxscintilla.lib;$(OutDir)wxmsw29u_core.lib;$(OutDir)wxbase29u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw295u_stc_vc_custom.dll + $(OutDir)wxmsw29u_stc.lib true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) + $(OutDir);%(AdditionalLibraryDirectories) true - ..\..\lib\vc_dll\wxmsw295u_stc_vc_custom.pdb + $(OutDir)wxmsw295u_stc_vc_custom.pdb MachineX86 true true - ..\..\lib\vc_dll\wx_vc9_stc.bsc + $(OutDir)wx_vc9_stc.bsc true @@ -260,36 +260,36 @@ - Creating ..\..\lib\vc_dll\mswud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswud\wx\setup.h - ..\..\lib\vc_dll\mswud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswu\wx\setup.h - ..\..\lib\vc_dll\mswu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswud\wx\setup.h - ..\..\lib\vc_lib\mswud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswu\wx\setup.h - ..\..\lib\vc_lib\mswu\wx\setup.h;%(Outputs) + Creating $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + $(OutDir)mswud\wx\setup.h;%(Outputs) + Creating $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + $(OutDir)mswu\wx\setup.h;%(Outputs) + Creating $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + $(OutDir)mswud\wx\setup.h;%(Outputs) + Creating $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + $(OutDir)mswu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswu\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswud\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswu\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswud\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswu\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) diff --git a/build/msw/wx_vc10_webview.vcxproj b/build/msw/wx_vc10_webview.vcxproj index c113d7244a..0203c64d34 100644 --- a/build/msw/wx_vc10_webview.vcxproj +++ b/build/msw/wx_vc10_webview.vcxproj @@ -80,12 +80,12 @@ WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -96,7 +96,7 @@ wx/wxprec.h vc_mswud\wxprec_webviewlib.pch vc_mswud\webview\ - ..\..\lib\vc_lib\wxmsw29ud_webview.pdb + $(OutDir)wxmsw29ud_webview.pdb Level4 true ProgramDatabase @@ -104,26 +104,26 @@ _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxmsw29ud_webview.lib + $(OutDir)wxmsw29ud_webview.lib true - ..\..\lib\vc_lib\wx_vc9_webview.bsc + $(OutDir)wx_vc9_webview.bsc true WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MaxSpeed - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) Sync MultiThreadedDLL @@ -132,7 +132,7 @@ wx/wxprec.h vc_mswu\wxprec_webviewlib.pch vc_mswu\webview\ - ..\..\lib\vc_lib\wxmsw29u_webview.pdb + $(OutDir)wxmsw29u_webview.pdb Level4 true ProgramDatabase @@ -140,26 +140,26 @@ _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxmsw29u_webview.lib + $(OutDir)wxmsw29u_webview.lib true - ..\..\lib\vc_lib\wx_vc9_webview.bsc + $(OutDir)wx_vc9_webview.bsc true WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -170,7 +170,7 @@ wx/wxprec.h vc_mswuddll\wxprec_webviewdll.pch vc_mswuddll\webview\ - ..\..\lib\vc_dll\wxmsw295ud_webview_vc_custom.pdb + $(OutDir)wxmsw295ud_webview_vc_custom.pdb Level4 true ProgramDatabase @@ -178,33 +178,33 @@ _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - 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;wininet.lib;..\..\lib\vc_dll\wxmsw29ud_core.lib;..\..\lib\vc_dll\wxbase29ud.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmsw295ud_webview_vc_custom.dll - ..\..\lib\vc_dll\wxmsw29ud_webview.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;wininet.lib;$(OutDir)wxmsw29ud_core.lib;$(OutDir)wxbase29ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw295ud_webview_vc_custom.dll + $(OutDir)wxmsw29ud_webview.lib true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) + $(OutDir);%(AdditionalLibraryDirectories) true - ..\..\lib\vc_dll\wxmsw295ud_webview_vc_custom.pdb + $(OutDir)wxmsw295ud_webview_vc_custom.pdb MachineX86 - ..\..\lib\vc_dll\wx_vc9_webview.bsc + $(OutDir)wx_vc9_webview.bsc true WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MaxSpeed - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) Sync MultiThreadedDLL @@ -213,7 +213,7 @@ wx/wxprec.h vc_mswudll\wxprec_webviewdll.pch vc_mswudll\webview\ - ..\..\lib\vc_dll\wxmsw295u_webview_vc_custom.pdb + $(OutDir)wxmsw295u_webview_vc_custom.pdb Level4 true ProgramDatabase @@ -221,23 +221,23 @@ _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - 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;wininet.lib;..\..\lib\vc_dll\wxmsw29u_core.lib;..\..\lib\vc_dll\wxbase29u.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmsw295u_webview_vc_custom.dll - ..\..\lib\vc_dll\wxmsw29u_webview.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;wininet.lib;$(OutDir)wxmsw29u_core.lib;$(OutDir)wxbase29u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw295u_webview_vc_custom.dll + $(OutDir)wxmsw29u_webview.lib true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) + $(OutDir);%(AdditionalLibraryDirectories) true - ..\..\lib\vc_dll\wxmsw295u_webview_vc_custom.pdb + $(OutDir)wxmsw295u_webview_vc_custom.pdb MachineX86 true true - ..\..\lib\vc_dll\wx_vc9_webview.bsc + $(OutDir)wx_vc9_webview.bsc true @@ -261,36 +261,36 @@ - Creating ..\..\lib\vc_dll\mswud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswud\wx\setup.h - ..\..\lib\vc_dll\mswud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswu\wx\setup.h - ..\..\lib\vc_dll\mswu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswud\wx\setup.h - ..\..\lib\vc_lib\mswud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswu\wx\setup.h - ..\..\lib\vc_lib\mswu\wx\setup.h;%(Outputs) + Creating $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + $(OutDir)mswud\wx\setup.h;%(Outputs) + Creating $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + $(OutDir)mswu\wx\setup.h;%(Outputs) + Creating $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + $(OutDir)mswud\wx\setup.h;%(Outputs) + Creating $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + $(OutDir)mswu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswu\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswud\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswu\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswud\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswu\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) diff --git a/build/msw/wx_vc10_wxexpat.vcxproj b/build/msw/wx_vc10_wxexpat.vcxproj index eea2b9e72f..a36edff0de 100644 --- a/build/msw/wx_vc10_wxexpat.vcxproj +++ b/build/msw/wx_vc10_wxexpat.vcxproj @@ -71,12 +71,12 @@ WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - ..\..\lib\vc_lib;%(AdditionalIncludeDirectories) + $(OutDir);%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - ..\..\lib\vc_lib;%(AdditionalIncludeDirectories) + $(OutDir);%(AdditionalIncludeDirectories) WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -84,7 +84,7 @@ true true vc_mswud\wxexpat\ - ..\..\lib\vc_lib\wxexpatd.pdb + $(OutDir)wxexpatd.pdb Level3 true ProgramDatabase @@ -92,32 +92,32 @@ _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_lib;%(AdditionalIncludeDirectories) + $(OutDir);%(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxexpatd.lib + $(OutDir)wxexpatd.lib true - ..\..\lib\vc_lib\wx_vc9_wxexpat.bsc + $(OutDir)wx_vc9_wxexpat.bsc true WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - ..\..\lib\vc_lib;%(AdditionalIncludeDirectories) + $(OutDir);%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MaxSpeed - ..\..\lib\vc_lib;%(AdditionalIncludeDirectories) + $(OutDir);%(AdditionalIncludeDirectories) WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) Sync MultiThreadedDLL true vc_mswu\wxexpat\ - ..\..\lib\vc_lib\wxexpat.pdb + $(OutDir)wxexpat.pdb Level3 true ProgramDatabase @@ -125,26 +125,26 @@ _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_lib;%(AdditionalIncludeDirectories) + $(OutDir);%(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxexpat.lib + $(OutDir)wxexpat.lib true - ..\..\lib\vc_lib\wx_vc9_wxexpat.bsc + $(OutDir)wx_vc9_wxexpat.bsc true WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - ..\..\lib\vc_dll;%(AdditionalIncludeDirectories) + $(OutDir);%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - ..\..\lib\vc_dll;%(AdditionalIncludeDirectories) + $(OutDir);%(AdditionalIncludeDirectories) WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -152,7 +152,7 @@ true true vc_mswuddll\wxexpat\ - ..\..\lib\vc_dll\wxexpatd.pdb + $(OutDir)wxexpatd.pdb Level3 true ProgramDatabase @@ -160,32 +160,32 @@ _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_dll;%(AdditionalIncludeDirectories) + $(OutDir);%(AdditionalIncludeDirectories) - ..\..\lib\vc_dll\wxexpatd.lib + $(OutDir)wxexpatd.lib true - ..\..\lib\vc_dll\wx_vc9_wxexpat.bsc + $(OutDir)wx_vc9_wxexpat.bsc true WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - ..\..\lib\vc_dll;%(AdditionalIncludeDirectories) + $(OutDir);%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MaxSpeed - ..\..\lib\vc_dll;%(AdditionalIncludeDirectories) + $(OutDir);%(AdditionalIncludeDirectories) WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) Sync MultiThreadedDLL true vc_mswudll\wxexpat\ - ..\..\lib\vc_dll\wxexpat.pdb + $(OutDir)wxexpat.pdb Level3 true ProgramDatabase @@ -193,14 +193,14 @@ _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_dll;%(AdditionalIncludeDirectories) + $(OutDir);%(AdditionalIncludeDirectories) - ..\..\lib\vc_dll\wxexpat.lib + $(OutDir)wxexpat.lib true - ..\..\lib\vc_dll\wx_vc9_wxexpat.bsc + $(OutDir)wx_vc9_wxexpat.bsc true diff --git a/build/msw/wx_vc10_wxjpeg.vcxproj b/build/msw/wx_vc10_wxjpeg.vcxproj index 2b5694ca6e..875449520a 100644 --- a/build/msw/wx_vc10_wxjpeg.vcxproj +++ b/build/msw/wx_vc10_wxjpeg.vcxproj @@ -71,12 +71,12 @@ WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswud;%(AdditionalIncludeDirectories) + $(OutDir)mswud;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - ..\..\lib\vc_lib\mswud;%(AdditionalIncludeDirectories) + $(OutDir)mswud;%(AdditionalIncludeDirectories) WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -84,7 +84,7 @@ true true vc_mswud\wxjpeg\ - ..\..\lib\vc_lib\wxjpegd.pdb + $(OutDir)wxjpegd.pdb Level3 true ProgramDatabase @@ -92,32 +92,32 @@ _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_lib\mswud;%(AdditionalIncludeDirectories) + $(OutDir)mswud;%(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxjpegd.lib + $(OutDir)wxjpegd.lib true - ..\..\lib\vc_lib\wx_vc9_wxjpeg.bsc + $(OutDir)wx_vc9_wxjpeg.bsc true WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) + $(OutDir)mswu;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MaxSpeed - ..\..\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) + $(OutDir)mswu;%(AdditionalIncludeDirectories) WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Sync MultiThreadedDLL true vc_mswu\wxjpeg\ - ..\..\lib\vc_lib\wxjpeg.pdb + $(OutDir)wxjpeg.pdb Level3 true ProgramDatabase @@ -125,26 +125,26 @@ _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) + $(OutDir)mswu;%(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxjpeg.lib + $(OutDir)wxjpeg.lib true - ..\..\lib\vc_lib\wx_vc9_wxjpeg.bsc + $(OutDir)wx_vc9_wxjpeg.bsc true WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswud;%(AdditionalIncludeDirectories) + $(OutDir)mswud;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - ..\..\lib\vc_dll\mswud;%(AdditionalIncludeDirectories) + $(OutDir)mswud;%(AdditionalIncludeDirectories) WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -152,7 +152,7 @@ true true vc_mswuddll\wxjpeg\ - ..\..\lib\vc_dll\wxjpegd.pdb + $(OutDir)wxjpegd.pdb Level3 true ProgramDatabase @@ -160,32 +160,32 @@ _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_dll\mswud;%(AdditionalIncludeDirectories) + $(OutDir)mswud;%(AdditionalIncludeDirectories) - ..\..\lib\vc_dll\wxjpegd.lib + $(OutDir)wxjpegd.lib true - ..\..\lib\vc_dll\wx_vc9_wxjpeg.bsc + $(OutDir)wx_vc9_wxjpeg.bsc true WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswu;%(AdditionalIncludeDirectories) + $(OutDir)mswu;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MaxSpeed - ..\..\lib\vc_dll\mswu;%(AdditionalIncludeDirectories) + $(OutDir)mswu;%(AdditionalIncludeDirectories) WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Sync MultiThreadedDLL true vc_mswudll\wxjpeg\ - ..\..\lib\vc_dll\wxjpeg.pdb + $(OutDir)wxjpeg.pdb Level3 true ProgramDatabase @@ -193,14 +193,14 @@ _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_dll\mswu;%(AdditionalIncludeDirectories) + $(OutDir)mswu;%(AdditionalIncludeDirectories) - ..\..\lib\vc_dll\wxjpeg.lib + $(OutDir)wxjpeg.lib true - ..\..\lib\vc_dll\wx_vc9_wxjpeg.bsc + $(OutDir)wx_vc9_wxjpeg.bsc true diff --git a/build/msw/wx_vc10_wxpng.vcxproj b/build/msw/wx_vc10_wxpng.vcxproj index fcba67d325..17a1f09c40 100644 --- a/build/msw/wx_vc10_wxpng.vcxproj +++ b/build/msw/wx_vc10_wxpng.vcxproj @@ -84,7 +84,7 @@ true true vc_mswud\wxpng\ - ..\..\lib\vc_lib\wxpngd.pdb + $(OutDir)wxpngd.pdb Level3 true ProgramDatabase @@ -95,11 +95,11 @@ ..\..\src\zlib;%(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxpngd.lib + $(OutDir)wxpngd.lib true - ..\..\lib\vc_lib\wx_vc9_wxpng.bsc + $(OutDir)wx_vc9_wxpng.bsc true @@ -117,7 +117,7 @@ MultiThreadedDLL true vc_mswu\wxpng\ - ..\..\lib\vc_lib\wxpng.pdb + $(OutDir)wxpng.pdb Level3 true ProgramDatabase @@ -128,11 +128,11 @@ ..\..\src\zlib;%(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxpng.lib + $(OutDir)wxpng.lib true - ..\..\lib\vc_lib\wx_vc9_wxpng.bsc + $(OutDir)wx_vc9_wxpng.bsc true @@ -152,7 +152,7 @@ true true vc_mswuddll\wxpng\ - ..\..\lib\vc_dll\wxpngd.pdb + $(OutDir)wxpngd.pdb Level3 true ProgramDatabase @@ -163,11 +163,11 @@ ..\..\src\zlib;%(AdditionalIncludeDirectories) - ..\..\lib\vc_dll\wxpngd.lib + $(OutDir)wxpngd.lib true - ..\..\lib\vc_dll\wx_vc9_wxpng.bsc + $(OutDir)wx_vc9_wxpng.bsc true @@ -185,7 +185,7 @@ MultiThreadedDLL true vc_mswudll\wxpng\ - ..\..\lib\vc_dll\wxpng.pdb + $(OutDir)wxpng.pdb Level3 true ProgramDatabase @@ -196,11 +196,11 @@ ..\..\src\zlib;%(AdditionalIncludeDirectories) - ..\..\lib\vc_dll\wxpng.lib + $(OutDir)wxpng.lib true - ..\..\lib\vc_dll\wx_vc9_wxpng.bsc + $(OutDir)wx_vc9_wxpng.bsc true diff --git a/build/msw/wx_vc10_wxregex.vcxproj b/build/msw/wx_vc10_wxregex.vcxproj index f154c91bcc..5909a6b3fa 100644 --- a/build/msw/wx_vc10_wxregex.vcxproj +++ b/build/msw/wx_vc10_wxregex.vcxproj @@ -77,12 +77,12 @@ WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\include;..\..\lib\vc_lib\mswud;%(AdditionalIncludeDirectories) + ..\..\include;$(OutDir)mswud;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - ..\..\include;..\..\lib\vc_lib\mswud;%(AdditionalIncludeDirectories) + ..\..\include;$(OutDir)mswud;%(AdditionalIncludeDirectories) WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -90,7 +90,7 @@ true true vc_mswud\wxregex\ - ..\..\lib\vc_lib\wxregexud.pdb + $(OutDir)wxregexud.pdb Level3 true ProgramDatabase @@ -98,32 +98,32 @@ _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) 0x0409 - ..\..\include;..\..\lib\vc_lib\mswud;%(AdditionalIncludeDirectories) + ..\..\include;$(OutDir)mswud;%(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxregexud.lib + $(OutDir)wxregexud.lib true - ..\..\lib\vc_lib\wx_vc9_wxregex.bsc + $(OutDir)wx_vc9_wxregex.bsc true WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\include;..\..\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) + ..\..\include;$(OutDir)mswu;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MaxSpeed - ..\..\include;..\..\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) + ..\..\include;$(OutDir)mswu;%(AdditionalIncludeDirectories) WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) Sync MultiThreadedDLL true vc_mswu\wxregex\ - ..\..\lib\vc_lib\wxregexu.pdb + $(OutDir)wxregexu.pdb Level3 true ProgramDatabase @@ -131,26 +131,26 @@ _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) 0x0409 - ..\..\include;..\..\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) + ..\..\include;$(OutDir)mswu;%(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxregexu.lib + $(OutDir)wxregexu.lib true - ..\..\lib\vc_lib\wx_vc9_wxregex.bsc + $(OutDir)wx_vc9_wxregex.bsc true WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\include;..\..\lib\vc_dll\mswud;%(AdditionalIncludeDirectories) + ..\..\include;$(OutDir)mswud;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - ..\..\include;..\..\lib\vc_dll\mswud;%(AdditionalIncludeDirectories) + ..\..\include;$(OutDir)mswud;%(AdditionalIncludeDirectories) WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -158,7 +158,7 @@ true true vc_mswuddll\wxregex\ - ..\..\lib\vc_dll\wxregexud.pdb + $(OutDir)wxregexud.pdb Level3 true ProgramDatabase @@ -166,32 +166,32 @@ _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) 0x0409 - ..\..\include;..\..\lib\vc_dll\mswud;%(AdditionalIncludeDirectories) + ..\..\include;$(OutDir)mswud;%(AdditionalIncludeDirectories) - ..\..\lib\vc_dll\wxregexud.lib + $(OutDir)wxregexud.lib true - ..\..\lib\vc_dll\wx_vc9_wxregex.bsc + $(OutDir)wx_vc9_wxregex.bsc true WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\include;..\..\lib\vc_dll\mswu;%(AdditionalIncludeDirectories) + ..\..\include;$(OutDir)mswu;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MaxSpeed - ..\..\include;..\..\lib\vc_dll\mswu;%(AdditionalIncludeDirectories) + ..\..\include;$(OutDir)mswu;%(AdditionalIncludeDirectories) WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) Sync MultiThreadedDLL true vc_mswudll\wxregex\ - ..\..\lib\vc_dll\wxregexu.pdb + $(OutDir)wxregexu.pdb Level3 true ProgramDatabase @@ -199,14 +199,14 @@ _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) 0x0409 - ..\..\include;..\..\lib\vc_dll\mswu;%(AdditionalIncludeDirectories) + ..\..\include;$(OutDir)mswu;%(AdditionalIncludeDirectories) - ..\..\lib\vc_dll\wxregexu.lib + $(OutDir)wxregexu.lib true - ..\..\lib\vc_dll\wx_vc9_wxregex.bsc + $(OutDir)wx_vc9_wxregex.bsc true @@ -218,36 +218,36 @@ - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswu\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswud\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswu\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswud\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswu\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswud\wx\setup.h - ..\..\lib\vc_dll\mswud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswu\wx\setup.h - ..\..\lib\vc_dll\mswu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswud\wx\setup.h - ..\..\lib\vc_lib\mswud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswu\wx\setup.h - ..\..\lib\vc_lib\mswu\wx\setup.h;%(Outputs) + Creating $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + $(OutDir)mswud\wx\setup.h;%(Outputs) + Creating $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + $(OutDir)mswu\wx\setup.h;%(Outputs) + Creating $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + $(OutDir)mswud\wx\setup.h;%(Outputs) + Creating $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + $(OutDir)mswu\wx\setup.h;%(Outputs) diff --git a/build/msw/wx_vc10_wxscintilla.vcxproj b/build/msw/wx_vc10_wxscintilla.vcxproj index 6d0c7bc17a..d84e2c22e1 100644 --- a/build/msw/wx_vc10_wxscintilla.vcxproj +++ b/build/msw/wx_vc10_wxscintilla.vcxproj @@ -75,12 +75,12 @@ WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswud;..\..\include;%(AdditionalIncludeDirectories) + ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswud;..\..\include;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswud;..\..\include;%(AdditionalIncludeDirectories) + ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswud;..\..\include;%(AdditionalIncludeDirectories) WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -88,7 +88,7 @@ true true vc_mswud\wxscintilla\ - ..\..\lib\vc_lib\wxscintillad.pdb + $(OutDir)wxscintillad.pdb Level3 true ProgramDatabase @@ -96,32 +96,32 @@ _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) 0x0409 - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswud;..\..\include;%(AdditionalIncludeDirectories) + ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswud;..\..\include;%(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxscintillad.lib + $(OutDir)wxscintillad.lib true - ..\..\lib\vc_lib\wx_vc9_wxscintilla.bsc + $(OutDir)wx_vc9_wxscintilla.bsc true WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswu;..\..\include;%(AdditionalIncludeDirectories) + ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswu;..\..\include;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MaxSpeed - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswu;..\..\include;%(AdditionalIncludeDirectories) + ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswu;..\..\include;%(AdditionalIncludeDirectories) WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) Sync MultiThreadedDLL true vc_mswu\wxscintilla\ - ..\..\lib\vc_lib\wxscintilla.pdb + $(OutDir)wxscintilla.pdb Level3 true ProgramDatabase @@ -129,26 +129,26 @@ _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) 0x0409 - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswu;..\..\include;%(AdditionalIncludeDirectories) + ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswu;..\..\include;%(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxscintilla.lib + $(OutDir)wxscintilla.lib true - ..\..\lib\vc_lib\wx_vc9_wxscintilla.bsc + $(OutDir)wx_vc9_wxscintilla.bsc true WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswud;..\..\include;%(AdditionalIncludeDirectories) + ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswud;..\..\include;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswud;..\..\include;%(AdditionalIncludeDirectories) + ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswud;..\..\include;%(AdditionalIncludeDirectories) WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -156,7 +156,7 @@ true true vc_mswuddll\wxscintilla\ - ..\..\lib\vc_dll\wxscintillad.pdb + $(OutDir)wxscintillad.pdb Level3 true ProgramDatabase @@ -164,32 +164,32 @@ _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) 0x0409 - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswud;..\..\include;%(AdditionalIncludeDirectories) + ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswud;..\..\include;%(AdditionalIncludeDirectories) - ..\..\lib\vc_dll\wxscintillad.lib + $(OutDir)wxscintillad.lib true - ..\..\lib\vc_dll\wx_vc9_wxscintilla.bsc + $(OutDir)wx_vc9_wxscintilla.bsc true WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswu;..\..\include;%(AdditionalIncludeDirectories) + ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswu;..\..\include;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MaxSpeed - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswu;..\..\include;%(AdditionalIncludeDirectories) + ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswu;..\..\include;%(AdditionalIncludeDirectories) WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) Sync MultiThreadedDLL true vc_mswudll\wxscintilla\ - ..\..\lib\vc_dll\wxscintilla.pdb + $(OutDir)wxscintilla.pdb Level3 true ProgramDatabase @@ -197,14 +197,14 @@ _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) 0x0409 - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswu;..\..\include;%(AdditionalIncludeDirectories) + ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswu;..\..\include;%(AdditionalIncludeDirectories) - ..\..\lib\vc_dll\wxscintilla.lib + $(OutDir)wxscintilla.lib true - ..\..\lib\vc_dll\wx_vc9_wxscintilla.bsc + $(OutDir)wx_vc9_wxscintilla.bsc true @@ -331,36 +331,36 @@ - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswu\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswud\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswu\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswud\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswu\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswud\wx\setup.h - ..\..\lib\vc_dll\mswud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswu\wx\setup.h - ..\..\lib\vc_dll\mswu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswud\wx\setup.h - ..\..\lib\vc_lib\mswud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswu\wx\setup.h - ..\..\lib\vc_lib\mswu\wx\setup.h;%(Outputs) + Creating $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + $(OutDir)mswud\wx\setup.h;%(Outputs) + Creating $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + $(OutDir)mswu\wx\setup.h;%(Outputs) + Creating $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + $(OutDir)mswud\wx\setup.h;%(Outputs) + Creating $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + $(OutDir)mswu\wx\setup.h;%(Outputs) diff --git a/build/msw/wx_vc10_wxtiff.vcxproj b/build/msw/wx_vc10_wxtiff.vcxproj index ba42849fa9..888fbd5f5e 100644 --- a/build/msw/wx_vc10_wxtiff.vcxproj +++ b/build/msw/wx_vc10_wxtiff.vcxproj @@ -84,7 +84,7 @@ true true vc_mswud\wxtiff\ - ..\..\lib\vc_lib\wxtiffd.pdb + $(OutDir)wxtiffd.pdb Level3 true ProgramDatabase @@ -95,11 +95,11 @@ ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxtiffd.lib + $(OutDir)wxtiffd.lib true - ..\..\lib\vc_lib\wx_vc9_wxtiff.bsc + $(OutDir)wx_vc9_wxtiff.bsc true @@ -117,7 +117,7 @@ MultiThreadedDLL true vc_mswu\wxtiff\ - ..\..\lib\vc_lib\wxtiff.pdb + $(OutDir)wxtiff.pdb Level3 true ProgramDatabase @@ -128,11 +128,11 @@ ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxtiff.lib + $(OutDir)wxtiff.lib true - ..\..\lib\vc_lib\wx_vc9_wxtiff.bsc + $(OutDir)wx_vc9_wxtiff.bsc true @@ -152,7 +152,7 @@ true true vc_mswuddll\wxtiff\ - ..\..\lib\vc_dll\wxtiffd.pdb + $(OutDir)wxtiffd.pdb Level3 true ProgramDatabase @@ -163,11 +163,11 @@ ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - ..\..\lib\vc_dll\wxtiffd.lib + $(OutDir)wxtiffd.lib true - ..\..\lib\vc_dll\wx_vc9_wxtiff.bsc + $(OutDir)wx_vc9_wxtiff.bsc true @@ -185,7 +185,7 @@ MultiThreadedDLL true vc_mswudll\wxtiff\ - ..\..\lib\vc_dll\wxtiff.pdb + $(OutDir)wxtiff.pdb Level3 true ProgramDatabase @@ -196,11 +196,11 @@ ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - ..\..\lib\vc_dll\wxtiff.lib + $(OutDir)wxtiff.lib true - ..\..\lib\vc_dll\wx_vc9_wxtiff.bsc + $(OutDir)wx_vc9_wxtiff.bsc true diff --git a/build/msw/wx_vc10_wxzlib.vcxproj b/build/msw/wx_vc10_wxzlib.vcxproj index 661f77e8a2..ee9d9aa80f 100644 --- a/build/msw/wx_vc10_wxzlib.vcxproj +++ b/build/msw/wx_vc10_wxzlib.vcxproj @@ -84,7 +84,7 @@ true true vc_mswud\wxzlib\ - ..\..\lib\vc_lib\wxzlibd.pdb + $(OutDir)wxzlibd.pdb Level3 true ProgramDatabase @@ -95,11 +95,11 @@ %(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxzlibd.lib + $(OutDir)wxzlibd.lib true - ..\..\lib\vc_lib\wx_vc9_wxzlib.bsc + $(OutDir)wx_vc9_wxzlib.bsc true @@ -117,7 +117,7 @@ MultiThreadedDLL true vc_mswu\wxzlib\ - ..\..\lib\vc_lib\wxzlib.pdb + $(OutDir)wxzlib.pdb Level3 true ProgramDatabase @@ -128,11 +128,11 @@ %(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxzlib.lib + $(OutDir)wxzlib.lib true - ..\..\lib\vc_lib\wx_vc9_wxzlib.bsc + $(OutDir)wx_vc9_wxzlib.bsc true @@ -152,7 +152,7 @@ true true vc_mswuddll\wxzlib\ - ..\..\lib\vc_dll\wxzlibd.pdb + $(OutDir)wxzlibd.pdb Level3 true ProgramDatabase @@ -163,11 +163,11 @@ %(AdditionalIncludeDirectories) - ..\..\lib\vc_dll\wxzlibd.lib + $(OutDir)wxzlibd.lib true - ..\..\lib\vc_dll\wx_vc9_wxzlib.bsc + $(OutDir)wx_vc9_wxzlib.bsc true @@ -185,7 +185,7 @@ MultiThreadedDLL true vc_mswudll\wxzlib\ - ..\..\lib\vc_dll\wxzlib.pdb + $(OutDir)wxzlib.pdb Level3 true ProgramDatabase @@ -196,11 +196,11 @@ %(AdditionalIncludeDirectories) - ..\..\lib\vc_dll\wxzlib.lib + $(OutDir)wxzlib.lib true - ..\..\lib\vc_dll\wx_vc9_wxzlib.bsc + $(OutDir)wx_vc9_wxzlib.bsc true diff --git a/build/msw/wx_vc10_xml.vcxproj b/build/msw/wx_vc10_xml.vcxproj index ca58e784f3..3f3908c647 100644 --- a/build/msw/wx_vc10_xml.vcxproj +++ b/build/msw/wx_vc10_xml.vcxproj @@ -80,12 +80,12 @@ WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -96,7 +96,7 @@ wx/wxprec.h vc_mswud\wxprec_xmllib.pch vc_mswud\xml\ - ..\..\lib\vc_lib\wxbase29ud_xml.pdb + $(OutDir)wxbase29ud_xml.pdb Level4 true ProgramDatabase @@ -104,26 +104,26 @@ _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxbase29ud_xml.lib + $(OutDir)wxbase29ud_xml.lib true - ..\..\lib\vc_lib\wx_vc9_xml.bsc + $(OutDir)wx_vc9_xml.bsc true WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MaxSpeed - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) Sync MultiThreadedDLL @@ -132,7 +132,7 @@ wx/wxprec.h vc_mswu\wxprec_xmllib.pch vc_mswu\xml\ - ..\..\lib\vc_lib\wxbase29u_xml.pdb + $(OutDir)wxbase29u_xml.pdb Level4 true ProgramDatabase @@ -140,26 +140,26 @@ _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxbase29u_xml.lib + $(OutDir)wxbase29u_xml.lib true - ..\..\lib\vc_lib\wx_vc9_xml.bsc + $(OutDir)wx_vc9_xml.bsc true WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -170,7 +170,7 @@ wx/wxprec.h vc_mswuddll\wxprec_xmldll.pch vc_mswuddll\xml\ - ..\..\lib\vc_dll\wxbase295ud_xml_vc_custom.pdb + $(OutDir)wxbase295ud_xml_vc_custom.pdb Level4 true ProgramDatabase @@ -178,33 +178,33 @@ _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase295ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - 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;wininet.lib;..\..\lib\vc_dll\wxbase29ud.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxbase295ud_xml_vc_custom.dll - ..\..\lib\vc_dll\wxbase29ud_xml.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;wininet.lib;$(OutDir)wxbase29ud.lib;%(AdditionalDependencies) + $(OutDir)wxbase295ud_xml_vc_custom.dll + $(OutDir)wxbase29ud_xml.lib true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) + $(OutDir);%(AdditionalLibraryDirectories) true - ..\..\lib\vc_dll\wxbase295ud_xml_vc_custom.pdb + $(OutDir)wxbase295ud_xml_vc_custom.pdb MachineX86 - ..\..\lib\vc_dll\wx_vc9_xml.bsc + $(OutDir)wx_vc9_xml.bsc true WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MaxSpeed - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) Sync MultiThreadedDLL @@ -213,7 +213,7 @@ wx/wxprec.h vc_mswudll\wxprec_xmldll.pch vc_mswudll\xml\ - ..\..\lib\vc_dll\wxbase295u_xml_vc_custom.pdb + $(OutDir)wxbase295u_xml_vc_custom.pdb Level4 true ProgramDatabase @@ -221,23 +221,23 @@ _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase295u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - 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;wininet.lib;..\..\lib\vc_dll\wxbase29u.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxbase295u_xml_vc_custom.dll - ..\..\lib\vc_dll\wxbase29u_xml.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;wininet.lib;$(OutDir)wxbase29u.lib;%(AdditionalDependencies) + $(OutDir)wxbase295u_xml_vc_custom.dll + $(OutDir)wxbase29u_xml.lib true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) + $(OutDir);%(AdditionalLibraryDirectories) true - ..\..\lib\vc_dll\wxbase295u_xml_vc_custom.pdb + $(OutDir)wxbase295u_xml_vc_custom.pdb MachineX86 true true - ..\..\lib\vc_dll\wx_vc9_xml.bsc + $(OutDir)wx_vc9_xml.bsc true @@ -259,36 +259,36 @@ - Creating ..\..\lib\vc_dll\mswud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswud\wx\setup.h - ..\..\lib\vc_dll\mswud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswu\wx\setup.h - ..\..\lib\vc_dll\mswu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswud\wx\setup.h - ..\..\lib\vc_lib\mswud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswu\wx\setup.h - ..\..\lib\vc_lib\mswu\wx\setup.h;%(Outputs) + Creating $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + $(OutDir)mswud\wx\setup.h;%(Outputs) + Creating $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + $(OutDir)mswu\wx\setup.h;%(Outputs) + Creating $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + $(OutDir)mswud\wx\setup.h;%(Outputs) + Creating $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + $(OutDir)mswu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswu\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswud\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswu\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswud\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswu\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) diff --git a/build/msw/wx_vc10_xrc.vcxproj b/build/msw/wx_vc10_xrc.vcxproj index d9cad37958..6a13f8dfd2 100644 --- a/build/msw/wx_vc10_xrc.vcxproj +++ b/build/msw/wx_vc10_xrc.vcxproj @@ -80,12 +80,12 @@ WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -96,7 +96,7 @@ wx/wxprec.h vc_mswud\wxprec_xrclib.pch vc_mswud\xrc\ - ..\..\lib\vc_lib\wxmsw29ud_xrc.pdb + $(OutDir)wxmsw29ud_xrc.pdb Level4 true ProgramDatabase @@ -104,26 +104,26 @@ _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxmsw29ud_xrc.lib + $(OutDir)wxmsw29ud_xrc.lib true - ..\..\lib\vc_lib\wx_vc9_xrc.bsc + $(OutDir)wx_vc9_xrc.bsc true WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MaxSpeed - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) Sync MultiThreadedDLL @@ -132,7 +132,7 @@ wx/wxprec.h vc_mswu\wxprec_xrclib.pch vc_mswu\xrc\ - ..\..\lib\vc_lib\wxmsw29u_xrc.pdb + $(OutDir)wxmsw29u_xrc.pdb Level4 true ProgramDatabase @@ -140,26 +140,26 @@ _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - ..\..\lib\vc_lib\wxmsw29u_xrc.lib + $(OutDir)wxmsw29u_xrc.lib true - ..\..\lib\vc_lib\wx_vc9_xrc.bsc + $(OutDir)wx_vc9_xrc.bsc true WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -170,7 +170,7 @@ wx/wxprec.h vc_mswuddll\wxprec_xrcdll.pch vc_mswuddll\xrc\ - ..\..\lib\vc_dll\wxmsw295ud_xrc_vc_custom.pdb + $(OutDir)wxmsw295ud_xrc_vc_custom.pdb Level4 true ProgramDatabase @@ -178,33 +178,33 @@ _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - 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;wininet.lib;..\..\lib\vc_dll\wxmsw29ud_html.lib;..\..\lib\vc_dll\wxmsw29ud_adv.lib;..\..\lib\vc_dll\wxmsw29ud_core.lib;..\..\lib\vc_dll\wxbase29ud_xml.lib;..\..\lib\vc_dll\wxbase29ud.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmsw295ud_xrc_vc_custom.dll - ..\..\lib\vc_dll\wxmsw29ud_xrc.lib + wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw29ud_html.lib;$(OutDir)wxmsw29ud_adv.lib;$(OutDir)wxmsw29ud_core.lib;$(OutDir)wxbase29ud_xml.lib;$(OutDir)wxbase29ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw295ud_xrc_vc_custom.dll + $(OutDir)wxmsw29ud_xrc.lib true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) + $(OutDir);%(AdditionalLibraryDirectories) true - ..\..\lib\vc_dll\wxmsw295ud_xrc_vc_custom.pdb + $(OutDir)wxmsw295ud_xrc_vc_custom.pdb MachineX86 - ..\..\lib\vc_dll\wx_vc9_xrc.bsc + $(OutDir)wx_vc9_xrc.bsc true WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MaxSpeed - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) Sync MultiThreadedDLL @@ -213,7 +213,7 @@ wx/wxprec.h vc_mswudll\wxprec_xrcdll.pch vc_mswudll\xrc\ - ..\..\lib\vc_dll\wxmsw295u_xrc_vc_custom.pdb + $(OutDir)wxmsw295u_xrc_vc_custom.pdb Level4 true ProgramDatabase @@ -221,23 +221,23 @@ _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) 0x0409 - ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - 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;wininet.lib;..\..\lib\vc_dll\wxmsw29u_html.lib;..\..\lib\vc_dll\wxmsw29u_adv.lib;..\..\lib\vc_dll\wxmsw29u_core.lib;..\..\lib\vc_dll\wxbase29u_xml.lib;..\..\lib\vc_dll\wxbase29u.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmsw295u_xrc_vc_custom.dll - ..\..\lib\vc_dll\wxmsw29u_xrc.lib + wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw29u_html.lib;$(OutDir)wxmsw29u_adv.lib;$(OutDir)wxmsw29u_core.lib;$(OutDir)wxbase29u_xml.lib;$(OutDir)wxbase29u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw295u_xrc_vc_custom.dll + $(OutDir)wxmsw29u_xrc.lib true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) + $(OutDir);%(AdditionalLibraryDirectories) true - ..\..\lib\vc_dll\wxmsw295u_xrc_vc_custom.pdb + $(OutDir)wxmsw295u_xrc_vc_custom.pdb MachineX86 true true - ..\..\lib\vc_dll\wx_vc9_xrc.bsc + $(OutDir)wx_vc9_xrc.bsc true @@ -322,36 +322,36 @@ - Creating ..\..\lib\vc_dll\mswud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswud\wx\setup.h - ..\..\lib\vc_dll\mswud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswu\wx\setup.h - ..\..\lib\vc_dll\mswu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswud\wx\setup.h - ..\..\lib\vc_lib\mswud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswu\wx\setup.h - ..\..\lib\vc_lib\mswu\wx\setup.h;%(Outputs) + Creating $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + $(OutDir)mswud\wx\setup.h;%(Outputs) + Creating $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + $(OutDir)mswu\wx\setup.h;%(Outputs) + Creating $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + $(OutDir)mswud\wx\setup.h;%(Outputs) + Creating $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + $(OutDir)mswu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswu\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswud\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswu\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswud\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) + Creating $(OutDir)mswu\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs)