X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=VisualStudio%2F2008%2Ffreeglut.vcproj;h=a05a47d9f6f77e879953b734eb6e8d3ed8c961a0;hb=b29d44e0b19fc28021b9ecf2da354c1225b64cfb;hp=c5a01ccce140dfa0c7596b156b770a3ce5f9c2d0;hpb=b680ece5cdc46f3e51933599ed56df08f91102fc;p=freeglut

diff --git a/VisualStudio/2008/freeglut.vcproj b/VisualStudio/2008/freeglut.vcproj
index c5a01cc..a05a47d 100644
--- a/VisualStudio/2008/freeglut.vcproj
+++ b/VisualStudio/2008/freeglut.vcproj
@@ -11,14 +11,17 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)build\$(ConfigurationName)"
-			IntermediateDirectory="build\$(ConfigurationName)"
+			OutputDirectory="..\..\lib\x86\Debug\"
+			IntermediateDirectory="build\$(ConfigurationName)\$(PlatformName)_vs90\"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			CharacterSet="2"
@@ -42,12 +45,14 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\include"
-				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;FREEGLUT_EXPORTS;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;FREEGLUT_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				WarningLevel="3"
 				DebugInformationFormat="4"
+				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -64,10 +69,9 @@
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)\$(ProjectName).dll"
 				LinkIncremental="2"
-				ModuleDefinitionFile="..\..\src\freeglutdll.def"
+				ModuleDefinitionFile="..\..\src\Common\freeglutdll.def"
 				GenerateDebugInformation="true"
 				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
 				ImportLibrary="$(OutDir)\$(ProjectName).lib"
 				TargetMachine="1"
 			/>
@@ -91,13 +95,90 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="for %%I in ($(TargetDir)\$(TargetName)$(TargetExt) $(TargetDir)\$(TargetName).lib $(TargetDir)\$(TargetName).exp) do xcopy /F /Y %%I ..\..\lib\Debug\"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="..\..\lib\x64\Debug"
+			IntermediateDirectory="build\$(ConfigurationName)\$(PlatformName)_vs90\"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\include"
+				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;FREEGLUT_EXPORTS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="1"
+				DisableSpecificWarnings="4996"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\$(ProjectName).dll"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				RandomizedBaseAddress="1"
+				ImportLibrary="$(OutDir)\$(ProjectName).lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Debug_Static|Win32"
-			OutputDirectory="$(SolutionDir)build\$(ConfigurationName)"
-			IntermediateDirectory="build\$(ConfigurationName)"
+			OutputDirectory="..\..\lib\x86\Debug\"
+			IntermediateDirectory="build\$(ConfigurationName)\$(PlatformName)_vs90\"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			CharacterSet="2"
@@ -121,13 +202,82 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\include"
-				PreprocessorDefinitions="_DEBUG;FREEGLUT_STATIC;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="_DEBUG;FREEGLUT_STATIC;WIN32;_LIB"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				BrowseInformation="1"
+				ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
 				WarningLevel="3"
 				DebugInformationFormat="4"
+				CompileAs="1"
+				DisableSpecificWarnings="4996"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\freeglut_static.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug_Static|x64"
+			OutputDirectory="..\..\lib\x64\Debug"
+			IntermediateDirectory="build\$(ConfigurationName)\$(PlatformName)_vs90\"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\include"
+				PreprocessorDefinitions="_DEBUG;FREEGLUT_STATIC;WIN32;_LIB"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -158,13 +308,12 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="xcopy /F /Y $(TargetDir)\$(TargetName)$(TargetExt) ..\..\lib\Debug\"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)build\$(ConfigurationName)"
-			IntermediateDirectory="build\$(ConfigurationName)"
+			OutputDirectory="..\..\lib\x86\"
+			IntermediateDirectory="build\$(ConfigurationName)\$(PlatformName)_vs90\"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			CharacterSet="2"
@@ -188,12 +337,15 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
+				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\..\include"
-				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;FREEGLUT_EXPORTS;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;FREEGLUT_EXPORTS"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
+				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -209,10 +361,8 @@
 			<Tool
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)\$(ProjectName).dll"
-				LinkIncremental="1"
-				ModuleDefinitionFile="..\..\src\freeglutdll.def"
+				ModuleDefinitionFile="..\..\src\Common\freeglutdll.def"
 				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
 				ImportLibrary="$(OutDir)\$(ProjectName).lib"
 				TargetMachine="1"
 			/>
@@ -236,16 +386,93 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="for %%I in ($(TargetDir)\$(TargetName)$(TargetExt) $(TargetDir)\$(TargetName).lib $(TargetDir)\$(TargetName).exp) do xcopy /F /Y %%I ..\..\lib\Release\"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="..\..\lib\x64\"
+			IntermediateDirectory="build\$(ConfigurationName)\$(PlatformName)_vs90\"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..\..\include"
+				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;FREEGLUT_EXPORTS"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				CompileAs="1"
+				DisableSpecificWarnings="4996"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\$(ProjectName).dll"
+				RandomizedBaseAddress="1"
+				ImportLibrary="$(OutDir)\$(ProjectName).lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Release_Static|Win32"
-			OutputDirectory="$(SolutionDir)build\$(ConfigurationName)"
-			IntermediateDirectory="build\$(ConfigurationName)"
+			OutputDirectory="..\..\lib\x86\"
+			IntermediateDirectory="build\$(ConfigurationName)\$(PlatformName)_vs90\"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			CharacterSet="2"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -265,14 +492,83 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				InlineFunctionExpansion="1"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\..\include"
-				PreprocessorDefinitions="NDEBUG;FREEGLUT_STATIC;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS"
-				StringPooling="true"
+				PreprocessorDefinitions="NDEBUG;FREEGLUT_STATIC;WIN32;_LIB"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
-				SuppressStartupBanner="true"
+				CompileAs="1"
+				DisableSpecificWarnings="4996"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\freeglut_static.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release_Static|x64"
+			OutputDirectory="..\..\lib\x64\"
+			IntermediateDirectory="build\$(ConfigurationName)\$(PlatformName)_vs90\"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..\..\include"
+				PreprocessorDefinitions="NDEBUG;FREEGLUT_STATIC;WIN32;_LIB"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -303,7 +599,6 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="xcopy /F /Y $(TargetDir)\$(TargetName)$(TargetExt) ..\..\lib\Release\"
 			/>
 		</Configuration>
 	</Configurations>
@@ -314,104 +609,156 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
+            <Filter
+                Name="mswin"
+                >
+                <File
+                    RelativePath="..\..\src\mswin\freeglut_cursor_mswin.c"
+                    >
+                </File>
+                <File
+                    RelativePath="..\..\src\mswin\freeglut_display_mswin.c"
+                    >
+                </File>
+                <File
+                    RelativePath="..\..\src\mswin\freeglut_ext_mswin.c"
+                    >
+                </File>
+                <File
+                    RelativePath="..\..\src\mswin\freeglut_gamemode_mswin.c"
+                    >
+                </File>
+                <File
+                    RelativePath="..\..\src\mswin\freeglut_init_mswin.c"
+                    >
+                </File>
+                <File
+                    RelativePath="..\..\src\mswin\freeglut_input_devices_mswin.c"
+                    >
+                </File>
+                <File
+                    RelativePath="..\..\src\mswin\freeglut_joystick_mswin.c"
+                    >
+                </File>
+                <File
+                    RelativePath="..\..\src\mswin\freeglut_main_mswin.c"
+                    >
+                </File>
+                <File
+                    RelativePath="..\..\src\mswin\freeglut_menu_mswin.c"
+                    >
+                </File>
+                <File
+                    RelativePath="..\..\src\mswin\freeglut_spaceball_mswin.c"
+                    >
+                </File>
+                <File
+                    RelativePath="..\..\src\mswin\freeglut_state_mswin.c"
+                    >
+                </File>
+                <File
+                    RelativePath="..\..\src\mswin\freeglut_structure_mswin.c"
+                    >
+                </File>
+                <File
+                    RelativePath="..\..\src\mswin\freeglut_window_mswin.c"
+                    >
+                </File>
+            </Filter>
 			<File
-				RelativePath="..\..\src\freeglut_callbacks.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\freeglut_cursor.c"
+				RelativePath="..\..\src\Common\freeglut_callbacks.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\freeglut_display.c"
+				RelativePath="..\..\src\Common\freeglut_cursor.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\freeglut_ext.c"
+				RelativePath="..\..\src\Common\freeglut_display.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\freeglut_font.c"
+				RelativePath="..\..\src\Common\freeglut_ext.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\freeglut_font_data.c"
+				RelativePath="..\..\src\Common\freeglut_font.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\freeglut_gamemode.c"
+				RelativePath="..\..\src\Common\freeglut_font_data.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\freeglut_geometry.c"
+				RelativePath="..\..\src\Common\freeglut_gamemode.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\freeglut_glutfont_definitions.c"
+				RelativePath="..\..\src\Common\freeglut_geometry.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\freeglut_init.c"
+				RelativePath="..\..\src\Common\freeglut_init.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\freeglut_input_devices.c"
+				RelativePath="..\..\src\Common\freeglut_input_devices.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\freeglut_joystick.c"
+				RelativePath="..\..\src\Common\freeglut_joystick.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\freeglut_main.c"
+				RelativePath="..\..\src\Common\freeglut_main.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\freeglut_menu.c"
+				RelativePath="..\..\src\Common\freeglut_menu.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\freeglut_misc.c"
+				RelativePath="..\..\src\Common\freeglut_misc.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\freeglut_overlay.c"
+				RelativePath="..\..\src\Common\freeglut_overlay.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\freeglut_spaceball.c"
+				RelativePath="..\..\src\Common\freeglut_spaceball.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\freeglut_state.c"
+				RelativePath="..\..\src\Common\freeglut_state.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\freeglut_stroke_mono_roman.c"
+				RelativePath="..\..\src\Common\freeglut_stroke_mono_roman.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\freeglut_stroke_roman.c"
+				RelativePath="..\..\src\Common\freeglut_stroke_roman.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\freeglut_structure.c"
+				RelativePath="..\..\src\Common\freeglut_structure.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\freeglut_teapot.c"
+				RelativePath="..\..\src\Common\freeglut_teapot.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\freeglut_videoresize.c"
+				RelativePath="..\..\src\Common\freeglut_videoresize.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\freeglut_window.c"
+				RelativePath="..\..\src\Common\freeglut_window.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\freeglutdll.def"
+				RelativePath="..\..\src\Common\freeglutdll.def"
 				>
 			</File>
 		</Filter>
@@ -428,7 +775,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\freeglut_internal.h"
+				RelativePath="..\..\src\Common\freeglut_internal.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\mswin\freeglut_internal_mswin.h"
 				>
 			</File>
 			<File
@@ -436,7 +787,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\freeglut_teapot_data.h"
+				RelativePath="..\..\src\Common\freeglut_teapot_data.h"
 				>
 			</File>
 			<File