diff --git a/build/msw/wx_vc10_adv.vcxproj b/build/msw/wx_vc10_adv.vcxproj index a37e946719..76760d4a97 100644 --- a/build/msw/wx_vc10_adv.vcxproj +++ b/build/msw/wx_vc10_adv.vcxproj @@ -5,34 +5,34 @@ Debug Win32 - - Debug - x64 - + + Debug + x64 + DLL Debug Win32 - - DLL Debug - x64 - + + DLL Debug + x64 + DLL Release Win32 - - DLL Release - x64 - + + DLL Release + x64 + Release Win32 - - Release - x64 - + + Release + x64 + adv @@ -44,103 +44,103 @@ false Unicode - - DynamicLibrary - false - Unicode - + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode - - DynamicLibrary - false - Unicode - + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode - - StaticLibrary - false - Unicode - + + StaticLibrary + false + Unicode + StaticLibrary false Unicode - - StaticLibrary - false - Unicode - + + StaticLibrary + false + Unicode + - - - + + + - - - + + + - - - + + + - - - + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\adv\ - vc_x64_mswud\adv\ + vc_x64_mswud\adv\ ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\adv\ - vc_x64_mswu\adv\ + vc_x64_mswu\adv\ ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\adv\ - vc_x64_mswuddll\adv\ + vc_x64_mswuddll\adv\ true - true + true true - true + true ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\adv\ - vc_x64_mswudll\adv\ + vc_x64_mswudll\adv\ false - false + false true - true + true wxmsw30ud_adv - wxmsw30ud_adv + wxmsw30ud_adv wxmsw30u_adv - wxmsw30u_adv + wxmsw30u_adv wxmsw30ud_$(ProjectName)_vc_custom - wxmsw30ud_$(ProjectName)_vc_x64_custom + wxmsw30ud_$(ProjectName)_vc_x64_custom wxmsw30u_$(ProjectName)_vc_custom - wxmsw30u_$(ProjectName)_vc_x64_custom + wxmsw30u_$(ProjectName)_vc_x64_custom @@ -160,43 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_advlib.pch - $(OutDir)wxmsw30ud_adv.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30ud_adv.lib - true - - - $(OutDir)wx_vc9_adv.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(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 - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_advlib.pch + $(OutDir)wxmsw30ud_adv.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30ud_adv.lib + true + + + $(OutDir)wx_vc9_adv.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(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 + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_advlib.pch $(OutDir)wxmsw30ud_adv.pdb Level4 true @@ -232,41 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_advlib.pch - $(OutDir)wxmsw30u_adv.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30u_adv.lib - true - - - $(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) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(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 - true - Use - wx/wxprec.h - vc_mswu\wxprec_advlib.pch + $(OutDir)wxmsw30u_adv.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30u_adv.lib + true + + + $(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) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(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 + true + Use + wx/wxprec.h + vc_mswu\wxprec_advlib.pch $(OutDir)wxmsw30u_adv.pdb Level4 true @@ -330,49 +330,49 @@ 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) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(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 - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_advdll.pch - $(OutDir)wxmsw30ud_adv_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_adv_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - 0x0409 - $(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;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_adv_vc_x64_custom.dll - $(OutDir)wxmsw30ud_adv.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30ud_adv_vc_x64_custom.pdb - - - $(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) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(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 + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_advdll.pch + $(OutDir)wxmsw30ud_adv_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_adv_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) + 0x0409 + $(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;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_adv_vc_x64_custom.dll + $(OutDir)wxmsw30ud_adv.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30ud_adv_vc_x64_custom.pdb + + + $(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) @@ -417,49 +417,49 @@ 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) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(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 - true - Use - wx/wxprec.h - vc_mswudll\wxprec_advdll.pch - $(OutDir)wxmsw30u_adv_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_adv_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - 0x0409 - $(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;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_adv_vc_x64_custom.dll - $(OutDir)wxmsw30u_adv.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30u_adv_vc_x64_custom.pdb - true - true - - - $(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) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(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 + true + Use + wx/wxprec.h + vc_mswudll\wxprec_advdll.pch + $(OutDir)wxmsw30u_adv_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_adv_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) + 0x0409 + $(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;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_adv_vc_x64_custom.dll + $(OutDir)wxmsw30u_adv.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30u_adv_vc_x64_custom.pdb + true + true + + + $(OutDir)wx_vc9_adv.bsc + true + + @@ -467,13 +467,13 @@ Create - Create + Create Create - Create + Create Create - Create + Create Create - Create + Create @@ -524,37 +524,37 @@ true - true + true true - true + true Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) @@ -563,37 +563,37 @@ Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) @@ -655,4 +655,4 @@ - + diff --git a/build/msw/wx_vc10_aui.vcxproj b/build/msw/wx_vc10_aui.vcxproj index 216da26245..642cef4a98 100644 --- a/build/msw/wx_vc10_aui.vcxproj +++ b/build/msw/wx_vc10_aui.vcxproj @@ -5,34 +5,34 @@ Debug Win32 - - Debug - x64 - + + Debug + x64 + DLL Debug Win32 - - DLL Debug - x64 - + + DLL Debug + x64 + DLL Release Win32 - - DLL Release - x64 - + + DLL Release + x64 + Release Win32 - - Release - x64 - + + Release + x64 + aui @@ -44,103 +44,103 @@ false Unicode - - DynamicLibrary - false - Unicode - + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode - - DynamicLibrary - false - Unicode - + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode - - StaticLibrary - false - Unicode - + + StaticLibrary + false + Unicode + StaticLibrary false Unicode - - StaticLibrary - false - Unicode - + + StaticLibrary + false + Unicode + - - - + + + - - - + + + - - - + + + - - - + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\aui\ - vc_x64_mswud\aui\ + vc_x64_mswud\aui\ ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\aui\ - vc_x64_mswu\aui\ + vc_x64_mswu\aui\ ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\aui\ - vc_x64_mswuddll\aui\ + vc_x64_mswuddll\aui\ true - true + true true - true + true ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\aui\ - vc_x64_mswudll\aui\ + vc_x64_mswudll\aui\ false - false + false true - true + true wxmsw30ud_aui - wxmsw30ud_aui + wxmsw30ud_aui wxmsw30u_aui - wxmsw30u_aui + wxmsw30u_aui wxmsw30ud_$(ProjectName)_vc_custom - wxmsw30ud_$(ProjectName)_vc_x64_custom + wxmsw30ud_$(ProjectName)_vc_x64_custom wxmsw30u_$(ProjectName)_vc_custom - wxmsw30u_$(ProjectName)_vc_x64_custom + wxmsw30u_$(ProjectName)_vc_x64_custom @@ -160,43 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_auilib.pch - $(OutDir)wxmsw30ud_aui.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30ud_aui.lib - true - - - $(OutDir)wx_vc9_aui.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(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 - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_auilib.pch + $(OutDir)wxmsw30ud_aui.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30ud_aui.lib + true + + + $(OutDir)wx_vc9_aui.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(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 + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_auilib.pch $(OutDir)wxmsw30ud_aui.pdb Level4 true @@ -232,41 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_auilib.pch - $(OutDir)wxmsw30u_aui.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30u_aui.lib - true - - - $(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) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(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 - true - Use - wx/wxprec.h - vc_mswu\wxprec_auilib.pch + $(OutDir)wxmsw30u_aui.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30u_aui.lib + true + + + $(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) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(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 + true + Use + wx/wxprec.h + vc_mswu\wxprec_auilib.pch $(OutDir)wxmsw30u_aui.pdb Level4 true @@ -330,49 +330,49 @@ 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) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(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 - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_auidll.pch - $(OutDir)wxmsw30ud_aui_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_aui_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - 0x0409 - $(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;$(OutDir)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_aui_vc_x64_custom.dll - $(OutDir)wxmsw30ud_aui.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30ud_aui_vc_x64_custom.pdb - - - $(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) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(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 + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_auidll.pch + $(OutDir)wxmsw30ud_aui_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_aui_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) + 0x0409 + $(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;$(OutDir)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_aui_vc_x64_custom.dll + $(OutDir)wxmsw30ud_aui.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30ud_aui_vc_x64_custom.pdb + + + $(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) @@ -417,59 +417,59 @@ 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) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(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 - true - Use - wx/wxprec.h - vc_mswudll\wxprec_auidll.pch - $(OutDir)wxmsw30u_aui_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_aui_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - 0x0409 - $(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;$(OutDir)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_aui_vc_x64_custom.dll - $(OutDir)wxmsw30u_aui.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30u_aui_vc_x64_custom.pdb - true - true - - - $(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) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(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 + true + Use + wx/wxprec.h + vc_mswudll\wxprec_auidll.pch + $(OutDir)wxmsw30u_aui_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_aui_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) + 0x0409 + $(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;$(OutDir)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_aui_vc_x64_custom.dll + $(OutDir)wxmsw30u_aui.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30u_aui_vc_x64_custom.pdb + true + true + + + $(OutDir)wx_vc9_aui.bsc + true + + Create - Create + Create Create - Create + Create Create - Create + Create Create - Create + Create @@ -478,76 +478,76 @@ - + true - true + true true - true + true Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) @@ -557,9 +557,9 @@ - + - + diff --git a/build/msw/wx_vc10_base.vcxproj b/build/msw/wx_vc10_base.vcxproj index 4e8ef861a2..752dc82712 100644 --- a/build/msw/wx_vc10_base.vcxproj +++ b/build/msw/wx_vc10_base.vcxproj @@ -5,34 +5,34 @@ Debug Win32 - - Debug - x64 - + + Debug + x64 + DLL Debug Win32 - - DLL Debug - x64 - + + DLL Debug + x64 + DLL Release Win32 - - DLL Release - x64 - + + DLL Release + x64 + Release Win32 - - Release - x64 - + + Release + x64 + base @@ -44,103 +44,103 @@ false Unicode - - DynamicLibrary - false - Unicode - + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode - - DynamicLibrary - false - Unicode - + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode - - StaticLibrary - false - Unicode - + + StaticLibrary + false + Unicode + StaticLibrary false Unicode - - StaticLibrary - false - Unicode - + + StaticLibrary + false + Unicode + - - - + + + - - - + + + - - - + + + - - - + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\base\ - vc_x64_mswud\base\ + vc_x64_mswud\base\ ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\base\ - vc_x64_mswu\base\ + vc_x64_mswu\base\ ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\base\ - vc_x64_mswuddll\base\ + vc_x64_mswuddll\base\ true - true + true true - true + true ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\base\ - vc_x64_mswudll\base\ + vc_x64_mswudll\base\ false - false + false true - true + true wxbase30ud - wxbase30ud + wxbase30ud wx$(ProjectName)30ud_vc_custom - wx$(ProjectName)30ud_vc_x64_custom + wx$(ProjectName)30ud_vc_x64_custom wxbase30u - wxbase30u + wxbase30u wx$(ProjectName)30u_vc_custom - wx$(ProjectName)30u_vc_x64_custom + wx$(ProjectName)30u_vc_x64_custom @@ -160,43 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_baselib.pch - $(OutDir)wxbase30ud.pdb - Level4 - true - ProgramDatabase - - - _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 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxbase30ud.lib - true - - - $(OutDir)wx_vc9_base.bsc - true - - - - - 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) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(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 - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_baselib.pch + $(OutDir)wxbase30ud.pdb + Level4 + true + ProgramDatabase + + + _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 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxbase30ud.lib + true + + + $(OutDir)wx_vc9_base.bsc + true + + + + + 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) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(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 + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_baselib.pch $(OutDir)wxbase30ud.pdb Level4 true @@ -232,41 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_baselib.pch - $(OutDir)wxbase30u.pdb - Level4 - true - ProgramDatabase - - - _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 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxbase30u.lib - true - - - $(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) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(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 - true - Use - wx/wxprec.h - vc_mswu\wxprec_baselib.pch + $(OutDir)wxbase30u.pdb + Level4 + true + ProgramDatabase + + + _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 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxbase30u.lib + true + + + $(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) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(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 + true + Use + wx/wxprec.h + vc_mswu\wxprec_baselib.pch $(OutDir)wxbase30u.pdb Level4 true @@ -330,49 +330,49 @@ 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) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(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 - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_basedll.pch - $(OutDir)wxbase30ud_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30ud_vc_x64_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) - 0x0409 - $(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) - $(OutDir)wxbase30ud_vc_x64_custom.dll - $(OutDir)wxbase30ud.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxbase30ud_vc_x64_custom.pdb - - - $(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) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(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 + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_basedll.pch + $(OutDir)wxbase30ud_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30ud_vc_x64_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) + 0x0409 + $(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) + $(OutDir)wxbase30ud_vc_x64_custom.dll + $(OutDir)wxbase30ud.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxbase30ud_vc_x64_custom.pdb + + + $(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) @@ -417,49 +417,49 @@ 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) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(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 - true - Use - wx/wxprec.h - vc_mswudll\wxprec_basedll.pch - $(OutDir)wxbase30u_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30u_vc_x64_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) - 0x0409 - $(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) - $(OutDir)wxbase30u_vc_x64_custom.dll - $(OutDir)wxbase30u.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxbase30u_vc_x64_custom.pdb - true - true - - - $(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) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(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 + true + Use + wx/wxprec.h + vc_mswudll\wxprec_basedll.pch + $(OutDir)wxbase30u_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30u_vc_x64_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) + 0x0409 + $(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) + $(OutDir)wxbase30u_vc_x64_custom.dll + $(OutDir)wxbase30u.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxbase30u_vc_x64_custom.pdb + true + true + + + $(OutDir)wx_vc9_base.bsc + true + + @@ -478,13 +478,13 @@ Create - Create + Create Create - Create + Create Create - Create + Create Create - Create + Create @@ -495,20 +495,20 @@ - - + + - - + + - - + + - - + + @@ -605,37 +605,37 @@ true - true + true true - true + true Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) @@ -648,37 +648,37 @@ Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) @@ -856,4 +856,4 @@ - + diff --git a/build/msw/wx_vc10_core.vcxproj b/build/msw/wx_vc10_core.vcxproj index ae336c3690..294d801af4 100644 --- a/build/msw/wx_vc10_core.vcxproj +++ b/build/msw/wx_vc10_core.vcxproj @@ -5,34 +5,34 @@ Debug Win32 - - Debug - x64 - + + Debug + x64 + DLL Debug Win32 - - DLL Debug - x64 - + + DLL Debug + x64 + DLL Release Win32 - - DLL Release - x64 - + + DLL Release + x64 + Release Win32 - - Release - x64 - + + Release + x64 + core @@ -44,103 +44,103 @@ false Unicode - - DynamicLibrary - false - Unicode - + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode - - DynamicLibrary - false - Unicode - + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode - - StaticLibrary - false - Unicode - + + StaticLibrary + false + Unicode + StaticLibrary false Unicode - - StaticLibrary - false - Unicode - + + StaticLibrary + false + Unicode + - - - + + + - - - + + + - - - + + + - - - + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\core\ - vc_x64_mswud\core\ + vc_x64_mswud\core\ ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\core\ - vc_x64_mswu\core\ + vc_x64_mswu\core\ ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\core\ - vc_x64_mswuddll\core\ + vc_x64_mswuddll\core\ true - true + true true - true + true ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\core\ - vc_x64_mswudll\core\ + vc_x64_mswudll\core\ false - false + false true - true + true wxmsw30ud_core - wxmsw30ud_core + wxmsw30ud_core wxmsw30ud_$(ProjectName)_vc_custom - wxmsw30ud_$(ProjectName)_vc_x64_custom + wxmsw30ud_$(ProjectName)_vc_x64_custom wxmsw30u_core - wxmsw30u_core + wxmsw30u_core wxmsw30u_$(ProjectName)_vc_custom - wxmsw30u_$(ProjectName)_vc_x64_custom + wxmsw30u_$(ProjectName)_vc_x64_custom @@ -160,43 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_corelib.pch - $(OutDir)wxmsw30ud_core.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30ud_core.lib - true - - - $(OutDir)wx_vc9_core.bsc - true - - - - - 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) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(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 - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_corelib.pch + $(OutDir)wxmsw30ud_core.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30ud_core.lib + true + + + $(OutDir)wx_vc9_core.bsc + true + + + + + 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) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(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 + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_corelib.pch $(OutDir)wxmsw30ud_core.pdb Level4 true @@ -232,41 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_corelib.pch - $(OutDir)wxmsw30u_core.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30u_core.lib - true - - - $(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) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(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 - true - Use - wx/wxprec.h - vc_mswu\wxprec_corelib.pch + $(OutDir)wxmsw30u_core.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30u_core.lib + true + + + $(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) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(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 + true + Use + wx/wxprec.h + vc_mswu\wxprec_corelib.pch $(OutDir)wxmsw30u_core.pdb Level4 true @@ -330,49 +330,49 @@ 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) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(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 - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_coredll.pch - $(OutDir)wxmsw30ud_core_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_core_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - 0x0409 - $(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;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_core_vc_x64_custom.dll - $(OutDir)wxmsw30ud_core.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30ud_core_vc_x64_custom.pdb - - - $(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) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(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 + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_coredll.pch + $(OutDir)wxmsw30ud_core_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_core_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) + 0x0409 + $(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;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_core_vc_x64_custom.dll + $(OutDir)wxmsw30ud_core.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30ud_core_vc_x64_custom.pdb + + + $(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) @@ -417,49 +417,49 @@ 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) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(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 - true - Use - wx/wxprec.h - vc_mswudll\wxprec_coredll.pch - $(OutDir)wxmsw30u_core_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_core_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - 0x0409 - $(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;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_core_vc_x64_custom.dll - $(OutDir)wxmsw30u_core.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30u_core_vc_x64_custom.pdb - true - true - - - $(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) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(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 + true + Use + wx/wxprec.h + vc_mswudll\wxprec_coredll.pch + $(OutDir)wxmsw30u_core_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_core_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) + 0x0409 + $(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;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_core_vc_x64_custom.dll + $(OutDir)wxmsw30u_core.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30u_core_vc_x64_custom.pdb + true + true + + + $(OutDir)wx_vc9_core.bsc + true + + @@ -502,13 +502,13 @@ Create - Create + Create Create - Create + Create Create - Create + Create Create - Create + Create @@ -605,13 +605,13 @@ vc_mswuddll\core\msw_accel.obj - vc_x64_mswuddll\core\msw_accel.obj + vc_x64_mswuddll\core\msw_accel.obj vc_mswudll\core\msw_accel.obj - vc_x64_mswudll\core\msw_accel.obj + vc_x64_mswudll\core\msw_accel.obj vc_mswud\core\msw_accel.obj - vc_x64_mswud\core\msw_accel.obj + vc_x64_mswud\core\msw_accel.obj vc_mswu\core\msw_accel.obj - vc_x64_mswu\core\msw_accel.obj + vc_x64_mswu\core\msw_accel.obj @@ -622,55 +622,55 @@ vc_mswuddll\core\msw_bmpbuttn.obj - vc_x64_mswuddll\core\msw_bmpbuttn.obj + vc_x64_mswuddll\core\msw_bmpbuttn.obj vc_mswudll\core\msw_bmpbuttn.obj - vc_x64_mswudll\core\msw_bmpbuttn.obj + vc_x64_mswudll\core\msw_bmpbuttn.obj vc_mswud\core\msw_bmpbuttn.obj - vc_x64_mswud\core\msw_bmpbuttn.obj + vc_x64_mswud\core\msw_bmpbuttn.obj vc_mswu\core\msw_bmpbuttn.obj - vc_x64_mswu\core\msw_bmpbuttn.obj + vc_x64_mswu\core\msw_bmpbuttn.obj vc_mswuddll\core\msw_button.obj - vc_x64_mswuddll\core\msw_button.obj + vc_x64_mswuddll\core\msw_button.obj vc_mswudll\core\msw_button.obj - vc_x64_mswudll\core\msw_button.obj + vc_x64_mswudll\core\msw_button.obj vc_mswud\core\msw_button.obj - vc_x64_mswud\core\msw_button.obj + vc_x64_mswud\core\msw_button.obj vc_mswu\core\msw_button.obj - vc_x64_mswu\core\msw_button.obj + vc_x64_mswu\core\msw_button.obj vc_mswuddll\core\msw_checkbox.obj - vc_x64_mswuddll\core\msw_checkbox.obj + vc_x64_mswuddll\core\msw_checkbox.obj vc_mswudll\core\msw_checkbox.obj - vc_x64_mswudll\core\msw_checkbox.obj + vc_x64_mswudll\core\msw_checkbox.obj vc_mswud\core\msw_checkbox.obj - vc_x64_mswud\core\msw_checkbox.obj + vc_x64_mswud\core\msw_checkbox.obj vc_mswu\core\msw_checkbox.obj - vc_x64_mswu\core\msw_checkbox.obj + vc_x64_mswu\core\msw_checkbox.obj vc_mswuddll\core\msw_checklst.obj - vc_x64_mswuddll\core\msw_checklst.obj + vc_x64_mswuddll\core\msw_checklst.obj vc_mswudll\core\msw_checklst.obj - vc_x64_mswudll\core\msw_checklst.obj + vc_x64_mswudll\core\msw_checklst.obj vc_mswud\core\msw_checklst.obj - vc_x64_mswud\core\msw_checklst.obj + vc_x64_mswud\core\msw_checklst.obj vc_mswu\core\msw_checklst.obj - vc_x64_mswu\core\msw_checklst.obj + vc_x64_mswu\core\msw_checklst.obj vc_mswuddll\core\msw_choice.obj - vc_x64_mswuddll\core\msw_choice.obj + vc_x64_mswuddll\core\msw_choice.obj vc_mswudll\core\msw_choice.obj - vc_x64_mswudll\core\msw_choice.obj + vc_x64_mswudll\core\msw_choice.obj vc_mswud\core\msw_choice.obj - vc_x64_mswud\core\msw_choice.obj + vc_x64_mswud\core\msw_choice.obj vc_mswu\core\msw_choice.obj - vc_x64_mswu\core\msw_choice.obj + vc_x64_mswu\core\msw_choice.obj @@ -678,23 +678,23 @@ vc_mswuddll\core\msw_combobox.obj - vc_x64_mswuddll\core\msw_combobox.obj + vc_x64_mswuddll\core\msw_combobox.obj vc_mswudll\core\msw_combobox.obj - vc_x64_mswudll\core\msw_combobox.obj + vc_x64_mswudll\core\msw_combobox.obj vc_mswud\core\msw_combobox.obj - vc_x64_mswud\core\msw_combobox.obj + vc_x64_mswud\core\msw_combobox.obj vc_mswu\core\msw_combobox.obj - vc_x64_mswu\core\msw_combobox.obj + vc_x64_mswu\core\msw_combobox.obj vc_mswuddll\core\msw_control.obj - vc_x64_mswuddll\core\msw_control.obj + vc_x64_mswuddll\core\msw_control.obj vc_mswudll\core\msw_control.obj - vc_x64_mswudll\core\msw_control.obj + vc_x64_mswudll\core\msw_control.obj vc_mswud\core\msw_control.obj - vc_x64_mswud\core\msw_control.obj + vc_x64_mswud\core\msw_control.obj vc_mswu\core\msw_control.obj - vc_x64_mswu\core\msw_control.obj + vc_x64_mswu\core\msw_control.obj @@ -706,13 +706,13 @@ vc_mswuddll\core\msw_dialog.obj - vc_x64_mswuddll\core\msw_dialog.obj + vc_x64_mswuddll\core\msw_dialog.obj vc_mswudll\core\msw_dialog.obj - vc_x64_mswudll\core\msw_dialog.obj + vc_x64_mswudll\core\msw_dialog.obj vc_mswud\core\msw_dialog.obj - vc_x64_mswud\core\msw_dialog.obj + vc_x64_mswud\core\msw_dialog.obj vc_mswu\core\msw_dialog.obj - vc_x64_mswu\core\msw_dialog.obj + vc_x64_mswu\core\msw_dialog.obj @@ -725,13 +725,13 @@ vc_mswuddll\core\msw_fdrepdlg.obj - vc_x64_mswuddll\core\msw_fdrepdlg.obj + vc_x64_mswuddll\core\msw_fdrepdlg.obj vc_mswudll\core\msw_fdrepdlg.obj - vc_x64_mswudll\core\msw_fdrepdlg.obj + vc_x64_mswudll\core\msw_fdrepdlg.obj vc_mswud\core\msw_fdrepdlg.obj - vc_x64_mswud\core\msw_fdrepdlg.obj + vc_x64_mswud\core\msw_fdrepdlg.obj vc_mswu\core\msw_fdrepdlg.obj - vc_x64_mswu\core\msw_fdrepdlg.obj + vc_x64_mswu\core\msw_fdrepdlg.obj @@ -741,13 +741,13 @@ vc_mswuddll\core\msw_gauge.obj - vc_x64_mswuddll\core\msw_gauge.obj + vc_x64_mswuddll\core\msw_gauge.obj vc_mswudll\core\msw_gauge.obj - vc_x64_mswudll\core\msw_gauge.obj + vc_x64_mswudll\core\msw_gauge.obj vc_mswud\core\msw_gauge.obj - vc_x64_mswud\core\msw_gauge.obj + vc_x64_mswud\core\msw_gauge.obj vc_mswu\core\msw_gauge.obj - vc_x64_mswu\core\msw_gauge.obj + vc_x64_mswu\core\msw_gauge.obj @@ -761,35 +761,35 @@ vc_mswuddll\core\msw_listbox.obj - vc_x64_mswuddll\core\msw_listbox.obj + vc_x64_mswuddll\core\msw_listbox.obj vc_mswudll\core\msw_listbox.obj - vc_x64_mswudll\core\msw_listbox.obj + vc_x64_mswudll\core\msw_listbox.obj vc_mswud\core\msw_listbox.obj - vc_x64_mswud\core\msw_listbox.obj + vc_x64_mswud\core\msw_listbox.obj vc_mswu\core\msw_listbox.obj - vc_x64_mswu\core\msw_listbox.obj + vc_x64_mswu\core\msw_listbox.obj vc_mswuddll\core\msw_listctrl.obj - vc_x64_mswuddll\core\msw_listctrl.obj + vc_x64_mswuddll\core\msw_listctrl.obj vc_mswudll\core\msw_listctrl.obj - vc_x64_mswudll\core\msw_listctrl.obj + vc_x64_mswudll\core\msw_listctrl.obj vc_mswud\core\msw_listctrl.obj - vc_x64_mswud\core\msw_listctrl.obj + vc_x64_mswud\core\msw_listctrl.obj vc_mswu\core\msw_listctrl.obj - vc_x64_mswu\core\msw_listctrl.obj + vc_x64_mswu\core\msw_listctrl.obj vc_mswuddll\core\msw_menu.obj - vc_x64_mswuddll\core\msw_menu.obj + vc_x64_mswuddll\core\msw_menu.obj vc_mswudll\core\msw_menu.obj - vc_x64_mswudll\core\msw_menu.obj + vc_x64_mswudll\core\msw_menu.obj vc_mswud\core\msw_menu.obj - vc_x64_mswud\core\msw_menu.obj + vc_x64_mswud\core\msw_menu.obj vc_mswu\core\msw_menu.obj - vc_x64_mswu\core\msw_menu.obj + vc_x64_mswu\core\msw_menu.obj @@ -801,13 +801,13 @@ vc_mswuddll\core\msw_notebook.obj - vc_x64_mswuddll\core\msw_notebook.obj + vc_x64_mswuddll\core\msw_notebook.obj vc_mswudll\core\msw_notebook.obj - vc_x64_mswudll\core\msw_notebook.obj + vc_x64_mswudll\core\msw_notebook.obj vc_mswud\core\msw_notebook.obj - vc_x64_mswud\core\msw_notebook.obj + vc_x64_mswud\core\msw_notebook.obj vc_mswu\core\msw_notebook.obj - vc_x64_mswu\core\msw_notebook.obj + vc_x64_mswu\core\msw_notebook.obj @@ -821,140 +821,140 @@ vc_mswuddll\core\msw_radiobox.obj - vc_x64_mswuddll\core\msw_radiobox.obj + vc_x64_mswuddll\core\msw_radiobox.obj vc_mswudll\core\msw_radiobox.obj - vc_x64_mswudll\core\msw_radiobox.obj + vc_x64_mswudll\core\msw_radiobox.obj vc_mswud\core\msw_radiobox.obj - vc_x64_mswud\core\msw_radiobox.obj + vc_x64_mswud\core\msw_radiobox.obj vc_mswu\core\msw_radiobox.obj - vc_x64_mswu\core\msw_radiobox.obj + vc_x64_mswu\core\msw_radiobox.obj vc_mswuddll\core\msw_radiobut.obj - vc_x64_mswuddll\core\msw_radiobut.obj + vc_x64_mswuddll\core\msw_radiobut.obj vc_mswudll\core\msw_radiobut.obj - vc_x64_mswudll\core\msw_radiobut.obj + vc_x64_mswudll\core\msw_radiobut.obj vc_mswud\core\msw_radiobut.obj - vc_x64_mswud\core\msw_radiobut.obj + vc_x64_mswud\core\msw_radiobut.obj vc_mswu\core\msw_radiobut.obj - vc_x64_mswu\core\msw_radiobut.obj + vc_x64_mswu\core\msw_radiobut.obj vc_mswuddll\core\msw_scrolbar.obj - vc_x64_mswuddll\core\msw_scrolbar.obj + vc_x64_mswuddll\core\msw_scrolbar.obj vc_mswudll\core\msw_scrolbar.obj - vc_x64_mswudll\core\msw_scrolbar.obj + vc_x64_mswudll\core\msw_scrolbar.obj vc_mswud\core\msw_scrolbar.obj - vc_x64_mswud\core\msw_scrolbar.obj + vc_x64_mswud\core\msw_scrolbar.obj vc_mswu\core\msw_scrolbar.obj - vc_x64_mswu\core\msw_scrolbar.obj + vc_x64_mswu\core\msw_scrolbar.obj vc_mswuddll\core\msw_slider.obj - vc_x64_mswuddll\core\msw_slider.obj + vc_x64_mswuddll\core\msw_slider.obj vc_mswudll\core\msw_slider.obj - vc_x64_mswudll\core\msw_slider.obj + vc_x64_mswudll\core\msw_slider.obj vc_mswud\core\msw_slider.obj - vc_x64_mswud\core\msw_slider.obj + vc_x64_mswud\core\msw_slider.obj vc_mswu\core\msw_slider.obj - vc_x64_mswu\core\msw_slider.obj + vc_x64_mswu\core\msw_slider.obj vc_mswuddll\core\msw_spinbutt.obj - vc_x64_mswuddll\core\msw_spinbutt.obj + vc_x64_mswuddll\core\msw_spinbutt.obj vc_mswudll\core\msw_spinbutt.obj - vc_x64_mswudll\core\msw_spinbutt.obj + vc_x64_mswudll\core\msw_spinbutt.obj vc_mswud\core\msw_spinbutt.obj - vc_x64_mswud\core\msw_spinbutt.obj + vc_x64_mswud\core\msw_spinbutt.obj vc_mswu\core\msw_spinbutt.obj - vc_x64_mswu\core\msw_spinbutt.obj + vc_x64_mswu\core\msw_spinbutt.obj vc_mswuddll\core\msw_statbmp.obj - vc_x64_mswuddll\core\msw_statbmp.obj + vc_x64_mswuddll\core\msw_statbmp.obj vc_mswudll\core\msw_statbmp.obj - vc_x64_mswudll\core\msw_statbmp.obj + vc_x64_mswudll\core\msw_statbmp.obj vc_mswud\core\msw_statbmp.obj - vc_x64_mswud\core\msw_statbmp.obj + vc_x64_mswud\core\msw_statbmp.obj vc_mswu\core\msw_statbmp.obj - vc_x64_mswu\core\msw_statbmp.obj + vc_x64_mswu\core\msw_statbmp.obj vc_mswuddll\core\msw_statbox.obj - vc_x64_mswuddll\core\msw_statbox.obj + vc_x64_mswuddll\core\msw_statbox.obj vc_mswudll\core\msw_statbox.obj - vc_x64_mswudll\core\msw_statbox.obj + vc_x64_mswudll\core\msw_statbox.obj vc_mswud\core\msw_statbox.obj - vc_x64_mswud\core\msw_statbox.obj + vc_x64_mswud\core\msw_statbox.obj vc_mswu\core\msw_statbox.obj - vc_x64_mswu\core\msw_statbox.obj + vc_x64_mswu\core\msw_statbox.obj vc_mswuddll\core\msw_statline.obj - vc_x64_mswuddll\core\msw_statline.obj + vc_x64_mswuddll\core\msw_statline.obj vc_mswudll\core\msw_statline.obj - vc_x64_mswudll\core\msw_statline.obj + vc_x64_mswudll\core\msw_statline.obj vc_mswud\core\msw_statline.obj - vc_x64_mswud\core\msw_statline.obj + vc_x64_mswud\core\msw_statline.obj vc_mswu\core\msw_statline.obj - vc_x64_mswu\core\msw_statline.obj + vc_x64_mswu\core\msw_statline.obj vc_mswuddll\core\msw_stattext.obj - vc_x64_mswuddll\core\msw_stattext.obj + vc_x64_mswuddll\core\msw_stattext.obj vc_mswudll\core\msw_stattext.obj - vc_x64_mswudll\core\msw_stattext.obj + vc_x64_mswudll\core\msw_stattext.obj vc_mswud\core\msw_stattext.obj - vc_x64_mswud\core\msw_stattext.obj + vc_x64_mswud\core\msw_stattext.obj vc_mswu\core\msw_stattext.obj - vc_x64_mswu\core\msw_stattext.obj + vc_x64_mswu\core\msw_stattext.obj vc_mswuddll\core\msw_textctrl.obj - vc_x64_mswuddll\core\msw_textctrl.obj + vc_x64_mswuddll\core\msw_textctrl.obj vc_mswudll\core\msw_textctrl.obj - vc_x64_mswudll\core\msw_textctrl.obj + vc_x64_mswudll\core\msw_textctrl.obj vc_mswud\core\msw_textctrl.obj - vc_x64_mswud\core\msw_textctrl.obj + vc_x64_mswud\core\msw_textctrl.obj vc_mswu\core\msw_textctrl.obj - vc_x64_mswu\core\msw_textctrl.obj + vc_x64_mswu\core\msw_textctrl.obj vc_mswuddll\core\msw_textmeasure.obj - vc_x64_mswuddll\core\msw_textmeasure.obj + vc_x64_mswuddll\core\msw_textmeasure.obj vc_mswudll\core\msw_textmeasure.obj - vc_x64_mswudll\core\msw_textmeasure.obj + vc_x64_mswudll\core\msw_textmeasure.obj vc_mswud\core\msw_textmeasure.obj - vc_x64_mswud\core\msw_textmeasure.obj + vc_x64_mswud\core\msw_textmeasure.obj vc_mswu\core\msw_textmeasure.obj - vc_x64_mswu\core\msw_textmeasure.obj + vc_x64_mswu\core\msw_textmeasure.obj vc_mswuddll\core\msw_tglbtn.obj - vc_x64_mswuddll\core\msw_tglbtn.obj + vc_x64_mswuddll\core\msw_tglbtn.obj vc_mswudll\core\msw_tglbtn.obj - vc_x64_mswudll\core\msw_tglbtn.obj + vc_x64_mswudll\core\msw_tglbtn.obj vc_mswud\core\msw_tglbtn.obj - vc_x64_mswud\core\msw_tglbtn.obj + vc_x64_mswud\core\msw_tglbtn.obj vc_mswu\core\msw_tglbtn.obj - vc_x64_mswu\core\msw_tglbtn.obj + vc_x64_mswu\core\msw_tglbtn.obj vc_mswuddll\core\msw_toolbar.obj - vc_x64_mswuddll\core\msw_toolbar.obj + vc_x64_mswuddll\core\msw_toolbar.obj vc_mswudll\core\msw_toolbar.obj - vc_x64_mswudll\core\msw_toolbar.obj + vc_x64_mswudll\core\msw_toolbar.obj vc_mswud\core\msw_toolbar.obj - vc_x64_mswud\core\msw_toolbar.obj + vc_x64_mswud\core\msw_toolbar.obj vc_mswu\core\msw_toolbar.obj - vc_x64_mswu\core\msw_toolbar.obj + vc_x64_mswu\core\msw_toolbar.obj @@ -968,13 +968,13 @@ true - true + true true - true + true true - true + true true - true + true @@ -984,59 +984,59 @@ true - true + true true - true + true true - true + true true - true + true true - true + true true - true + true true - true + true true - true + true true - true + true true - true + true true - true + true true - true + true true - true + true true - true + true true - true + true true - true + true true - true + true true - true + true true - true + true true - true + true @@ -1045,25 +1045,25 @@ true - true + true true - true + true true - true + true true - true + true true - true + true true - true + true true - true + true true - true + true @@ -1081,13 +1081,13 @@ vc_mswuddll\core\generic_statusbr.obj - vc_x64_mswuddll\core\generic_statusbr.obj + vc_x64_mswuddll\core\generic_statusbr.obj vc_mswudll\core\generic_statusbr.obj - vc_x64_mswudll\core\generic_statusbr.obj + vc_x64_mswudll\core\generic_statusbr.obj vc_mswud\core\generic_statusbr.obj - vc_x64_mswud\core\generic_statusbr.obj + vc_x64_mswud\core\generic_statusbr.obj vc_mswu\core\generic_statusbr.obj - vc_x64_mswu\core\generic_statusbr.obj + vc_x64_mswu\core\generic_statusbr.obj @@ -1101,37 +1101,37 @@ true - true + true true - true + true Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) @@ -1186,37 +1186,37 @@ Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) diff --git a/build/msw/wx_vc10_gl.vcxproj b/build/msw/wx_vc10_gl.vcxproj index b8edeac349..69dcb4a5fa 100644 --- a/build/msw/wx_vc10_gl.vcxproj +++ b/build/msw/wx_vc10_gl.vcxproj @@ -5,34 +5,34 @@ Debug Win32 - - Debug - x64 - + + Debug + x64 + DLL Debug Win32 - - DLL Debug - x64 - + + DLL Debug + x64 + DLL Release Win32 - - DLL Release - x64 - + + DLL Release + x64 + Release Win32 - - Release - x64 - + + Release + x64 + gl @@ -44,103 +44,103 @@ false Unicode - - DynamicLibrary - false - Unicode - + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode - - DynamicLibrary - false - Unicode - + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode - - StaticLibrary - false - Unicode - + + StaticLibrary + false + Unicode + StaticLibrary false Unicode - - StaticLibrary - false - Unicode - + + StaticLibrary + false + Unicode + - - - + + + - - - + + + - - - + + + - - - + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\gl\ - vc_x64_mswud\gl\ + vc_x64_mswud\gl\ ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\gl\ - vc_x64_mswu\gl\ + vc_x64_mswu\gl\ ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\gl\ - vc_x64_mswuddll\gl\ + vc_x64_mswuddll\gl\ true - true + true true - true + true ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\gl\ - vc_x64_mswudll\gl\ + vc_x64_mswudll\gl\ false - false + false true - true + true wxmsw30ud_gl - wxmsw30ud_gl + wxmsw30ud_gl wxmsw30u_gl - wxmsw30u_gl + wxmsw30u_gl wxmsw30ud_$(ProjectName)_vc_custom - wxmsw30ud_$(ProjectName)_vc_x64_custom + wxmsw30ud_$(ProjectName)_vc_x64_custom wxmsw30u_$(ProjectName)_vc_custom - wxmsw30u_$(ProjectName)_vc_x64_custom + wxmsw30u_$(ProjectName)_vc_x64_custom @@ -160,43 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_gllib.pch - $(OutDir)wxmsw30ud_gl.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30ud_gl.lib - true - - - $(OutDir)wx_vc9_gl.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(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 - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_gllib.pch + $(OutDir)wxmsw30ud_gl.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30ud_gl.lib + true + + + $(OutDir)wx_vc9_gl.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(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 + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_gllib.pch $(OutDir)wxmsw30ud_gl.pdb Level4 true @@ -232,41 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_gllib.pch - $(OutDir)wxmsw30u_gl.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30u_gl.lib - true - - - $(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) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(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 - true - Use - wx/wxprec.h - vc_mswu\wxprec_gllib.pch + $(OutDir)wxmsw30u_gl.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30u_gl.lib + true + + + $(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) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(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 + true + Use + wx/wxprec.h + vc_mswu\wxprec_gllib.pch $(OutDir)wxmsw30u_gl.pdb Level4 true @@ -330,49 +330,49 @@ 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) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(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 - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_gldll.pch - $(OutDir)wxmsw30ud_gl_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_gl_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - 0x0409 - $(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;wxmsw30ud_core.lib;wxbase30ud.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_gl_vc_x64_custom.dll - $(OutDir)wxmsw30ud_gl.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30ud_gl_vc_x64_custom.pdb - - - $(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) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(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 + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_gldll.pch + $(OutDir)wxmsw30ud_gl_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_gl_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) + 0x0409 + $(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;wxmsw30ud_core.lib;wxbase30ud.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_gl_vc_x64_custom.dll + $(OutDir)wxmsw30ud_gl.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30ud_gl_vc_x64_custom.pdb + + + $(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) @@ -417,59 +417,59 @@ 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) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(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 - true - Use - wx/wxprec.h - vc_mswudll\wxprec_gldll.pch - $(OutDir)wxmsw30u_gl_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_gl_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - 0x0409 - $(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;wxmsw30u_core.lib;wxbase30u.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_gl_vc_x64_custom.dll - $(OutDir)wxmsw30u_gl.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30u_gl_vc_x64_custom.pdb - true - true - - - $(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) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(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 + true + Use + wx/wxprec.h + vc_mswudll\wxprec_gldll.pch + $(OutDir)wxmsw30u_gl_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_gl_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) + 0x0409 + $(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;wxmsw30u_core.lib;wxbase30u.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_gl_vc_x64_custom.dll + $(OutDir)wxmsw30u_gl.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30u_gl_vc_x64_custom.pdb + true + true + + + $(OutDir)wx_vc9_gl.bsc + true + + Create - Create + Create Create - Create + Create Create - Create + Create Create - Create + Create @@ -477,71 +477,71 @@ true - true + true true - true + true Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) @@ -549,4 +549,4 @@ - + diff --git a/build/msw/wx_vc10_html.vcxproj b/build/msw/wx_vc10_html.vcxproj index 4b0debdf7a..df99bdbaf6 100644 --- a/build/msw/wx_vc10_html.vcxproj +++ b/build/msw/wx_vc10_html.vcxproj @@ -5,34 +5,34 @@ Debug Win32 - - Debug - x64 - + + Debug + x64 + DLL Debug Win32 - - DLL Debug - x64 - + + DLL Debug + x64 + DLL Release Win32 - - DLL Release - x64 - + + DLL Release + x64 + Release Win32 - - Release - x64 - + + Release + x64 + html @@ -44,103 +44,103 @@ false Unicode - - DynamicLibrary - false - Unicode - + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode - - DynamicLibrary - false - Unicode - + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode - - StaticLibrary - false - Unicode - + + StaticLibrary + false + Unicode + StaticLibrary false Unicode - - StaticLibrary - false - Unicode - + + StaticLibrary + false + Unicode + - - - + + + - - - + + + - - - + + + - - - + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\html\ - vc_x64_mswud\html\ + vc_x64_mswud\html\ ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\html\ - vc_x64_mswu\html\ + vc_x64_mswu\html\ ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\html\ - vc_x64_mswuddll\html\ + vc_x64_mswuddll\html\ true - true + true true - true + true ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\html\ - vc_x64_mswudll\html\ + vc_x64_mswudll\html\ false - false + false true - true + true wxmsw30ud_html - wxmsw30ud_html + wxmsw30ud_html wxmsw30u_html - wxmsw30u_html + wxmsw30u_html wxmsw30ud_$(ProjectName)_vc_custom - wxmsw30ud_$(ProjectName)_vc_x64_custom + wxmsw30ud_$(ProjectName)_vc_x64_custom wxmsw30u_$(ProjectName)_vc_custom - wxmsw30u_$(ProjectName)_vc_x64_custom + wxmsw30u_$(ProjectName)_vc_x64_custom @@ -160,43 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_htmllib.pch - $(OutDir)wxmsw30ud_html.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30ud_html.lib - true - - - $(OutDir)wx_vc9_html.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(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 - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_htmllib.pch + $(OutDir)wxmsw30ud_html.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30ud_html.lib + true + + + $(OutDir)wx_vc9_html.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(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 + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_htmllib.pch $(OutDir)wxmsw30ud_html.pdb Level4 true @@ -232,41 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_htmllib.pch - $(OutDir)wxmsw30u_html.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30u_html.lib - true - - - $(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) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(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 - true - Use - wx/wxprec.h - vc_mswu\wxprec_htmllib.pch + $(OutDir)wxmsw30u_html.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30u_html.lib + true + + + $(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) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(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 + true + Use + wx/wxprec.h + vc_mswu\wxprec_htmllib.pch $(OutDir)wxmsw30u_html.pdb Level4 true @@ -330,49 +330,49 @@ 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) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(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 - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_htmldll.pch - $(OutDir)wxmsw30ud_html_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_html_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - 0x0409 - $(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;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_html_vc_x64_custom.dll - $(OutDir)wxmsw30ud_html.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30ud_html_vc_x64_custom.pdb - - - $(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) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(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 + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_htmldll.pch + $(OutDir)wxmsw30ud_html_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_html_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) + 0x0409 + $(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;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_html_vc_x64_custom.dll + $(OutDir)wxmsw30ud_html.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30ud_html_vc_x64_custom.pdb + + + $(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) @@ -417,59 +417,59 @@ 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) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(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 - true - Use - wx/wxprec.h - vc_mswudll\wxprec_htmldll.pch - $(OutDir)wxmsw30u_html_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_html_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - 0x0409 - $(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;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_html_vc_x64_custom.dll - $(OutDir)wxmsw30u_html.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30u_html_vc_x64_custom.pdb - true - true - - - $(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) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(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 + true + Use + wx/wxprec.h + vc_mswudll\wxprec_htmldll.pch + $(OutDir)wxmsw30u_html_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_html_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) + 0x0409 + $(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;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_html_vc_x64_custom.dll + $(OutDir)wxmsw30u_html.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30u_html_vc_x64_custom.pdb + true + true + + + $(OutDir)wx_vc9_html.bsc + true + + Create - Create + Create Create - Create + Create Create - Create + Create Create - Create + Create @@ -501,71 +501,71 @@ true - true + true true - true + true Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) @@ -590,4 +590,4 @@ - + diff --git a/build/msw/wx_vc10_media.vcxproj b/build/msw/wx_vc10_media.vcxproj index 31052935b7..7463063ccf 100644 --- a/build/msw/wx_vc10_media.vcxproj +++ b/build/msw/wx_vc10_media.vcxproj @@ -5,34 +5,34 @@ Debug Win32 - - Debug - x64 - + + Debug + x64 + DLL Debug Win32 - - DLL Debug - x64 - + + DLL Debug + x64 + DLL Release Win32 - - DLL Release - x64 - + + DLL Release + x64 + Release Win32 - - Release - x64 - + + Release + x64 + media @@ -44,103 +44,103 @@ false Unicode - - DynamicLibrary - false - Unicode - + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode - - DynamicLibrary - false - Unicode - + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode - - StaticLibrary - false - Unicode - + + StaticLibrary + false + Unicode + StaticLibrary false Unicode - - StaticLibrary - false - Unicode - + + StaticLibrary + false + Unicode + - - - + + + - - - + + + - - - + + + - - - + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\media\ - vc_x64_mswud\media\ + vc_x64_mswud\media\ ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\media\ - vc_x64_mswu\media\ + vc_x64_mswu\media\ ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\media\ - vc_x64_mswuddll\media\ + vc_x64_mswuddll\media\ true - true + true true - true + true ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\media\ - vc_x64_mswudll\media\ + vc_x64_mswudll\media\ false - false + false true - true + true wxmsw30ud_media - wxmsw30ud_media + wxmsw30ud_media wxmsw30u_media - wxmsw30u_media + wxmsw30u_media wxmsw30ud_$(ProjectName)_vc_custom - wxmsw30ud_$(ProjectName)_vc_x64_custom + wxmsw30ud_$(ProjectName)_vc_x64_custom wxmsw30u_$(ProjectName)_vc_custom - wxmsw30u_$(ProjectName)_vc_x64_custom + wxmsw30u_$(ProjectName)_vc_x64_custom @@ -160,43 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_medialib.pch - $(OutDir)wxmsw30ud_media.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30ud_media.lib - true - - - $(OutDir)wx_vc9_media.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(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 - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_medialib.pch + $(OutDir)wxmsw30ud_media.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30ud_media.lib + true + + + $(OutDir)wx_vc9_media.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(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 + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_medialib.pch $(OutDir)wxmsw30ud_media.pdb Level4 true @@ -232,41 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_medialib.pch - $(OutDir)wxmsw30u_media.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30u_media.lib - true - - - $(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) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(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 - true - Use - wx/wxprec.h - vc_mswu\wxprec_medialib.pch + $(OutDir)wxmsw30u_media.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30u_media.lib + true + + + $(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) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(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 + true + Use + wx/wxprec.h + vc_mswu\wxprec_medialib.pch $(OutDir)wxmsw30u_media.pdb Level4 true @@ -330,49 +330,49 @@ 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) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(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 - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_mediadll.pch - $(OutDir)wxmsw30ud_media_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_media_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - 0x0409 - $(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;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_media_vc_x64_custom.dll - $(OutDir)wxmsw30ud_media.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30ud_media_vc_x64_custom.pdb - - - $(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) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(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 + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_mediadll.pch + $(OutDir)wxmsw30ud_media_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_media_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) + 0x0409 + $(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;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_media_vc_x64_custom.dll + $(OutDir)wxmsw30ud_media.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30ud_media_vc_x64_custom.pdb + + + $(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) @@ -417,59 +417,59 @@ 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) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(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 - true - Use - wx/wxprec.h - vc_mswudll\wxprec_mediadll.pch - $(OutDir)wxmsw30u_media_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_media_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - 0x0409 - $(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;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_media_vc_x64_custom.dll - $(OutDir)wxmsw30u_media.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30u_media_vc_x64_custom.pdb - true - true - - - $(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) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(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 + true + Use + wx/wxprec.h + vc_mswudll\wxprec_mediadll.pch + $(OutDir)wxmsw30u_media_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_media_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) + 0x0409 + $(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;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_media_vc_x64_custom.dll + $(OutDir)wxmsw30u_media.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30u_media_vc_x64_custom.pdb + true + true + + + $(OutDir)wx_vc9_media.bsc + true + + Create - Create + Create Create - Create + Create Create - Create + Create Create - Create + Create @@ -479,75 +479,75 @@ true - true + true true - true + true Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) - + diff --git a/build/msw/wx_vc10_net.vcxproj b/build/msw/wx_vc10_net.vcxproj index fc1855d07b..5d5162f218 100644 --- a/build/msw/wx_vc10_net.vcxproj +++ b/build/msw/wx_vc10_net.vcxproj @@ -5,34 +5,34 @@ Debug Win32 - - Debug - x64 - + + Debug + x64 + DLL Debug Win32 - - DLL Debug - x64 - + + DLL Debug + x64 + DLL Release Win32 - - DLL Release - x64 - + + DLL Release + x64 + Release Win32 - - Release - x64 - + + Release + x64 + net @@ -44,103 +44,103 @@ false Unicode - - DynamicLibrary - false - Unicode - + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode - - DynamicLibrary - false - Unicode - + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode - - StaticLibrary - false - Unicode - + + StaticLibrary + false + Unicode + StaticLibrary false Unicode - - StaticLibrary - false - Unicode - + + StaticLibrary + false + Unicode + - - - + + + - - - + + + - - - + + + - - - + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\net\ - vc_x64_mswud\net\ + vc_x64_mswud\net\ ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\net\ - vc_x64_mswu\net\ + vc_x64_mswu\net\ ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\net\ - vc_x64_mswuddll\net\ + vc_x64_mswuddll\net\ true - true + true true - true + true ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\net\ - vc_x64_mswudll\net\ + vc_x64_mswudll\net\ false - false + false true - true + true wxbase30ud_net - wxbase30ud_net + wxbase30ud_net wxbase30u_net - wxbase30u_net + wxbase30u_net wxbase30ud_$(ProjectName)_vc_custom - wxbase30ud_$(ProjectName)_vc_x64_custom + wxbase30ud_$(ProjectName)_vc_x64_custom wxbase30u_$(ProjectName)_vc_custom - wxbase30u_$(ProjectName)_vc_x64_custom + wxbase30u_$(ProjectName)_vc_x64_custom @@ -160,43 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_netlib.pch - $(OutDir)wxbase30ud_net.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxbase30ud_net.lib - true - - - $(OutDir)wx_vc9_net.bsc - true - - - - - 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) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(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 - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_netlib.pch + $(OutDir)wxbase30ud_net.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxbase30ud_net.lib + true + + + $(OutDir)wx_vc9_net.bsc + true + + + + + 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) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(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 + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_netlib.pch $(OutDir)wxbase30ud_net.pdb Level4 true @@ -232,41 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_netlib.pch - $(OutDir)wxbase30u_net.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxbase30u_net.lib - true - - - $(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) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(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 - true - Use - wx/wxprec.h - vc_mswu\wxprec_netlib.pch + $(OutDir)wxbase30u_net.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxbase30u_net.lib + true + + + $(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) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(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 + true + Use + wx/wxprec.h + vc_mswu\wxprec_netlib.pch $(OutDir)wxbase30u_net.pdb Level4 true @@ -330,49 +330,49 @@ 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) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(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 - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_netdll.pch - $(OutDir)wxbase30ud_net_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30ud_net_vc_x64_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - 0x0409 - $(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;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxbase30ud_net_vc_x64_custom.dll - $(OutDir)wxbase30ud_net.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxbase30ud_net_vc_x64_custom.pdb - - - $(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) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(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 + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_netdll.pch + $(OutDir)wxbase30ud_net_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30ud_net_vc_x64_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) + 0x0409 + $(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;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxbase30ud_net_vc_x64_custom.dll + $(OutDir)wxbase30ud_net.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxbase30ud_net_vc_x64_custom.pdb + + + $(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) @@ -417,59 +417,59 @@ 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) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(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 - true - Use - wx/wxprec.h - vc_mswudll\wxprec_netdll.pch - $(OutDir)wxbase30u_net_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30u_net_vc_x64_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - 0x0409 - $(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;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxbase30u_net_vc_x64_custom.dll - $(OutDir)wxbase30u_net.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxbase30u_net_vc_x64_custom.pdb - true - true - - - $(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) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(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 + true + Use + wx/wxprec.h + vc_mswudll\wxprec_netdll.pch + $(OutDir)wxbase30u_net_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30u_net_vc_x64_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) + 0x0409 + $(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;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxbase30u_net_vc_x64_custom.dll + $(OutDir)wxbase30u_net.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxbase30u_net_vc_x64_custom.pdb + true + true + + + $(OutDir)wx_vc9_net.bsc + true + + Create - Create + Create Create - Create + Create Create - Create + Create Create - Create + Create @@ -487,71 +487,71 @@ true - true + true true - true + true Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) @@ -568,4 +568,4 @@ - + diff --git a/build/msw/wx_vc10_propgrid.vcxproj b/build/msw/wx_vc10_propgrid.vcxproj index 0a3e476389..83a4c1fd54 100644 --- a/build/msw/wx_vc10_propgrid.vcxproj +++ b/build/msw/wx_vc10_propgrid.vcxproj @@ -5,34 +5,34 @@ Debug Win32 - - Debug - x64 - + + Debug + x64 + DLL Debug Win32 - - DLL Debug - x64 - + + DLL Debug + x64 + DLL Release Win32 - - DLL Release - x64 - + + DLL Release + x64 + Release Win32 - - Release - x64 - + + Release + x64 + propgrid @@ -44,103 +44,103 @@ false Unicode - - DynamicLibrary - false - Unicode - + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode - - DynamicLibrary - false - Unicode - + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode - - StaticLibrary - false - Unicode - + + StaticLibrary + false + Unicode + StaticLibrary false Unicode - - StaticLibrary - false - Unicode - + + StaticLibrary + false + Unicode + - - - + + + - - - + + + - - - + + + - - - + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\propgrid\ - vc_x64_mswud\propgrid\ + vc_x64_mswud\propgrid\ ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\propgrid\ - vc_x64_mswu\propgrid\ + vc_x64_mswu\propgrid\ ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\propgrid\ - vc_x64_mswuddll\propgrid\ + vc_x64_mswuddll\propgrid\ true - true + true true - true + true ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\propgrid\ - vc_x64_mswudll\propgrid\ + vc_x64_mswudll\propgrid\ false - false + false true - true + true wxmsw30ud_propgrid - wxmsw30ud_propgrid + wxmsw30ud_propgrid wxmsw30u_propgrid - wxmsw30u_propgrid + wxmsw30u_propgrid wxmsw30ud_$(ProjectName)_vc_custom - wxmsw30ud_$(ProjectName)_vc_x64_custom + wxmsw30ud_$(ProjectName)_vc_x64_custom wxmsw30u_$(ProjectName)_vc_custom - wxmsw30u_$(ProjectName)_vc_x64_custom + wxmsw30u_$(ProjectName)_vc_x64_custom @@ -160,43 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_propgridlib.pch - $(OutDir)wxmsw30ud_propgrid.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30ud_propgrid.lib - true - - - $(OutDir)wx_vc9_propgrid.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(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 - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_propgridlib.pch + $(OutDir)wxmsw30ud_propgrid.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30ud_propgrid.lib + true + + + $(OutDir)wx_vc9_propgrid.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(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 + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_propgridlib.pch $(OutDir)wxmsw30ud_propgrid.pdb Level4 true @@ -232,41 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_propgridlib.pch - $(OutDir)wxmsw30u_propgrid.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30u_propgrid.lib - true - - - $(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) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(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 - true - Use - wx/wxprec.h - vc_mswu\wxprec_propgridlib.pch + $(OutDir)wxmsw30u_propgrid.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30u_propgrid.lib + true + + + $(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) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(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 + true + Use + wx/wxprec.h + vc_mswu\wxprec_propgridlib.pch $(OutDir)wxmsw30u_propgrid.pdb Level4 true @@ -330,49 +330,49 @@ 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) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(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 - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_propgriddll.pch - $(OutDir)wxmsw30ud_propgrid_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_propgrid_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - 0x0409 - $(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;$(OutDir)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_propgrid_vc_x64_custom.dll - $(OutDir)wxmsw30ud_propgrid.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30ud_propgrid_vc_x64_custom.pdb - - - $(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) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(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 + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_propgriddll.pch + $(OutDir)wxmsw30ud_propgrid_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_propgrid_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) + 0x0409 + $(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;$(OutDir)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_propgrid_vc_x64_custom.dll + $(OutDir)wxmsw30ud_propgrid.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30ud_propgrid_vc_x64_custom.pdb + + + $(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) @@ -417,59 +417,59 @@ 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) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(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 - true - Use - wx/wxprec.h - vc_mswudll\wxprec_propgriddll.pch - $(OutDir)wxmsw30u_propgrid_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_propgrid_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - 0x0409 - $(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;$(OutDir)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_propgrid_vc_x64_custom.dll - $(OutDir)wxmsw30u_propgrid.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30u_propgrid_vc_x64_custom.pdb - true - true - - - $(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) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(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 + true + Use + wx/wxprec.h + vc_mswudll\wxprec_propgriddll.pch + $(OutDir)wxmsw30u_propgrid_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_propgrid_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) + 0x0409 + $(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;$(OutDir)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_propgrid_vc_x64_custom.dll + $(OutDir)wxmsw30u_propgrid.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30u_propgrid_vc_x64_custom.pdb + true + true + + + $(OutDir)wx_vc9_propgrid.bsc + true + + Create - Create + Create Create - Create + Create Create - Create + Create Create - Create + Create @@ -483,71 +483,71 @@ true - true + true true - true + true Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) @@ -562,4 +562,4 @@ - + diff --git a/build/msw/wx_vc10_qa.vcxproj b/build/msw/wx_vc10_qa.vcxproj index 503faefddb..dbe1f7daa6 100644 --- a/build/msw/wx_vc10_qa.vcxproj +++ b/build/msw/wx_vc10_qa.vcxproj @@ -5,34 +5,34 @@ Debug Win32 - - Debug - x64 - + + Debug + x64 + DLL Debug Win32 - - DLL Debug - x64 - + + DLL Debug + x64 + DLL Release Win32 - - DLL Release - x64 - + + DLL Release + x64 + Release Win32 - - Release - x64 - + + Release + x64 + qa @@ -44,103 +44,103 @@ false Unicode - - DynamicLibrary - false - Unicode - + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode - - DynamicLibrary - false - Unicode - + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode - - StaticLibrary - false - Unicode - + + StaticLibrary + false + Unicode + StaticLibrary false Unicode - - StaticLibrary - false - Unicode - + + StaticLibrary + false + Unicode + - - - + + + - - - + + + - - - + + + - - - + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\qa\ - vc_x64_mswud\qa\ + vc_x64_mswud\qa\ ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\qa\ - vc_x64_mswu\qa\ + vc_x64_mswu\qa\ ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\qa\ - vc_x64_mswuddll\qa\ + vc_x64_mswuddll\qa\ true - true + true true - true + true ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\qa\ - vc_x64_mswudll\qa\ + vc_x64_mswudll\qa\ false - false + false true - true + true wxmsw30ud_qa - wxmsw30ud_qa + wxmsw30ud_qa wxmsw30u_qa - wxmsw30u_qa + wxmsw30u_qa wxmsw30ud_$(ProjectName)_vc_custom - wxmsw30ud_$(ProjectName)_vc_x64_custom + wxmsw30ud_$(ProjectName)_vc_x64_custom wxmsw30u_$(ProjectName)_vc_custom - wxmsw30u_$(ProjectName)_vc_x64_custom + wxmsw30u_$(ProjectName)_vc_x64_custom @@ -160,43 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_qalib.pch - $(OutDir)wxmsw30ud_qa.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30ud_qa.lib - true - - - $(OutDir)wx_vc9_qa.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(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 - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_qalib.pch + $(OutDir)wxmsw30ud_qa.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30ud_qa.lib + true + + + $(OutDir)wx_vc9_qa.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(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 + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_qalib.pch $(OutDir)wxmsw30ud_qa.pdb Level4 true @@ -232,41 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_qalib.pch - $(OutDir)wxmsw30u_qa.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30u_qa.lib - true - - - $(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) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(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 - true - Use - wx/wxprec.h - vc_mswu\wxprec_qalib.pch + $(OutDir)wxmsw30u_qa.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30u_qa.lib + true + + + $(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) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(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 + true + Use + wx/wxprec.h + vc_mswu\wxprec_qalib.pch $(OutDir)wxmsw30u_qa.pdb Level4 true @@ -330,49 +330,49 @@ 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) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(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 - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_qadll.pch - $(OutDir)wxmsw30ud_qa_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_qa_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - 0x0409 - $(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;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;$(OutDir)wxbase30ud_xml.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_qa_vc_x64_custom.dll - $(OutDir)wxmsw30ud_qa.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30ud_qa_vc_x64_custom.pdb - - - $(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) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(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 + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_qadll.pch + $(OutDir)wxmsw30ud_qa_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_qa_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) + 0x0409 + $(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;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;$(OutDir)wxbase30ud_xml.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_qa_vc_x64_custom.dll + $(OutDir)wxmsw30ud_qa.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30ud_qa_vc_x64_custom.pdb + + + $(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) @@ -417,135 +417,135 @@ 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) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(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 - true - Use - wx/wxprec.h - vc_mswudll\wxprec_qadll.pch - $(OutDir)wxmsw30u_qa_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_qa_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - 0x0409 - $(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;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;$(OutDir)wxbase30u_xml.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_qa_vc_x64_custom.dll - $(OutDir)wxmsw30u_qa.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30u_qa_vc_x64_custom.pdb - true - true - - - $(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) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(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 + true + Use + wx/wxprec.h + vc_mswudll\wxprec_qadll.pch + $(OutDir)wxmsw30u_qa_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_qa_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) + 0x0409 + $(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;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;$(OutDir)wxbase30u_xml.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_qa_vc_x64_custom.dll + $(OutDir)wxmsw30u_qa.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30u_qa_vc_x64_custom.pdb + true + true + + + $(OutDir)wx_vc9_qa.bsc + true + + Create - Create + Create Create - Create + Create Create - Create + Create Create - Create + Create true - true + true true - true + true Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) - + diff --git a/build/msw/wx_vc10_ribbon.vcxproj b/build/msw/wx_vc10_ribbon.vcxproj index 3a389889a4..9e3b339e3b 100644 --- a/build/msw/wx_vc10_ribbon.vcxproj +++ b/build/msw/wx_vc10_ribbon.vcxproj @@ -5,34 +5,34 @@ Debug Win32 - - Debug - x64 - + + Debug + x64 + DLL Debug Win32 - - DLL Debug - x64 - + + DLL Debug + x64 + DLL Release Win32 - - DLL Release - x64 - + + DLL Release + x64 + Release Win32 - - Release - x64 - + + Release + x64 + ribbon @@ -44,103 +44,103 @@ false Unicode - - DynamicLibrary - false - Unicode - + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode - - DynamicLibrary - false - Unicode - + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode - - StaticLibrary - false - Unicode - + + StaticLibrary + false + Unicode + StaticLibrary false Unicode - - StaticLibrary - false - Unicode - + + StaticLibrary + false + Unicode + - - - + + + - - - + + + - - - + + + - - - + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\ribbon\ - vc_x64_mswud\ribbon\ + vc_x64_mswud\ribbon\ ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\ribbon\ - vc_x64_mswu\ribbon\ + vc_x64_mswu\ribbon\ ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\ribbon\ - vc_x64_mswuddll\ribbon\ + vc_x64_mswuddll\ribbon\ true - true + true true - true + true ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\ribbon\ - vc_x64_mswudll\ribbon\ + vc_x64_mswudll\ribbon\ false - false + false true - true + true wxmsw30ud_ribbon - wxmsw30ud_ribbon + wxmsw30ud_ribbon wxmsw30u_ribbon - wxmsw30u_ribbon + wxmsw30u_ribbon wxmsw30ud_$(ProjectName)_vc_custom - wxmsw30ud_$(ProjectName)_vc_x64_custom + wxmsw30ud_$(ProjectName)_vc_x64_custom wxmsw30u_$(ProjectName)_vc_custom - wxmsw30u_$(ProjectName)_vc_x64_custom + wxmsw30u_$(ProjectName)_vc_x64_custom @@ -160,43 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_ribbonlib.pch - $(OutDir)wxmsw30ud_ribbon.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30ud_ribbon.lib - true - - - $(OutDir)wx_vc9_ribbon.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(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 - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_ribbonlib.pch + $(OutDir)wxmsw30ud_ribbon.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30ud_ribbon.lib + true + + + $(OutDir)wx_vc9_ribbon.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(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 + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_ribbonlib.pch $(OutDir)wxmsw30ud_ribbon.pdb Level4 true @@ -232,41 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_ribbonlib.pch - $(OutDir)wxmsw30u_ribbon.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30u_ribbon.lib - true - - - $(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) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(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 - true - Use - wx/wxprec.h - vc_mswu\wxprec_ribbonlib.pch + $(OutDir)wxmsw30u_ribbon.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30u_ribbon.lib + true + + + $(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) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(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 + true + Use + wx/wxprec.h + vc_mswu\wxprec_ribbonlib.pch $(OutDir)wxmsw30u_ribbon.pdb Level4 true @@ -330,49 +330,49 @@ 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) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(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 - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_ribbondll.pch - $(OutDir)wxmsw30ud_ribbon_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_ribbon_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - 0x0409 - $(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;$(OutDir)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_ribbon_vc_x64_custom.dll - $(OutDir)wxmsw30ud_ribbon.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30ud_ribbon_vc_x64_custom.pdb - - - $(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) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(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 + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_ribbondll.pch + $(OutDir)wxmsw30ud_ribbon_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_ribbon_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) + 0x0409 + $(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;$(OutDir)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_ribbon_vc_x64_custom.dll + $(OutDir)wxmsw30ud_ribbon.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30ud_ribbon_vc_x64_custom.pdb + + + $(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) @@ -417,59 +417,59 @@ 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) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(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 - true - Use - wx/wxprec.h - vc_mswudll\wxprec_ribbondll.pch - $(OutDir)wxmsw30u_ribbon_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_ribbon_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - 0x0409 - $(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;$(OutDir)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_ribbon_vc_x64_custom.dll - $(OutDir)wxmsw30u_ribbon.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30u_ribbon_vc_x64_custom.pdb - true - true - - - $(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) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(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 + true + Use + wx/wxprec.h + vc_mswudll\wxprec_ribbondll.pch + $(OutDir)wxmsw30u_ribbon_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_ribbon_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) + 0x0409 + $(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;$(OutDir)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_ribbon_vc_x64_custom.dll + $(OutDir)wxmsw30u_ribbon.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30u_ribbon_vc_x64_custom.pdb + true + true + + + $(OutDir)wx_vc9_ribbon.bsc + true + + Create - Create + Create Create - Create + Create Create - Create + Create Create - Create + Create @@ -485,71 +485,71 @@ true - true + true true - true + true Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) @@ -564,4 +564,4 @@ - + diff --git a/build/msw/wx_vc10_richtext.vcxproj b/build/msw/wx_vc10_richtext.vcxproj index 23576c854c..3df210aa38 100644 --- a/build/msw/wx_vc10_richtext.vcxproj +++ b/build/msw/wx_vc10_richtext.vcxproj @@ -5,34 +5,34 @@ Debug Win32 - - Debug - x64 - + + Debug + x64 + DLL Debug Win32 - - DLL Debug - x64 - + + DLL Debug + x64 + DLL Release Win32 - - DLL Release - x64 - + + DLL Release + x64 + Release Win32 - - Release - x64 - + + Release + x64 + richtext @@ -44,103 +44,103 @@ false Unicode - - DynamicLibrary - false - Unicode - + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode - - DynamicLibrary - false - Unicode - + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode - - StaticLibrary - false - Unicode - + + StaticLibrary + false + Unicode + StaticLibrary false Unicode - - StaticLibrary - false - Unicode - + + StaticLibrary + false + Unicode + - - - + + + - - - + + + - - - + + + - - - + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\richtext\ - vc_x64_mswud\richtext\ + vc_x64_mswud\richtext\ ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\richtext\ - vc_x64_mswu\richtext\ + vc_x64_mswu\richtext\ ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\richtext\ - vc_x64_mswuddll\richtext\ + vc_x64_mswuddll\richtext\ true - true + true true - true + true ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\richtext\ - vc_x64_mswudll\richtext\ + vc_x64_mswudll\richtext\ false - false + false true - true + true wxmsw30ud_richtext - wxmsw30ud_richtext + wxmsw30ud_richtext wxmsw30u_richtext - wxmsw30u_richtext + wxmsw30u_richtext wxmsw30ud_$(ProjectName)_vc_custom - wxmsw30ud_$(ProjectName)_vc_x64_custom + wxmsw30ud_$(ProjectName)_vc_x64_custom wxmsw30u_$(ProjectName)_vc_custom - wxmsw30u_$(ProjectName)_vc_x64_custom + wxmsw30u_$(ProjectName)_vc_x64_custom @@ -160,43 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_richtextlib.pch - $(OutDir)wxmsw30ud_richtext.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30ud_richtext.lib - true - - - $(OutDir)wx_vc9_richtext.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(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 - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_richtextlib.pch + $(OutDir)wxmsw30ud_richtext.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30ud_richtext.lib + true + + + $(OutDir)wx_vc9_richtext.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(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 + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_richtextlib.pch $(OutDir)wxmsw30ud_richtext.pdb Level4 true @@ -232,41 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_richtextlib.pch - $(OutDir)wxmsw30u_richtext.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30u_richtext.lib - true - - - $(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) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(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 - true - Use - wx/wxprec.h - vc_mswu\wxprec_richtextlib.pch + $(OutDir)wxmsw30u_richtext.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30u_richtext.lib + true + + + $(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) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(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 + true + Use + wx/wxprec.h + vc_mswu\wxprec_richtextlib.pch $(OutDir)wxmsw30u_richtext.pdb Level4 true @@ -330,49 +330,49 @@ 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) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(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 - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_richtextdll.pch - $(OutDir)wxmsw30ud_richtext_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_richtext_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - 0x0409 - $(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;$(OutDir)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_html.lib;$(OutDir)wxbase30ud_xml.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_richtext_vc_x64_custom.dll - $(OutDir)wxmsw30ud_richtext.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30ud_richtext_vc_x64_custom.pdb - - - $(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) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(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 + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_richtextdll.pch + $(OutDir)wxmsw30ud_richtext_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_richtext_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) + 0x0409 + $(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;$(OutDir)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_html.lib;$(OutDir)wxbase30ud_xml.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_richtext_vc_x64_custom.dll + $(OutDir)wxmsw30ud_richtext.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30ud_richtext_vc_x64_custom.pdb + + + $(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) @@ -417,59 +417,59 @@ 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) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(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 - true - Use - wx/wxprec.h - vc_mswudll\wxprec_richtextdll.pch - $(OutDir)wxmsw30u_richtext_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_richtext_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - 0x0409 - $(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;$(OutDir)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_html.lib;$(OutDir)wxbase30u_xml.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_richtext_vc_x64_custom.dll - $(OutDir)wxmsw30u_richtext.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30u_richtext_vc_x64_custom.pdb - true - true - - - $(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) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(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 + true + Use + wx/wxprec.h + vc_mswudll\wxprec_richtextdll.pch + $(OutDir)wxmsw30u_richtext_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_richtext_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) + 0x0409 + $(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;$(OutDir)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_html.lib;$(OutDir)wxbase30u_xml.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_richtext_vc_x64_custom.dll + $(OutDir)wxmsw30u_richtext.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30u_richtext_vc_x64_custom.pdb + true + true + + + $(OutDir)wx_vc9_richtext.bsc + true + + Create - Create + Create Create - Create + Create Create - Create + Create Create - Create + Create @@ -485,71 +485,71 @@ true - true + true true - true + true Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) @@ -576,4 +576,4 @@ - + diff --git a/build/msw/wx_vc10_stc.vcxproj b/build/msw/wx_vc10_stc.vcxproj index f66a7a570c..c80da2e4f9 100644 --- a/build/msw/wx_vc10_stc.vcxproj +++ b/build/msw/wx_vc10_stc.vcxproj @@ -5,34 +5,34 @@ Debug Win32 - - Debug - x64 - + + Debug + x64 + DLL Debug Win32 - - DLL Debug - x64 - + + DLL Debug + x64 + DLL Release Win32 - - DLL Release - x64 - + + DLL Release + x64 + Release Win32 - - Release - x64 - + + Release + x64 + stc @@ -44,103 +44,103 @@ false Unicode - - DynamicLibrary - false - Unicode - + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode - - DynamicLibrary - false - Unicode - + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode - - StaticLibrary - false - Unicode - + + StaticLibrary + false + Unicode + StaticLibrary false Unicode - - StaticLibrary - false - Unicode - + + StaticLibrary + false + Unicode + - - - + + + - - - + + + - - - + + + - - - + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\stc\ - vc_x64_mswud\stc\ + vc_x64_mswud\stc\ ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\stc\ - vc_x64_mswu\stc\ + vc_x64_mswu\stc\ ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\stc\ - vc_x64_mswuddll\stc\ + vc_x64_mswuddll\stc\ true - true + true true - true + true ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\stc\ - vc_x64_mswudll\stc\ + vc_x64_mswudll\stc\ false - false + false true - true + true wxmsw30ud_stc - wxmsw30ud_stc + wxmsw30ud_stc wxmsw30u_stc - wxmsw30u_stc + wxmsw30u_stc wxmsw30ud_$(ProjectName)_vc_custom - wxmsw30ud_$(ProjectName)_vc_x64_custom + wxmsw30ud_$(ProjectName)_vc_x64_custom wxmsw30u_$(ProjectName)_vc_custom - wxmsw30u_$(ProjectName)_vc_x64_custom + wxmsw30u_$(ProjectName)_vc_x64_custom @@ -160,43 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_stclib.pch - $(OutDir)wxmsw30ud_stc.pdb - Level4 - true - ProgramDatabase - - - _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 - $(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) - - - $(OutDir)wxmsw30ud_stc.lib - true - - - $(OutDir)wx_vc9_stc.bsc - true - - - - - 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) - $(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 - $(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 - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_stclib.pch + $(OutDir)wxmsw30ud_stc.pdb + Level4 + true + ProgramDatabase + + + _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 + $(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) + + + $(OutDir)wxmsw30ud_stc.lib + true + + + $(OutDir)wx_vc9_stc.bsc + true + + + + + 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) + $(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 + $(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 + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_stclib.pch $(OutDir)wxmsw30ud_stc.pdb Level4 true @@ -232,41 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_stclib.pch - $(OutDir)wxmsw30u_stc.pdb - Level4 - true - ProgramDatabase - - - _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 - $(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) - - - $(OutDir)wxmsw30u_stc.lib - true - - - $(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) - $(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 - $(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 - true - Use - wx/wxprec.h - vc_mswu\wxprec_stclib.pch + $(OutDir)wxmsw30u_stc.pdb + Level4 + true + ProgramDatabase + + + _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 + $(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) + + + $(OutDir)wxmsw30u_stc.lib + true + + + $(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) + $(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 + $(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 + true + Use + wx/wxprec.h + vc_mswu\wxprec_stclib.pch $(OutDir)wxmsw30u_stc.pdb Level4 true @@ -330,49 +330,49 @@ 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) - $(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 - $(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 - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_stcdll.pch - $(OutDir)wxmsw30ud_stc_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_stc_vc_x64_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - 0x0409 - $(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;$(OutDir)wxscintillad.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_stc_vc_x64_custom.dll - $(OutDir)wxmsw30ud_stc.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30ud_stc_vc_x64_custom.pdb - - - $(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) + $(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 + $(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 + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_stcdll.pch + $(OutDir)wxmsw30ud_stc_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_stc_vc_x64_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) + 0x0409 + $(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;$(OutDir)wxscintillad.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_stc_vc_x64_custom.dll + $(OutDir)wxmsw30ud_stc.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30ud_stc_vc_x64_custom.pdb + + + $(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) @@ -417,59 +417,59 @@ 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) - $(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 - $(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 - true - Use - wx/wxprec.h - vc_mswudll\wxprec_stcdll.pch - $(OutDir)wxmsw30u_stc_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_stc_vc_x64_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - 0x0409 - $(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;$(OutDir)wxscintilla.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_stc_vc_x64_custom.dll - $(OutDir)wxmsw30u_stc.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30u_stc_vc_x64_custom.pdb - true - true - - - $(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) + $(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 + $(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 + true + Use + wx/wxprec.h + vc_mswudll\wxprec_stcdll.pch + $(OutDir)wxmsw30u_stc_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_stc_vc_x64_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) + 0x0409 + $(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;$(OutDir)wxscintilla.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_stc_vc_x64_custom.dll + $(OutDir)wxmsw30u_stc.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30u_stc_vc_x64_custom.pdb + true + true + + + $(OutDir)wx_vc9_stc.bsc + true + + Create - Create + Create Create - Create + Create Create - Create + Create Create - Create + Create @@ -478,71 +478,71 @@ true - true + true true - true + true Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) diff --git a/build/msw/wx_vc10_webview.vcxproj b/build/msw/wx_vc10_webview.vcxproj index bb599911ba..86e6c358b8 100644 --- a/build/msw/wx_vc10_webview.vcxproj +++ b/build/msw/wx_vc10_webview.vcxproj @@ -5,34 +5,34 @@ Debug Win32 - - Debug - x64 - + + Debug + x64 + DLL Debug Win32 - - DLL Debug - x64 - + + DLL Debug + x64 + DLL Release Win32 - - DLL Release - x64 - + + DLL Release + x64 + Release Win32 - - Release - x64 - + + Release + x64 + webview @@ -44,103 +44,103 @@ false Unicode - - DynamicLibrary - false - Unicode - + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode - - DynamicLibrary - false - Unicode - + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode - - StaticLibrary - false - Unicode - + + StaticLibrary + false + Unicode + StaticLibrary false Unicode - - StaticLibrary - false - Unicode - + + StaticLibrary + false + Unicode + - - - + + + - - - + + + - - - + + + - - - + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\webview\ - vc_x64_mswud\webview\ + vc_x64_mswud\webview\ ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\webview\ - vc_x64_mswu\webview\ + vc_x64_mswu\webview\ ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\webview\ - vc_x64_mswuddll\webview\ + vc_x64_mswuddll\webview\ true - true + true true - true + true ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\webview\ - vc_x64_mswudll\webview\ + vc_x64_mswudll\webview\ false - false + false true - true + true wxmsw30ud_webview - wxmsw30ud_webview + wxmsw30ud_webview wxmsw30u_webview - wxmsw30u_webview + wxmsw30u_webview wxmsw30ud_$(ProjectName)_vc_custom - wxmsw30ud_$(ProjectName)_vc_x64_custom + wxmsw30ud_$(ProjectName)_vc_x64_custom wxmsw30u_$(ProjectName)_vc_custom - wxmsw30u_$(ProjectName)_vc_x64_custom + wxmsw30u_$(ProjectName)_vc_x64_custom @@ -160,43 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_webviewlib.pch - $(OutDir)wxmsw30ud_webview.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30ud_webview.lib - true - - - $(OutDir)wx_vc9_webview.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(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 - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_webviewlib.pch + $(OutDir)wxmsw30ud_webview.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30ud_webview.lib + true + + + $(OutDir)wx_vc9_webview.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(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 + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_webviewlib.pch $(OutDir)wxmsw30ud_webview.pdb Level4 true @@ -232,41 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_webviewlib.pch - $(OutDir)wxmsw30u_webview.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30u_webview.lib - true - - - $(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) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(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 - true - Use - wx/wxprec.h - vc_mswu\wxprec_webviewlib.pch + $(OutDir)wxmsw30u_webview.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30u_webview.lib + true + + + $(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) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(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 + true + Use + wx/wxprec.h + vc_mswu\wxprec_webviewlib.pch $(OutDir)wxmsw30u_webview.pdb Level4 true @@ -330,49 +330,49 @@ 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) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(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 - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_webviewdll.pch - $(OutDir)wxmsw30ud_webview_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - 0x0409 - $(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;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_webview_vc_custom.dll - $(OutDir)wxmsw30ud_webview.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30ud_webview_vc_custom.pdb - - - $(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) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(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 + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_webviewdll.pch + $(OutDir)wxmsw30ud_webview_vc_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) + 0x0409 + $(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;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_webview_vc_custom.dll + $(OutDir)wxmsw30ud_webview.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30ud_webview_vc_custom.pdb + + + $(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) @@ -417,59 +417,59 @@ 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) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(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 - true - Use - wx/wxprec.h - vc_mswudll\wxprec_webviewdll.pch - $(OutDir)wxmsw30u_webview_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - 0x0409 - $(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;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_webview_vc_custom.dll - $(OutDir)wxmsw30u_webview.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30u_webview_vc_custom.pdb - true - true - - - $(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) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(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 + true + Use + wx/wxprec.h + vc_mswudll\wxprec_webviewdll.pch + $(OutDir)wxmsw30u_webview_vc_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) + 0x0409 + $(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;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_webview_vc_custom.dll + $(OutDir)wxmsw30u_webview.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30u_webview_vc_custom.pdb + true + true + + + $(OutDir)wx_vc9_webview.bsc + true + + Create - Create + Create Create - Create + Create Create - Create + Create Create - Create + Create @@ -479,71 +479,71 @@ true - true + true true - true + true Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) diff --git a/build/msw/wx_vc10_wxexpat.vcxproj b/build/msw/wx_vc10_wxexpat.vcxproj index f4ca04a3fc..a0d9555346 100644 --- a/build/msw/wx_vc10_wxexpat.vcxproj +++ b/build/msw/wx_vc10_wxexpat.vcxproj @@ -5,34 +5,34 @@ Debug Win32 - - Debug - x64 - + + Debug + x64 + DLL Debug Win32 - - DLL Debug - x64 - + + DLL Debug + x64 + DLL Release Win32 - - DLL Release - x64 - + + DLL Release + x64 + Release Win32 - - Release - x64 - + + Release + x64 + wxexpat @@ -43,84 +43,84 @@ StaticLibrary false - - StaticLibrary - false - + + StaticLibrary + false + StaticLibrary false - - StaticLibrary - false - + + StaticLibrary + false + StaticLibrary false - - StaticLibrary - false - + + StaticLibrary + false + StaticLibrary false - - StaticLibrary - false - + + StaticLibrary + false + - - - + + + - - - + + + - - - + + + - - - + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\wxexpat\ - vc_x64_mswud\wxexpat\ + vc_x64_mswud\wxexpat\ ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\wxexpat\ - vc_x64_mswu\wxexpat\ + vc_x64_mswu\wxexpat\ ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\wxexpat\ - vc_x64_mswuddll\wxexpat\ + vc_x64_mswuddll\wxexpat\ ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\wxexpat\ - vc_x64_mswudll\wxexpat\ + vc_x64_mswudll\wxexpat\ $(ProjectName)d - $(ProjectName)d + $(ProjectName)d $(ProjectName)d - $(ProjectName)d + $(ProjectName)d @@ -137,40 +137,40 @@ MultiThreadedDebugDLL true true - $(OutDir)wxexpatd.pdb - Level3 - true - ProgramDatabase - - - _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 - $(OutDir);%(AdditionalIncludeDirectories) - - - $(OutDir)wxexpatd.lib - true - - - $(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) - $(OutDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(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 - MultiThreadedDebugDLL - true - true + $(OutDir)wxexpatd.pdb + Level3 + true + ProgramDatabase + + + _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 + $(OutDir);%(AdditionalIncludeDirectories) + + + $(OutDir)wxexpatd.lib + true + + + $(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) + $(OutDir);%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(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 + MultiThreadedDebugDLL + true + true $(OutDir)wxexpatd.pdb Level3 true @@ -203,38 +203,38 @@ Sync MultiThreadedDLL true - $(OutDir)wxexpat.pdb - Level3 - true - ProgramDatabase - - - _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 - $(OutDir);%(AdditionalIncludeDirectories) - - - $(OutDir)wxexpat.lib - true - - - $(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) - $(OutDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(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 + $(OutDir)wxexpat.pdb + Level3 + true + ProgramDatabase + + + _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 + $(OutDir);%(AdditionalIncludeDirectories) + + + $(OutDir)wxexpat.lib + true + + + $(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) + $(OutDir);%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(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 $(OutDir)wxexpat.pdb Level3 true @@ -269,40 +269,40 @@ MultiThreadedDebugDLL true true - $(OutDir)wxexpatd.pdb - Level3 - true - ProgramDatabase - - - _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 - $(OutDir);%(AdditionalIncludeDirectories) - - - $(OutDir)wxexpatd.lib - true - - - $(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) - $(OutDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(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 - MultiThreadedDebugDLL - true - true + $(OutDir)wxexpatd.pdb + Level3 + true + ProgramDatabase + + + _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 + $(OutDir);%(AdditionalIncludeDirectories) + + + $(OutDir)wxexpatd.lib + true + + + $(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) + $(OutDir);%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(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 + MultiThreadedDebugDLL + true + true $(OutDir)wxexpatd.pdb Level3 true @@ -335,38 +335,38 @@ Sync MultiThreadedDLL true - $(OutDir)wxexpat.pdb - Level3 - true - ProgramDatabase - - - _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 - $(OutDir);%(AdditionalIncludeDirectories) - - - $(OutDir)wxexpat.lib - true - - - $(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) - $(OutDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(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 + $(OutDir)wxexpat.pdb + Level3 + true + ProgramDatabase + + + _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 + $(OutDir);%(AdditionalIncludeDirectories) + + + $(OutDir)wxexpat.lib + true + + + $(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) + $(OutDir);%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(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 $(OutDir)wxexpat.pdb Level3 true diff --git a/build/msw/wx_vc10_wxjpeg.vcxproj b/build/msw/wx_vc10_wxjpeg.vcxproj index e14ca341ca..da312515d1 100644 --- a/build/msw/wx_vc10_wxjpeg.vcxproj +++ b/build/msw/wx_vc10_wxjpeg.vcxproj @@ -5,34 +5,34 @@ Debug Win32 - - Debug - x64 - + + Debug + x64 + DLL Debug Win32 - - DLL Debug - x64 - + + DLL Debug + x64 + DLL Release Win32 - - DLL Release - x64 - + + DLL Release + x64 + Release Win32 - - Release - x64 - + + Release + x64 + wxjpeg @@ -43,84 +43,84 @@ StaticLibrary false - - StaticLibrary - false - + + StaticLibrary + false + StaticLibrary false - - StaticLibrary - false - + + StaticLibrary + false + StaticLibrary false - - StaticLibrary - false - + + StaticLibrary + false + StaticLibrary false - - StaticLibrary - false - + + StaticLibrary + false + - - - + + + - - - + + + - - - + + + - - - + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\wxjpeg\ - vc_x64_mswud\wxjpeg\ + vc_x64_mswud\wxjpeg\ ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\wxjpeg\ - vc_x64_mswu\wxjpeg\ + vc_x64_mswu\wxjpeg\ ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\wxjpeg\ - vc_x64_mswuddll\wxjpeg\ + vc_x64_mswuddll\wxjpeg\ ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\wxjpeg\ - vc_x64_mswudll\wxjpeg\ + vc_x64_mswudll\wxjpeg\ $(ProjectName)d - $(ProjectName)d + $(ProjectName)d $(ProjectName)d - $(ProjectName)d + $(ProjectName)d @@ -137,40 +137,40 @@ MultiThreadedDebugDLL true true - $(OutDir)wxjpegd.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;%(AdditionalIncludeDirectories) - - - $(OutDir)wxjpegd.lib - true - - - $(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) - $(OutDir)mswud;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(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 - MultiThreadedDebugDLL - true - true + $(OutDir)wxjpegd.pdb + Level3 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;%(AdditionalIncludeDirectories) + + + $(OutDir)wxjpegd.lib + true + + + $(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) + $(OutDir)mswud;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(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 + MultiThreadedDebugDLL + true + true $(OutDir)wxjpegd.pdb Level3 true @@ -203,38 +203,38 @@ Sync MultiThreadedDLL true - $(OutDir)wxjpeg.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;%(AdditionalIncludeDirectories) - - - $(OutDir)wxjpeg.lib - true - - - $(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) - $(OutDir)mswu;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(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 + $(OutDir)wxjpeg.pdb + Level3 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;%(AdditionalIncludeDirectories) + + + $(OutDir)wxjpeg.lib + true + + + $(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) + $(OutDir)mswu;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(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 $(OutDir)wxjpeg.pdb Level3 true @@ -269,40 +269,40 @@ MultiThreadedDebugDLL true true - $(OutDir)wxjpegd.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;%(AdditionalIncludeDirectories) - - - $(OutDir)wxjpegd.lib - true - - - $(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) - $(OutDir)mswud;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(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 - MultiThreadedDebugDLL - true - true + $(OutDir)wxjpegd.pdb + Level3 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;%(AdditionalIncludeDirectories) + + + $(OutDir)wxjpegd.lib + true + + + $(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) + $(OutDir)mswud;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(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 + MultiThreadedDebugDLL + true + true $(OutDir)wxjpegd.pdb Level3 true @@ -335,38 +335,38 @@ Sync MultiThreadedDLL true - $(OutDir)wxjpeg.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;%(AdditionalIncludeDirectories) - - - $(OutDir)wxjpeg.lib - true - - - $(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) - $(OutDir)mswu;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(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 + $(OutDir)wxjpeg.pdb + Level3 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;%(AdditionalIncludeDirectories) + + + $(OutDir)wxjpeg.lib + true + + + $(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) + $(OutDir)mswu;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(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 $(OutDir)wxjpeg.pdb Level3 true diff --git a/build/msw/wx_vc10_wxpng.vcxproj b/build/msw/wx_vc10_wxpng.vcxproj index 2ae5de47f5..73a087b578 100644 --- a/build/msw/wx_vc10_wxpng.vcxproj +++ b/build/msw/wx_vc10_wxpng.vcxproj @@ -5,34 +5,34 @@ Debug Win32 - - Debug - x64 - + + Debug + x64 + DLL Debug Win32 - - DLL Debug - x64 - + + DLL Debug + x64 + DLL Release Win32 - - DLL Release - x64 - + + DLL Release + x64 + Release Win32 - - Release - x64 - + + Release + x64 + wxpng @@ -43,84 +43,84 @@ StaticLibrary false - - StaticLibrary - false - + + StaticLibrary + false + StaticLibrary false - - StaticLibrary - false - + + StaticLibrary + false + StaticLibrary false - - StaticLibrary - false - + + StaticLibrary + false + StaticLibrary false - - StaticLibrary - false - + + StaticLibrary + false + - - - + + + - - - + + + - - - + + + - - - + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\wxpng\ - vc_x64_mswud\wxpng\ + vc_x64_mswud\wxpng\ ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\wxpng\ - vc_x64_mswu\wxpng\ + vc_x64_mswu\wxpng\ ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\wxpng\ - vc_x64_mswuddll\wxpng\ + vc_x64_mswuddll\wxpng\ ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\wxpng\ - vc_x64_mswudll\wxpng\ + vc_x64_mswudll\wxpng\ $(ProjectName)d - $(ProjectName)d + $(ProjectName)d $(ProjectName)d - $(ProjectName)d + $(ProjectName)d @@ -137,40 +137,40 @@ MultiThreadedDebugDLL true true - $(OutDir)wxpngd.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxpngd.lib - true - - - $(OutDir)wx_vc9_wxpng.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) - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\src\zlib;%(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 - MultiThreadedDebugDLL - true - true + $(OutDir)wxpngd.pdb + Level3 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + 0x0409 + ..\..\src\zlib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxpngd.lib + true + + + $(OutDir)wx_vc9_wxpng.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) + ..\..\src\zlib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + ..\..\src\zlib;%(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 + MultiThreadedDebugDLL + true + true $(OutDir)wxpngd.pdb Level3 true @@ -203,38 +203,38 @@ Sync MultiThreadedDLL true - $(OutDir)wxpng.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxpng.lib - true - - - $(OutDir)wx_vc9_wxpng.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) - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\zlib;%(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 + $(OutDir)wxpng.pdb + Level3 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + 0x0409 + ..\..\src\zlib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxpng.lib + true + + + $(OutDir)wx_vc9_wxpng.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) + ..\..\src\zlib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + ..\..\src\zlib;%(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 $(OutDir)wxpng.pdb Level3 true @@ -269,40 +269,40 @@ MultiThreadedDebugDLL true true - $(OutDir)wxpngd.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxpngd.lib - true - - - $(OutDir)wx_vc9_wxpng.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) - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\src\zlib;%(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 - MultiThreadedDebugDLL - true - true + $(OutDir)wxpngd.pdb + Level3 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + 0x0409 + ..\..\src\zlib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxpngd.lib + true + + + $(OutDir)wx_vc9_wxpng.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) + ..\..\src\zlib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + ..\..\src\zlib;%(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 + MultiThreadedDebugDLL + true + true $(OutDir)wxpngd.pdb Level3 true @@ -335,38 +335,38 @@ Sync MultiThreadedDLL true - $(OutDir)wxpng.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxpng.lib - true - - - $(OutDir)wx_vc9_wxpng.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) - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\zlib;%(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 + $(OutDir)wxpng.pdb + Level3 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + 0x0409 + ..\..\src\zlib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxpng.lib + true + + + $(OutDir)wx_vc9_wxpng.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) + ..\..\src\zlib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + ..\..\src\zlib;%(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 $(OutDir)wxpng.pdb Level3 true diff --git a/build/msw/wx_vc10_wxregex.vcxproj b/build/msw/wx_vc10_wxregex.vcxproj index 55e47788d2..fe66f2259f 100644 --- a/build/msw/wx_vc10_wxregex.vcxproj +++ b/build/msw/wx_vc10_wxregex.vcxproj @@ -5,34 +5,34 @@ Debug Win32 - - Debug - x64 - + + Debug + x64 + DLL Debug Win32 - - DLL Debug - x64 - + + DLL Debug + x64 + DLL Release Win32 - - DLL Release - x64 - + + DLL Release + x64 + Release Win32 - - Release - x64 - + + Release + x64 + wxregex @@ -44,95 +44,95 @@ false Unicode - - StaticLibrary - false - Unicode - + + StaticLibrary + false + Unicode + StaticLibrary false Unicode - - StaticLibrary - false - Unicode - + + StaticLibrary + false + Unicode + StaticLibrary false Unicode - - StaticLibrary - false - Unicode - + + StaticLibrary + false + Unicode + StaticLibrary false Unicode - - StaticLibrary - false - Unicode - + + StaticLibrary + false + Unicode + - - - + + + - - - + + + - - - + + + - - - + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\wxregex\ - vc_x64_mswud\wxregex\ + vc_x64_mswud\wxregex\ ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\wxregex\ - vc_x64_mswu\wxregex\ + vc_x64_mswu\wxregex\ ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\wxregex\ - vc_x64_mswuddll\wxregex\ + vc_x64_mswuddll\wxregex\ ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\wxregex\ - vc_x64_mswudll\wxregex\ + vc_x64_mswudll\wxregex\ $(ProjectName)ud - $(ProjectName)ud + $(ProjectName)ud $(ProjectName)ud - $(ProjectName)ud + $(ProjectName)ud $(ProjectName)u - $(ProjectName)u + $(ProjectName)u $(ProjectName)u - $(ProjectName)u + $(ProjectName)u @@ -149,40 +149,40 @@ MultiThreadedDebugDLL true true - $(OutDir)wxregexud.pdb - Level3 - true - ProgramDatabase - - - _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;$(OutDir)mswud;%(AdditionalIncludeDirectories) - - - $(OutDir)wxregexud.lib - true - - - $(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;$(OutDir)mswud;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\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 - MultiThreadedDebugDLL - true - true + $(OutDir)wxregexud.pdb + Level3 + true + ProgramDatabase + + + _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;$(OutDir)mswud;%(AdditionalIncludeDirectories) + + + $(OutDir)wxregexud.lib + true + + + $(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;$(OutDir)mswud;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + ..\..\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 + MultiThreadedDebugDLL + true + true $(OutDir)wxregexud.pdb Level3 true @@ -215,38 +215,38 @@ Sync MultiThreadedDLL true - $(OutDir)wxregexu.pdb - Level3 - true - ProgramDatabase - - - _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;$(OutDir)mswu;%(AdditionalIncludeDirectories) - - - $(OutDir)wxregexu.lib - true - - - $(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;$(OutDir)mswu;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\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 + $(OutDir)wxregexu.pdb + Level3 + true + ProgramDatabase + + + _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;$(OutDir)mswu;%(AdditionalIncludeDirectories) + + + $(OutDir)wxregexu.lib + true + + + $(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;$(OutDir)mswu;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + ..\..\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 $(OutDir)wxregexu.pdb Level3 true @@ -281,40 +281,40 @@ MultiThreadedDebugDLL true true - $(OutDir)wxregexud.pdb - Level3 - true - ProgramDatabase - - - _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;$(OutDir)mswud;%(AdditionalIncludeDirectories) - - - $(OutDir)wxregexud.lib - true - - - $(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;$(OutDir)mswud;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\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 - MultiThreadedDebugDLL - true - true + $(OutDir)wxregexud.pdb + Level3 + true + ProgramDatabase + + + _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;$(OutDir)mswud;%(AdditionalIncludeDirectories) + + + $(OutDir)wxregexud.lib + true + + + $(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;$(OutDir)mswud;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + ..\..\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 + MultiThreadedDebugDLL + true + true $(OutDir)wxregexud.pdb Level3 true @@ -347,38 +347,38 @@ Sync MultiThreadedDLL true - $(OutDir)wxregexu.pdb - Level3 - true - ProgramDatabase - - - _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;$(OutDir)mswu;%(AdditionalIncludeDirectories) - - - $(OutDir)wxregexu.lib - true - - - $(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;$(OutDir)mswu;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\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 + $(OutDir)wxregexu.pdb + Level3 + true + ProgramDatabase + + + _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;$(OutDir)mswu;%(AdditionalIncludeDirectories) + + + $(OutDir)wxregexu.lib + true + + + $(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;$(OutDir)mswu;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + ..\..\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 $(OutDir)wxregexu.pdb Level3 true @@ -407,63 +407,63 @@ Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) diff --git a/build/msw/wx_vc10_wxscintilla.vcxproj b/build/msw/wx_vc10_wxscintilla.vcxproj index 3e6dac77a6..531777ec72 100644 --- a/build/msw/wx_vc10_wxscintilla.vcxproj +++ b/build/msw/wx_vc10_wxscintilla.vcxproj @@ -5,34 +5,34 @@ Debug Win32 - - Debug - x64 - + + Debug + x64 + DLL Debug Win32 - - DLL Debug - x64 - + + DLL Debug + x64 + DLL Release Win32 - - DLL Release - x64 - + + DLL Release + x64 + Release Win32 - - Release - x64 - + + Release + x64 + wxscintilla @@ -44,91 +44,91 @@ false Unicode - - StaticLibrary - false - Unicode - + + StaticLibrary + false + Unicode + StaticLibrary false Unicode - - StaticLibrary - false - Unicode - + + StaticLibrary + false + Unicode + StaticLibrary false Unicode - - StaticLibrary - false - Unicode - + + StaticLibrary + false + Unicode + StaticLibrary false Unicode - - StaticLibrary - false - Unicode - + + StaticLibrary + false + Unicode + - - - + + + - - - + + + - - - + + + - - - + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\wxscintilla\ - vc_x64_mswud\wxscintilla\ + vc_x64_mswud\wxscintilla\ ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\wxscintilla\ - vc_x64_mswu\wxscintilla\ + vc_x64_mswu\wxscintilla\ ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\wxscintilla\ - vc_x64_mswuddll\wxscintilla\ + vc_x64_mswuddll\wxscintilla\ ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\wxscintilla\ - vc_x64_mswudll\wxscintilla\ + vc_x64_mswudll\wxscintilla\ $(ProjectName)d - $(ProjectName)d + $(ProjectName)d $(ProjectName)d - $(ProjectName)d + $(ProjectName)d @@ -145,40 +145,40 @@ MultiThreadedDebugDLL true true - $(OutDir)wxscintillad.pdb - Level3 - true - ProgramDatabase - - - _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;$(OutDir)mswud;..\..\include;%(AdditionalIncludeDirectories) - - - $(OutDir)wxscintillad.lib - true - - - $(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;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\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;$(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 - MultiThreadedDebugDLL - true - true + $(OutDir)wxscintillad.pdb + Level3 + true + ProgramDatabase + + + _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;$(OutDir)mswud;..\..\include;%(AdditionalIncludeDirectories) + + + $(OutDir)wxscintillad.lib + true + + + $(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;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + ..\..\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;$(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 + MultiThreadedDebugDLL + true + true $(OutDir)wxscintillad.pdb Level3 true @@ -211,38 +211,38 @@ Sync MultiThreadedDLL true - $(OutDir)wxscintilla.pdb - Level3 - true - ProgramDatabase - - - _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;$(OutDir)mswu;..\..\include;%(AdditionalIncludeDirectories) - - - $(OutDir)wxscintilla.lib - true - - - $(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;$(OutDir)mswu;..\..\include;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\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 + $(OutDir)wxscintilla.pdb + Level3 + true + ProgramDatabase + + + _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;$(OutDir)mswu;..\..\include;%(AdditionalIncludeDirectories) + + + $(OutDir)wxscintilla.lib + true + + + $(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;$(OutDir)mswu;..\..\include;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + ..\..\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 $(OutDir)wxscintilla.pdb Level3 true @@ -277,40 +277,40 @@ MultiThreadedDebugDLL true true - $(OutDir)wxscintillad.pdb - Level3 - true - ProgramDatabase - - - _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;$(OutDir)mswud;..\..\include;%(AdditionalIncludeDirectories) - - - $(OutDir)wxscintillad.lib - true - - - $(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;$(OutDir)mswud;..\..\include;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\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 - MultiThreadedDebugDLL - true - true + $(OutDir)wxscintillad.pdb + Level3 + true + ProgramDatabase + + + _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;$(OutDir)mswud;..\..\include;%(AdditionalIncludeDirectories) + + + $(OutDir)wxscintillad.lib + true + + + $(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;$(OutDir)mswud;..\..\include;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + ..\..\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 + MultiThreadedDebugDLL + true + true $(OutDir)wxscintillad.pdb Level3 true @@ -343,38 +343,38 @@ Sync MultiThreadedDLL true - $(OutDir)wxscintilla.pdb - Level3 - true - ProgramDatabase - - - _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;$(OutDir)mswu;..\..\include;%(AdditionalIncludeDirectories) - - - $(OutDir)wxscintilla.lib - true - - - $(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;$(OutDir)mswu;..\..\include;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\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 + $(OutDir)wxscintilla.pdb + Level3 + true + ProgramDatabase + + + _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;$(OutDir)mswu;..\..\include;%(AdditionalIncludeDirectories) + + + $(OutDir)wxscintilla.lib + true + + + $(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;$(OutDir)mswu;..\..\include;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + ..\..\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 $(OutDir)wxscintilla.pdb Level3 true @@ -518,63 +518,63 @@ Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) diff --git a/build/msw/wx_vc10_wxtiff.vcxproj b/build/msw/wx_vc10_wxtiff.vcxproj index 4e06eb171c..8ec62c3707 100644 --- a/build/msw/wx_vc10_wxtiff.vcxproj +++ b/build/msw/wx_vc10_wxtiff.vcxproj @@ -5,34 +5,34 @@ Debug Win32 - - Debug - x64 - + + Debug + x64 + DLL Debug Win32 - - DLL Debug - x64 - + + DLL Debug + x64 + DLL Release Win32 - - DLL Release - x64 - + + DLL Release + x64 + Release Win32 - - Release - x64 - + + Release + x64 + wxtiff @@ -43,84 +43,84 @@ StaticLibrary false - - StaticLibrary - false - + + StaticLibrary + false + StaticLibrary false - - StaticLibrary - false - + + StaticLibrary + false + StaticLibrary false - - StaticLibrary - false - + + StaticLibrary + false + StaticLibrary false - - StaticLibrary - false - + + StaticLibrary + false + - - - + + + - - - + + + - - - + + + - - - + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\wxtiff\ - vc_x64_mswud\wxtiff\ + vc_x64_mswud\wxtiff\ ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\wxtiff\ - vc_x64_mswu\wxtiff\ + vc_x64_mswu\wxtiff\ ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\wxtiff\ - vc_x64_mswuddll\wxtiff\ + vc_x64_mswuddll\wxtiff\ ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\wxtiff\ - vc_x64_mswudll\wxtiff\ + vc_x64_mswudll\wxtiff\ $(ProjectName)d - $(ProjectName)d + $(ProjectName)d $(ProjectName)d - $(ProjectName)d + $(ProjectName)d @@ -137,40 +137,40 @@ MultiThreadedDebugDLL true true - $(OutDir)wxtiffd.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - $(OutDir)wxtiffd.lib - true - - - $(OutDir)wx_vc9_wxtiff.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;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true + $(OutDir)wxtiffd.pdb + Level3 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + 0x0409 + ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) + + + $(OutDir)wxtiffd.lib + true + + + $(OutDir)wx_vc9_wxtiff.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;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true $(OutDir)wxtiffd.pdb Level3 true @@ -203,38 +203,38 @@ Sync MultiThreadedDLL true - $(OutDir)wxtiff.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - $(OutDir)wxtiff.lib - true - - - $(OutDir)wx_vc9_wxtiff.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true + $(OutDir)wxtiff.pdb + Level3 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + 0x0409 + ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) + + + $(OutDir)wxtiff.lib + true + + + $(OutDir)wx_vc9_wxtiff.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true $(OutDir)wxtiff.pdb Level3 true @@ -269,40 +269,40 @@ MultiThreadedDebugDLL true true - $(OutDir)wxtiffd.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - $(OutDir)wxtiffd.lib - true - - - $(OutDir)wx_vc9_wxtiff.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;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true + $(OutDir)wxtiffd.pdb + Level3 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + 0x0409 + ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) + + + $(OutDir)wxtiffd.lib + true + + + $(OutDir)wx_vc9_wxtiff.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;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true $(OutDir)wxtiffd.pdb Level3 true @@ -335,38 +335,38 @@ Sync MultiThreadedDLL true - $(OutDir)wxtiff.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - $(OutDir)wxtiff.lib - true - - - $(OutDir)wx_vc9_wxtiff.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true + $(OutDir)wxtiff.pdb + Level3 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + 0x0409 + ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) + + + $(OutDir)wxtiff.lib + true + + + $(OutDir)wx_vc9_wxtiff.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true $(OutDir)wxtiff.pdb Level3 true diff --git a/build/msw/wx_vc10_wxzlib.vcxproj b/build/msw/wx_vc10_wxzlib.vcxproj index c21e20eb2d..3aa33bea8e 100644 --- a/build/msw/wx_vc10_wxzlib.vcxproj +++ b/build/msw/wx_vc10_wxzlib.vcxproj @@ -5,34 +5,34 @@ Debug Win32 - - Debug - x64 - + + Debug + x64 + DLL Debug Win32 - - DLL Debug - x64 - + + DLL Debug + x64 + DLL Release Win32 - - DLL Release - x64 - + + DLL Release + x64 + Release Win32 - - Release - x64 - + + Release + x64 + wxzlib @@ -43,129 +43,95 @@ StaticLibrary false - - StaticLibrary - false - + + StaticLibrary + false + StaticLibrary false - - StaticLibrary - false - + + StaticLibrary + false + StaticLibrary false - - StaticLibrary - false - + + StaticLibrary + false + StaticLibrary false - - StaticLibrary - false - + + StaticLibrary + false + - - - + + + - - - + + + - - - + + + - - - + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\wxzlib\ - vc_x64_mswud\wxzlib\ + vc_x64_mswud\wxzlib\ ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\wxzlib\ - vc_x64_mswu\wxzlib\ + vc_x64_mswu\wxzlib\ ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\wxzlib\ - vc_x64_mswuddll\wxzlib\ + vc_x64_mswuddll\wxzlib\ ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\wxzlib\ - vc_x64_mswudll\wxzlib\ + vc_x64_mswudll\wxzlib\ $(ProjectName)d - $(ProjectName)d + $(ProjectName)d $(ProjectName)d - $(ProjectName)d + $(ProjectName)d - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - %(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)wxzlibd.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - %(AdditionalIncludeDirectories) - - - $(OutDir)wxzlibd.lib - true - - - $(OutDir)wx_vc9_wxzlib.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;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) %(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled %(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) Sync EnableFastChecks MultiThreadedDebugDLL @@ -177,7 +143,41 @@ ProgramDatabase - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + 0x0409 + %(AdditionalIncludeDirectories) + + + $(OutDir)wxzlibd.lib + true + + + $(OutDir)wx_vc9_wxzlib.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;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + %(AdditionalIncludeDirectories) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + $(OutDir)wxzlibd.pdb + Level3 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) 0x0409 %(AdditionalIncludeDirectories) @@ -192,46 +192,14 @@ - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - %(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)wxzlib.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - %(AdditionalIncludeDirectories) - - - $(OutDir)wxzlib.lib - true - - - $(OutDir)wx_vc9_wxzlib.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) %(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MaxSpeed %(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) Sync MultiThreadedDLL true @@ -241,7 +209,39 @@ ProgramDatabase - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + 0x0409 + %(AdditionalIncludeDirectories) + + + $(OutDir)wxzlib.lib + true + + + $(OutDir)wx_vc9_wxzlib.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + %(AdditionalIncludeDirectories) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + $(OutDir)wxzlib.pdb + Level3 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) 0x0409 %(AdditionalIncludeDirectories) @@ -256,48 +256,14 @@ - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - %(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)wxzlibd.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - %(AdditionalIncludeDirectories) - - - $(OutDir)wxzlibd.lib - true - - - $(OutDir)wx_vc9_wxzlib.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;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) %(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled %(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) Sync EnableFastChecks MultiThreadedDebugDLL @@ -309,7 +275,41 @@ ProgramDatabase - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + 0x0409 + %(AdditionalIncludeDirectories) + + + $(OutDir)wxzlibd.lib + true + + + $(OutDir)wx_vc9_wxzlib.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;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + %(AdditionalIncludeDirectories) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + $(OutDir)wxzlibd.pdb + Level3 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) 0x0409 %(AdditionalIncludeDirectories) @@ -324,46 +324,14 @@ - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - %(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)wxzlib.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - %(AdditionalIncludeDirectories) - - - $(OutDir)wxzlib.lib - true - - - $(OutDir)wx_vc9_wxzlib.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) %(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MaxSpeed %(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) Sync MultiThreadedDLL true @@ -373,7 +341,39 @@ ProgramDatabase - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + 0x0409 + %(AdditionalIncludeDirectories) + + + $(OutDir)wxzlib.lib + true + + + $(OutDir)wx_vc9_wxzlib.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + %(AdditionalIncludeDirectories) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + $(OutDir)wxzlib.pdb + Level3 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) 0x0409 %(AdditionalIncludeDirectories) diff --git a/build/msw/wx_vc10_xml.vcxproj b/build/msw/wx_vc10_xml.vcxproj index 5b474e0834..c65f94c301 100644 --- a/build/msw/wx_vc10_xml.vcxproj +++ b/build/msw/wx_vc10_xml.vcxproj @@ -5,34 +5,34 @@ Debug Win32 - - Debug - x64 - + + Debug + x64 + DLL Debug Win32 - - DLL Debug - x64 - + + DLL Debug + x64 + DLL Release Win32 - - DLL Release - x64 - + + DLL Release + x64 + Release Win32 - - Release - x64 - + + Release + x64 + xml @@ -44,103 +44,103 @@ false Unicode - - DynamicLibrary - false - Unicode - + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode - - DynamicLibrary - false - Unicode - + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode - - StaticLibrary - false - Unicode - + + StaticLibrary + false + Unicode + StaticLibrary false Unicode - - StaticLibrary - false - Unicode - + + StaticLibrary + false + Unicode + - - - + + + - - - + + + - - - + + + - - - + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\xml\ - vc_x64_mswud\xml\ + vc_x64_mswud\xml\ ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\xml\ - vc_x64_mswu\xml\ + vc_x64_mswu\xml\ ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\xml\ - vc_x64_mswuddll\xml\ + vc_x64_mswuddll\xml\ true - true + true true - true + true ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\xml\ - vc_x64_mswudll\xml\ + vc_x64_mswudll\xml\ false - false + false true - true + true wxbase30ud_xml - wxbase30ud_xml + wxbase30ud_xml wxbase30u_xml - wxbase30u_xml + wxbase30u_xml wxbase30ud_$(ProjectName)_vc_custom - wxbase30ud_$(ProjectName)_vc_x64_custom + wxbase30ud_$(ProjectName)_vc_x64_custom wxbase30u_$(ProjectName)_vc_custom - wxbase30u_$(ProjectName)_vc_x64_custom + wxbase30u_$(ProjectName)_vc_x64_custom @@ -160,43 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_xmllib.pch - $(OutDir)wxbase30ud_xml.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxbase30ud_xml.lib - true - - - $(OutDir)wx_vc9_xml.bsc - true - - - - - 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) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(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 - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_xmllib.pch + $(OutDir)wxbase30ud_xml.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxbase30ud_xml.lib + true + + + $(OutDir)wx_vc9_xml.bsc + true + + + + + 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) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(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 + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_xmllib.pch $(OutDir)wxbase30ud_xml.pdb Level4 true @@ -232,41 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_xmllib.pch - $(OutDir)wxbase30u_xml.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxbase30u_xml.lib - true - - - $(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) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(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 - true - Use - wx/wxprec.h - vc_mswu\wxprec_xmllib.pch + $(OutDir)wxbase30u_xml.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxbase30u_xml.lib + true + + + $(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) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(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 + true + Use + wx/wxprec.h + vc_mswu\wxprec_xmllib.pch $(OutDir)wxbase30u_xml.pdb Level4 true @@ -330,49 +330,49 @@ 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) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(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 - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_xmldll.pch - $(OutDir)wxbase30ud_xml_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30ud_xml_vc_x64_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - 0x0409 - $(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;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxbase30ud_xml_vc_x64_custom.dll - $(OutDir)wxbase30ud_xml.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxbase30ud_xml_vc_x64_custom.pdb - - - $(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) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(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 + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_xmldll.pch + $(OutDir)wxbase30ud_xml_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30ud_xml_vc_x64_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) + 0x0409 + $(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;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxbase30ud_xml_vc_x64_custom.dll + $(OutDir)wxbase30ud_xml.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxbase30ud_xml_vc_x64_custom.pdb + + + $(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) @@ -417,59 +417,59 @@ 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) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(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 - true - Use - wx/wxprec.h - vc_mswudll\wxprec_xmldll.pch - $(OutDir)wxbase30u_xml_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30u_xml_vc_x64_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - 0x0409 - $(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;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxbase30u_xml_vc_x64_custom.dll - $(OutDir)wxbase30u_xml.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxbase30u_xml_vc_x64_custom.pdb - true - true - - - $(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) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(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 + true + Use + wx/wxprec.h + vc_mswudll\wxprec_xmldll.pch + $(OutDir)wxbase30u_xml_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30u_xml_vc_x64_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) + 0x0409 + $(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;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxbase30u_xml_vc_x64_custom.dll + $(OutDir)wxbase30u_xml.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxbase30u_xml_vc_x64_custom.pdb + true + true + + + $(OutDir)wx_vc9_xml.bsc + true + + Create - Create + Create Create - Create + Create Create - Create + Create Create - Create + Create @@ -477,71 +477,71 @@ true - true + true true - true + true Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) diff --git a/build/msw/wx_vc10_xrc.vcxproj b/build/msw/wx_vc10_xrc.vcxproj index 5124806f6b..f84d3bdb55 100644 --- a/build/msw/wx_vc10_xrc.vcxproj +++ b/build/msw/wx_vc10_xrc.vcxproj @@ -5,34 +5,34 @@ Debug Win32 - - Debug - x64 - + + Debug + x64 + DLL Debug Win32 - - DLL Debug - x64 - + + DLL Debug + x64 + DLL Release Win32 - - DLL Release - x64 - + + DLL Release + x64 + Release Win32 - - Release - x64 - + + Release + x64 + xrc @@ -44,103 +44,103 @@ false Unicode - - DynamicLibrary - false - Unicode - + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode - - DynamicLibrary - false - Unicode - + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode - - StaticLibrary - false - Unicode - + + StaticLibrary + false + Unicode + StaticLibrary false Unicode - - StaticLibrary - false - Unicode - + + StaticLibrary + false + Unicode + - - - + + + - - - + + + - - - + + + - - - + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\xrc\ - vc_x64_mswud\xrc\ + vc_x64_mswud\xrc\ ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\xrc\ - vc_x64_mswu\xrc\ + vc_x64_mswu\xrc\ ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\xrc\ - vc_x64_mswuddll\xrc\ + vc_x64_mswuddll\xrc\ true - true + true true - true + true ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\xrc\ - vc_x64_mswudll\xrc\ + vc_x64_mswudll\xrc\ false - false + false true - true + true wxmsw30ud_xrc - wxmsw30ud_xrc + wxmsw30ud_xrc wxmsw30u_xrc - wxmsw30u_xrc + wxmsw30u_xrc wxmsw30ud_$(ProjectName)_vc_custom - wxmsw30ud_$(ProjectName)_vc_x64_custom + wxmsw30ud_$(ProjectName)_vc_x64_custom wxmsw30u_$(ProjectName)_vc_custom - wxmsw30u_$(ProjectName)_vc_x64_custom + wxmsw30u_$(ProjectName)_vc_x64_custom @@ -160,43 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_xrclib.pch - $(OutDir)wxmsw30ud_xrc.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30ud_xrc.lib - true - - - $(OutDir)wx_vc9_xrc.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(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 - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_xrclib.pch + $(OutDir)wxmsw30ud_xrc.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30ud_xrc.lib + true + + + $(OutDir)wx_vc9_xrc.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(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 + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_xrclib.pch $(OutDir)wxmsw30ud_xrc.pdb Level4 true @@ -232,41 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_xrclib.pch - $(OutDir)wxmsw30u_xrc.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30u_xrc.lib - true - - - $(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) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(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 - true - Use - wx/wxprec.h - vc_mswu\wxprec_xrclib.pch + $(OutDir)wxmsw30u_xrc.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30u_xrc.lib + true + + + $(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) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(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 + true + Use + wx/wxprec.h + vc_mswu\wxprec_xrclib.pch $(OutDir)wxmsw30u_xrc.pdb Level4 true @@ -330,49 +330,49 @@ 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) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(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 - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_xrcdll.pch - $(OutDir)wxmsw30ud_xrc_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_xrc_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - 0x0409 - $(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;$(OutDir)wxmsw30ud_html.lib;$(OutDir)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud_xml.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_xrc_vc_x64_custom.dll - $(OutDir)wxmsw30ud_xrc.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30ud_xrc_vc_x64_custom.pdb - - - $(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) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(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 + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_xrcdll.pch + $(OutDir)wxmsw30ud_xrc_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_xrc_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) + 0x0409 + $(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;$(OutDir)wxmsw30ud_html.lib;$(OutDir)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud_xml.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_xrc_vc_x64_custom.dll + $(OutDir)wxmsw30ud_xrc.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30ud_xrc_vc_x64_custom.pdb + + + $(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) @@ -417,59 +417,59 @@ 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) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(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 - true - Use - wx/wxprec.h - vc_mswudll\wxprec_xrcdll.pch - $(OutDir)wxmsw30u_xrc_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_xrc_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - 0x0409 - $(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;$(OutDir)wxmsw30u_html.lib;$(OutDir)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u_xml.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_xrc_vc_x64_custom.dll - $(OutDir)wxmsw30u_xrc.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30u_xrc_vc_x64_custom.pdb - true - true - - - $(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) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(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 + true + Use + wx/wxprec.h + vc_mswudll\wxprec_xrcdll.pch + $(OutDir)wxmsw30u_xrc_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_xrc_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) + 0x0409 + $(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;$(OutDir)wxmsw30u_html.lib;$(OutDir)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u_xml.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_xrc_vc_x64_custom.dll + $(OutDir)wxmsw30u_xrc.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30u_xrc_vc_x64_custom.pdb + true + true + + + $(OutDir)wx_vc9_xrc.bsc + true + + Create - Create + Create Create - Create + Create Create - Create + Create Create - Create + Create @@ -540,71 +540,71 @@ true - true + true true - true + true Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(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\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs)