X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c88a264a08a023e9544b684fd2dc28e8dd7b1c7d..9e1da4827a0ec18f9766d664b9af12c25e3f71fb:/build/msw/wx_vc7_gl.vcproj
diff --git a/build/msw/wx_vc7_gl.vcproj b/build/msw/wx_vc7_gl.vcproj
index 66ee451ee3..3ce8fb5c78 100644
--- a/build/msw/wx_vc7_gl.vcproj
+++ b/build/msw/wx_vc7_gl.vcproj
@@ -1,8 +1,8 @@
-
+
@@ -17,226 +17,238 @@
+ Name="VCCLCompilerTool"
+ 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__;_UNICODE;WXBUILDING"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
+ UsePrecompiledHeader="3"
+ PrecompiledHeaderThrough="wx/wxprec.h"
+ PrecompiledHeaderFile="vc_mswud\wxprec_gllib.pch"
+ ObjectFile="vc_mswud\gl\"
+ ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_gl.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmsw29ud_gl.lib"
+ SuppressStartupBanner="TRUE"/>
+
+
+
+
+
+ Name="VCXMLDataGeneratorTool"/>
+
+
+
+
+
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
+ Name="VCCustomBuildTool"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmsw29u_gl.lib"
+ SuppressStartupBanner="TRUE"/>
+
+
+
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__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"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCXMLDataGeneratorTool"/>
+ Name="VCWebDeploymentTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-
-
-
-
-
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
+ Name="VCCustomBuildTool"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_gl.lib"
+ SuppressStartupBanner="TRUE"/>
+
+
+
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCXMLDataGeneratorTool"/>
+ Name="VCWebDeploymentTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-
-
-
-
-
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
+ Name="VCCustomBuildTool"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxmswuniv29u_gl.lib"
+ SuppressStartupBanner="TRUE"/>
+
+
+
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCXMLDataGeneratorTool"/>
+ Name="VCWebDeploymentTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-
-
-
-
-
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
-
-
+ Name="VCCustomBuildTool"/>
-
-
-
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
-
-
-
-
-
-
-
+ Name="VCPreLinkEventTool"/>
-
-
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCXMLDataGeneratorTool"/>
+ Name="VCWebDeploymentTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCCLCompilerTool"
+ 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__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
+ UsePrecompiledHeader="3"
+ PrecompiledHeaderThrough="wx/wxprec.h"
+ PrecompiledHeaderFile="vc_mswudll\wxprec_gldll.pch"
+ ObjectFile="vc_mswudll\gl\"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw295u_gl_vc_custom.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
+ 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 wxmsw29u_core.lib wxbase29u.lib opengl32.lib glu32.lib"
+ OutputFile="..\..\lib\vc_dll\wxmsw295u_gl_vc_custom.dll"
+ LinkIncremental="1"
+ ImportLibrary="..\..\lib\vc_dll\wxmsw29u_gl.lib"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories="..\..\lib\vc_dll"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw295u_gl_vc_custom.pdb"
+ TargetMachine="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"/>
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+ Name="VCPostBuildEventTool"/>
+ Name="VCPreBuildEventTool"/>
+ Name="VCPreLinkEventTool"/>
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
-
-
+ Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCXMLDataGeneratorTool"/>
+ Name="VCWebDeploymentTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-
-
-
-
-
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
+ Name="VCCustomBuildTool"/>
+ 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 wxmswuniv29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib"
+ OutputFile="..\..\lib\vc_dll\wxmswuniv295ud_gl_vc_custom.dll"
+ LinkIncremental="2"
+ ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_gl.lib"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories="..\..\lib\vc_dll"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv295ud_gl_vc_custom.pdb"
+ TargetMachine="1"/>
+
+
+
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv295ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
+ Culture="1033"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+ Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCXMLDataGeneratorTool"/>
+ Name="VCWebDeploymentTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCCLCompilerTool"
+ 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__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
+ UsePrecompiledHeader="3"
+ PrecompiledHeaderThrough="wx/wxprec.h"
+ PrecompiledHeaderFile="vc_mswunivudll\wxprec_gldll.pch"
+ ObjectFile="vc_mswunivudll\gl\"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv295u_gl_vc_custom.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="TRUE"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
+ 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 wxmswuniv29u_core.lib wxbase29u.lib opengl32.lib glu32.lib"
+ OutputFile="..\..\lib\vc_dll\wxmswuniv295u_gl_vc_custom.dll"
+ LinkIncremental="1"
+ ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_gl.lib"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories="..\..\lib\vc_dll"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv295u_gl_vc_custom.pdb"
+ TargetMachine="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"/>
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+ Name="VCPostBuildEventTool"/>
+ Name="VCPreBuildEventTool"/>
+ Name="VCPreLinkEventTool"/>
-
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
-
+ Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCXMLDataGeneratorTool"/>
+ Name="VCWebDeploymentTool"/>
+ Name="VCManagedWrapperGeneratorTool"/>
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
@@ -587,173 +531,167 @@
+ Name="Debug|Win32">
+ Name="Release|Win32">
+ Name="Universal Debug|Win32">
+ Name="Universal Release|Win32">
+ Name="DLL Debug|Win32">
+ Name="DLL Release|Win32">
+ Name="DLL Universal Debug|Win32">
+ Name="DLL Universal Release|Win32">
+ RelativePath="..\..\src\common\glcmn.cpp">
+
+ RelativePath="..\..\src\msw\glcanvas.cpp">
+
-
+ Name="Debug|Win32"
+ ExcludedFromBuild="TRUE"/>
+ ExcludedFromBuild="TRUE"/>
+ Name="Universal Debug|Win32"
+ ExcludedFromBuild="TRUE"/>
+
+ RelativePath="..\..\include\wx\msw\setup.h">
+ Name="Debug|Win32">
+ 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"/>
+ Name="Release|Win32">
+ 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"/>
+ Name="Universal Debug|Win32"/>
+ Name="Universal Release|Win32"/>
+ Name="DLL Debug|Win32">
+ 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"/>
+ Name="DLL Release|Win32">
+ 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"/>
+ Name="DLL Universal Debug|Win32"/>
+ Name="DLL Universal Release|Win32"/>
+ RelativePath="..\..\include\wx\univ\setup.h">
+ Name="Debug|Win32"/>
+ Name="Release|Win32"/>
+ Name="Universal Debug|Win32">
+ 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"/>
+ Name="Universal Release|Win32">
+ 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"/>
+ Name="DLL Debug|Win32"/>
+ Name="DLL Release|Win32"/>
+ Name="DLL Universal Debug|Win32">
+ 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"/>
+ Name="DLL Universal Release|Win32">
+ 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"/>
@@ -763,40 +701,31 @@
-
-
-
+ Name="Debug|Win32">
+ Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
+ CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h""
+ Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
+ AdditionalDependencies=""..\..\lib\vc_lib\mswud\wx\msw""/>
+ Name="Release|Win32">
+ Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
+ CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h""
+ Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
+ AdditionalDependencies=""..\..\lib\vc_lib\mswu\wx\msw""/>
+ Name="Universal Debug|Win32">
+ 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""/>
@@ -808,41 +737,52 @@
AdditionalDependencies=""..\..\lib\vc_lib\mswunivu\wx\msw""/>
+ Name="DLL Debug|Win32">
+ Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
+ CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h""
+ Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
+ AdditionalDependencies=""..\..\lib\vc_dll\mswud\wx\msw""/>
+ Name="DLL Release|Win32">
+ Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
+ CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h""
+ Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
+ AdditionalDependencies=""..\..\lib\vc_dll\mswu\wx\msw""/>
+ Name="DLL Universal Debug|Win32">
+ 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""/>
+
+
+
+ RelativePath="..\..\include\wx\msw\glcanvas.h">
+
+ RelativePath="..\..\include\wx\glcanvas.h">
+