X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f3239c2118f2ab27516ee9662a1707ba7d8f9a7b..772513d82432ecf323bca55251551fd5c8a7562d:/build/msw/wx_vc9_media.vcproj
diff --git a/build/msw/wx_vc9_media.vcproj b/build/msw/wx_vc9_media.vcproj
index 8c5505184f..01b98855d4 100644
--- a/build/msw/wx_vc9_media.vcproj
+++ b/build/msw/wx_vc9_media.vcproj
@@ -2,7 +2,7 @@
<!--
This project was generated by
- Bakefile 0.2.6 (http://www.bakefile.org)
+ Bakefile 0.2.9 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,8 +43,8 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
- PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
/>
<Tool
@@ -52,7 +52,7 @@
AdditionalOptions="/MP"
Optimization="0"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
+ PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING"
ExceptionHandling="1"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -62,7 +62,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswud\wxprec_medialib.pch"
ObjectFile="vc_mswud\media\"
- ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_media.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw30ud_media.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -72,7 +72,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
+ PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
/>
@@ -81,7 +81,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmsw29ud_media.lib"
+ OutputFile="..\..\lib\vc_lib\wxmsw30ud_media.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -127,8 +127,8 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
- PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING"
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
/>
<Tool
@@ -136,7 +136,7 @@
AdditionalOptions="/MP"
Optimization="2"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING"
+ PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING"
ExceptionHandling="1"
RuntimeLibrary="2"
RuntimeTypeInfo="true"
@@ -144,7 +144,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswu\wxprec_medialib.pch"
ObjectFile="vc_mswu\media\"
- ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_media.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw30u_media.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -154,7 +154,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
/>
@@ -163,173 +163,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmsw29u_media.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc9_media.bsc"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Universal Debug|Win32"
- OutputDirectory="..\..\lib\vc_lib"
- IntermediateDirectory="vc_mswunivud\media"
- ConfigurationType="4"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCIDLTool"
- PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="/MP"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
- ExceptionHandling="1"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- BufferSecurityCheck="true"
- RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
- PrecompiledHeaderThrough="wx/wxprec.h"
- PrecompiledHeaderFile="vc_mswunivud\wxprec_medialib.pch"
- ObjectFile="vc_mswunivud\media\"
- ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_media.pdb"
- WarningLevel="4"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_media.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_lib\wx_vc9_media.bsc"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Universal Release|Win32"
- OutputDirectory="..\..\lib\vc_lib"
- IntermediateDirectory="vc_mswunivu\media"
- ConfigurationType="4"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCIDLTool"
- PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="/MP"
- Optimization="2"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
- ExceptionHandling="1"
- RuntimeLibrary="2"
- RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
- PrecompiledHeaderThrough="wx/wxprec.h"
- PrecompiledHeaderFile="vc_mswunivu\wxprec_medialib.pch"
- ObjectFile="vc_mswunivu\media\"
- ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_media.pdb"
- WarningLevel="4"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxmswuniv29u_media.lib"
+ OutputFile="..\..\lib\vc_lib\wxmsw30u_media.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -375,8 +209,8 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
- PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA"
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="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"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
/>
<Tool
@@ -384,7 +218,7 @@
AdditionalOptions="/MP"
Optimization="0"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA"
+ PreprocessorDefinitions="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"
ExceptionHandling="1"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -394,7 +228,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_mediadll.pch"
ObjectFile="vc_mswuddll\media\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw291ud_media_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw30ud_media_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -404,7 +238,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw291ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
+ PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
/>
@@ -414,15 +248,15 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
- AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw291ud_media_vc_custom.dll"
+ AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw30ud_core.lib ..\..\lib\vc_dll\wxbase30ud.lib"
+ OutputFile="..\..\lib\vc_dll\wxmsw30ud_media_vc_custom.dll"
LinkIncremental="2"
- ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_media.lib"
+ ImportLibrary="..\..\lib\vc_dll\wxmsw30ud_media.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291ud_media_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw30ud_media_vc_custom.pdb"
TargetMachine="1"
/>
<Tool
@@ -468,8 +302,8 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
- Name="VCIDLTool"
- PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA"
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="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"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
/>
<Tool
@@ -477,7 +311,7 @@
AdditionalOptions="/MP"
Optimization="2"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA"
+ PreprocessorDefinitions="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"
ExceptionHandling="1"
RuntimeLibrary="2"
RuntimeTypeInfo="true"
@@ -485,7 +319,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_mediadll.pch"
ObjectFile="vc_mswudll\media\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw291u_media_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw30u_media_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -495,7 +329,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw291u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
/>
@@ -505,200 +339,18 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw291u_media_vc_custom.dll"
- LinkIncremental="2"
- ImportLibrary="..\..\lib\vc_dll\wxmsw29u_media.lib"
+ AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw30u_core.lib ..\..\lib\vc_dll\wxbase30u.lib"
+ OutputFile="..\..\lib\vc_dll\wxmsw30u_media_vc_custom.dll"
+ LinkIncremental="1"
+ ImportLibrary="..\..\lib\vc_dll\wxmsw30u_media.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_media_vc_custom.pdb"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc9_media.bsc"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLL Universal Debug|Win32"
- OutputDirectory="..\..\lib\vc_dll"
- IntermediateDirectory="vc_mswunivuddll\media"
- ConfigurationType="2"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCIDLTool"
- PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="/MP"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA"
- ExceptionHandling="1"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- BufferSecurityCheck="true"
- RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
- PrecompiledHeaderThrough="wx/wxprec.h"
- PrecompiledHeaderFile="vc_mswunivuddll\wxprec_mediadll.pch"
- ObjectFile="vc_mswunivuddll\media\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv291ud_media_vc_custom.pdb"
- WarningLevel="4"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv291ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalOptions=""
- AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
- OutputFile="..\..\lib\vc_dll\wxmswuniv291ud_media_vc_custom.dll"
- LinkIncremental="2"
- ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_media.lib"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateManifest="true"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291ud_media_vc_custom.pdb"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- OutputFile="..\..\lib\vc_dll\wx_vc9_media.bsc"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLL Universal Release|Win32"
- OutputDirectory="..\..\lib\vc_dll"
- IntermediateDirectory="vc_mswunivudll\media"
- ConfigurationType="2"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCIDLTool"
- PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="/MP"
- Optimization="2"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA"
- ExceptionHandling="1"
- RuntimeLibrary="2"
- RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
- PrecompiledHeaderThrough="wx/wxprec.h"
- PrecompiledHeaderFile="vc_mswunivudll\wxprec_mediadll.pch"
- ObjectFile="vc_mswunivudll\media\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv291u_media_vc_custom.pdb"
- WarningLevel="4"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv291u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalOptions=""
- AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
- OutputFile="..\..\lib\vc_dll\wxmswuniv291u_media_vc_custom.dll"
- LinkIncremental="2"
- ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_media.lib"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateManifest="true"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_media_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw30u_media_vc_custom.pdb"
TargetMachine="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
/>
<Tool
Name="VCALinkTool"
@@ -749,22 +401,6 @@
UsePrecompiledHeader="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Universal Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Universal Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="1"
- />
- </FileConfiguration>
<FileConfiguration
Name="DLL Debug|Win32"
>
@@ -781,22 +417,6 @@
UsePrecompiledHeader="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="DLL Universal Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="DLL Universal Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="1"
- />
- </FileConfiguration>
</File>
<File
RelativePath="..\..\src\common\mediactrlcmn.cpp"
@@ -830,80 +450,12 @@
Name="Release|Win32"
ExcludedFromBuild="true"
/>
- <FileConfiguration
- Name="Universal Debug|Win32"
- ExcludedFromBuild="true"
- />
- <FileConfiguration
- Name="Universal Release|Win32"
- ExcludedFromBuild="true"
- />
</File>
</Filter>
<Filter
Name="Setup Headers"
UniqueIdentifier="{63537534-1833-5C1F-8DBD-359A84F294C8}"
>
- <File
- RelativePath="..\..\include\wx\univ\setup.h"
- >
- <FileConfiguration
- Name="Debug|Win32"
- />
- <FileConfiguration
- Name="Release|Win32"
- />
- <FileConfiguration
- Name="Universal Debug|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h"
- Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Universal Release|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h"
- Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="DLL Debug|Win32"
- />
- <FileConfiguration
- Name="DLL Release|Win32"
- />
- <FileConfiguration
- Name="DLL Universal Debug|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h"
- Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="DLL Universal Release|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h"
- Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""
- />
- </FileConfiguration>
- </File>
<File
RelativePath="..\..\include\wx\msw\setup.h"
>
@@ -915,7 +467,6 @@
Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"
CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h"
Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""
/>
</FileConfiguration>
<FileConfiguration
@@ -926,15 +477,8 @@
Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"
CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h"
Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""
/>
</FileConfiguration>
- <FileConfiguration
- Name="Universal Debug|Win32"
- />
- <FileConfiguration
- Name="Universal Release|Win32"
- />
<FileConfiguration
Name="DLL Debug|Win32"
>
@@ -943,7 +487,6 @@
Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"
CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h"
Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""
/>
</FileConfiguration>
<FileConfiguration
@@ -954,14 +497,23 @@
Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"
CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h"
Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""
/>
</FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\..\include\wx\univ\setup.h"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ />
+ <FileConfiguration
+ Name="Release|Win32"
+ />
<FileConfiguration
- Name="DLL Universal Debug|Win32"
+ Name="DLL Debug|Win32"
/>
<FileConfiguration
- Name="DLL Universal Release|Win32"
+ Name="DLL Release|Win32"
/>
</File>
</Filter>
@@ -994,28 +546,6 @@
AdditionalDependencies=""..\..\lib\vc_lib\mswu\wx\msw""
/>
</FileConfiguration>
- <FileConfiguration
- Name="Universal Debug|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
- CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h""
- Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
- AdditionalDependencies=""..\..\lib\vc_lib\mswunivud\wx\msw""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Universal Release|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- Description="Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
- CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h""
- Outputs="..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
- AdditionalDependencies=""..\..\lib\vc_lib\mswunivu\wx\msw""
- />
- </FileConfiguration>
<FileConfiguration
Name="DLL Debug|Win32"
>
@@ -1038,28 +568,6 @@
AdditionalDependencies=""..\..\lib\vc_dll\mswu\wx\msw""
/>
</FileConfiguration>
- <FileConfiguration
- Name="DLL Universal Debug|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
- CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h""
- Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
- AdditionalDependencies=""..\..\lib\vc_dll\mswunivud\wx\msw""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="DLL Universal Release|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- Description="Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
- CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h""
- Outputs="..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
- AdditionalDependencies=""..\..\lib\vc_dll\mswunivu\wx\msw""
- />
- </FileConfiguration>
</File>
</Filter>
<Filter