projects / freeglut / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fixing a build warning in OpenSUSE about control reaching the end of a non-void funct...
[freeglut] / VisualStudio / 2008 / freeglut.vcproj
diff --git a/VisualStudio/2008/freeglut.vcproj b/VisualStudio/2008/freeglut.vcproj
index b62c1b1..a05a47d 100644 (file)
--- a/VisualStudio/2008/freeglut.vcproj
+++ b/VisualStudio/2008/freeglut.vcproj
@@ -11,14 +11,17 @@
                <Platform\r
                        Name="Win32"\r
                />\r
+               <Platform\r
+                       Name="x64"\r
+               />\r
        </Platforms>\r
        <ToolFiles>\r
        </ToolFiles>\r
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       OutputDirectory="$(SolutionDir)build\$(ConfigurationName)"\r
-                       IntermediateDirectory="build\$(ConfigurationName)"\r
+                       OutputDirectory="..\..\lib\x86\Debug\"\r
+                       IntermediateDirectory="build\$(ConfigurationName)\$(PlatformName)_vs90\"\r
                        ConfigurationType="2"\r
                        UseOfMFC="0"\r
                        CharacterSet="2"\r
@@ -66,10 +69,9 @@
                                Name="VCLinkerTool"\r
                                OutputFile="$(OutDir)\$(ProjectName).dll"\r
                                LinkIncremental="2"\r
-                               ModuleDefinitionFile="..\..\src\freeglutdll.def"\r
+                               ModuleDefinitionFile="..\..\src\Common\freeglutdll.def"\r
                                GenerateDebugInformation="true"\r
                                RandomizedBaseAddress="1"\r
-                               DataExecutionPrevention="0"\r
                                ImportLibrary="$(OutDir)\$(ProjectName).lib"\r
                                TargetMachine="1"\r
                        />\r
@@ -93,13 +95,90 @@
                        />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
-                               CommandLine="for %%I in ($(TargetDir)\$(TargetName)$(TargetExt) $(TargetDir)\$(TargetName).lib $(TargetDir)\$(TargetName).exp) do xcopy /F /Y %%I ..\..\lib\Debug\"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Debug|x64"\r
+                       OutputDirectory="..\..\lib\x64\Debug"\r
+                       IntermediateDirectory="build\$(ConfigurationName)\$(PlatformName)_vs90\"\r
+                       ConfigurationType="2"\r
+                       UseOfMFC="0"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\include"\r
+                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;FREEGLUT_EXPORTS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                               CompileAs="1"\r
+                               DisableSpecificWarnings="4996"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG"\r
+                               Culture="1033"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               OutputFile="$(OutDir)\$(ProjectName).dll"\r
+                               LinkIncremental="2"\r
+                               GenerateDebugInformation="true"\r
+                               RandomizedBaseAddress="1"\r
+                               ImportLibrary="$(OutDir)\$(ProjectName).lib"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
                        />\r
                </Configuration>\r
                <Configuration\r
                        Name="Debug_Static|Win32"\r
-                       OutputDirectory="$(SolutionDir)build\$(ConfigurationName)"\r
-                       IntermediateDirectory="build\$(ConfigurationName)"\r
+                       OutputDirectory="..\..\lib\x86\Debug\"\r
+                       IntermediateDirectory="build\$(ConfigurationName)\$(PlatformName)_vs90\"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        CharacterSet="2"\r
@@ -127,6 +206,7 @@
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="1"\r
+                               ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="4"\r
                                CompileAs="1"\r
@@ -161,13 +241,79 @@
                        />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
-                               CommandLine="xcopy /F /Y $(TargetDir)\$(TargetName)$(TargetExt) ..\..\lib\Debug\"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Debug_Static|x64"\r
+                       OutputDirectory="..\..\lib\x64\Debug"\r
+                       IntermediateDirectory="build\$(ConfigurationName)\$(PlatformName)_vs90\"\r
+                       ConfigurationType="4"\r
+                       UseOfMFC="0"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\include"\r
+                               PreprocessorDefinitions="_DEBUG;FREEGLUT_STATIC;WIN32;_LIB"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="1"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                               CompileAs="1"\r
+                               DisableSpecificWarnings="4996"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG"\r
+                               Culture="1033"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="$(OutDir)\freeglut_static.lib"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
                        />\r
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       OutputDirectory="$(SolutionDir)build\$(ConfigurationName)"\r
-                       IntermediateDirectory="build\$(ConfigurationName)"\r
+                       OutputDirectory="..\..\lib\x86\"\r
+                       IntermediateDirectory="build\$(ConfigurationName)\$(PlatformName)_vs90\"\r
                        ConfigurationType="2"\r
                        UseOfMFC="0"\r
                        CharacterSet="2"\r
@@ -215,10 +361,8 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                OutputFile="$(OutDir)\$(ProjectName).dll"\r
-                               LinkIncremental="1"\r
-                               ModuleDefinitionFile="..\..\src\freeglutdll.def"\r
+                               ModuleDefinitionFile="..\..\src\Common\freeglutdll.def"\r
                                RandomizedBaseAddress="1"\r
-                               DataExecutionPrevention="0"\r
                                ImportLibrary="$(OutDir)\$(ProjectName).lib"\r
                                TargetMachine="1"\r
                        />\r
@@ -242,13 +386,157 @@
                        />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
-                               CommandLine="for %%I in ($(TargetDir)\$(TargetName)$(TargetExt) $(TargetDir)\$(TargetName).lib $(TargetDir)\$(TargetName).exp) do xcopy /F /Y %%I ..\..\lib\Release\"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|x64"\r
+                       OutputDirectory="..\..\lib\x64\"\r
+                       IntermediateDirectory="build\$(ConfigurationName)\$(PlatformName)_vs90\"\r
+                       ConfigurationType="2"\r
+                       UseOfMFC="0"\r
+                       CharacterSet="2"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="2"\r
+                               InlineFunctionExpansion="2"\r
+                               EnableIntrinsicFunctions="true"\r
+                               AdditionalIncludeDirectories="..\..\include"\r
+                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;FREEGLUT_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               EnableFunctionLevelLinking="true"\r
+                               WarningLevel="3"\r
+                               CompileAs="1"\r
+                               DisableSpecificWarnings="4996"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="NDEBUG"\r
+                               Culture="1033"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               OutputFile="$(OutDir)\$(ProjectName).dll"\r
+                               RandomizedBaseAddress="1"\r
+                               ImportLibrary="$(OutDir)\$(ProjectName).lib"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
                        />\r
                </Configuration>\r
                <Configuration\r
                        Name="Release_Static|Win32"\r
-                       OutputDirectory="$(SolutionDir)build\$(ConfigurationName)"\r
-                       IntermediateDirectory="build\$(ConfigurationName)"\r
+                       OutputDirectory="..\..\lib\x86\"\r
+                       IntermediateDirectory="build\$(ConfigurationName)\$(PlatformName)_vs90\"\r
+                       ConfigurationType="4"\r
+                       UseOfMFC="0"\r
+                       CharacterSet="2"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="2"\r
+                               InlineFunctionExpansion="2"\r
+                               EnableIntrinsicFunctions="true"\r
+                               AdditionalIncludeDirectories="..\..\include"\r
+                               PreprocessorDefinitions="NDEBUG;FREEGLUT_STATIC;WIN32;_LIB"\r
+                               RuntimeLibrary="0"\r
+                               EnableFunctionLevelLinking="true"\r
+                               WarningLevel="3"\r
+                               CompileAs="1"\r
+                               DisableSpecificWarnings="4996"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="NDEBUG"\r
+                               Culture="1033"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="$(OutDir)\freeglut_static.lib"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release_Static|x64"\r
+                       OutputDirectory="..\..\lib\x64\"\r
+                       IntermediateDirectory="build\$(ConfigurationName)\$(PlatformName)_vs90\"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        CharacterSet="2"\r
@@ -311,7 +599,6 @@
                        />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
-                               CommandLine="xcopy /F /Y $(TargetDir)\$(TargetName)$(TargetExt) ..\..\lib\Release\"\r
                        />\r
                </Configuration>\r
        </Configurations>\r
@@ -322,104 +609,156 @@
                        Name="Source Files"\r
                        Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
                        >\r
+            <Filter\r
+                Name="mswin"\r
+                >\r
+                <File\r
+                    RelativePath="..\..\src\mswin\freeglut_cursor_mswin.c"\r
+                    >\r
+                </File>\r
+                <File\r
+                    RelativePath="..\..\src\mswin\freeglut_display_mswin.c"\r
+                    >\r
+                </File>\r
+                <File\r
+                    RelativePath="..\..\src\mswin\freeglut_ext_mswin.c"\r
+                    >\r
+                </File>\r
+                <File\r
+                    RelativePath="..\..\src\mswin\freeglut_gamemode_mswin.c"\r
+                    >\r
+                </File>\r
+                <File\r
+                    RelativePath="..\..\src\mswin\freeglut_init_mswin.c"\r
+                    >\r
+                </File>\r
+                <File\r
+                    RelativePath="..\..\src\mswin\freeglut_input_devices_mswin.c"\r
+                    >\r
+                </File>\r
+                <File\r
+                    RelativePath="..\..\src\mswin\freeglut_joystick_mswin.c"\r
+                    >\r
+                </File>\r
+                <File\r
+                    RelativePath="..\..\src\mswin\freeglut_main_mswin.c"\r
+                    >\r
+                </File>\r
+                <File\r
+                    RelativePath="..\..\src\mswin\freeglut_menu_mswin.c"\r
+                    >\r
+                </File>\r
+                <File\r
+                    RelativePath="..\..\src\mswin\freeglut_spaceball_mswin.c"\r
+                    >\r
+                </File>\r
+                <File\r
+                    RelativePath="..\..\src\mswin\freeglut_state_mswin.c"\r
+                    >\r
+                </File>\r
+                <File\r
+                    RelativePath="..\..\src\mswin\freeglut_structure_mswin.c"\r
+                    >\r
+                </File>\r
+                <File\r
+                    RelativePath="..\..\src\mswin\freeglut_window_mswin.c"\r
+                    >\r
+                </File>\r
+            </Filter>\r
                        <File\r
-                               RelativePath="..\..\src\freeglut_callbacks.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\freeglut_cursor.c"\r
+                               RelativePath="..\..\src\Common\freeglut_callbacks.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\freeglut_display.c"\r
+                               RelativePath="..\..\src\Common\freeglut_cursor.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\freeglut_ext.c"\r
+                               RelativePath="..\..\src\Common\freeglut_display.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\freeglut_font.c"\r
+                               RelativePath="..\..\src\Common\freeglut_ext.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\freeglut_font_data.c"\r
+                               RelativePath="..\..\src\Common\freeglut_font.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\freeglut_gamemode.c"\r
+                               RelativePath="..\..\src\Common\freeglut_font_data.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\freeglut_geometry.c"\r
+                               RelativePath="..\..\src\Common\freeglut_gamemode.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\freeglut_glutfont_definitions.c"\r
+                               RelativePath="..\..\src\Common\freeglut_geometry.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\freeglut_init.c"\r
+                               RelativePath="..\..\src\Common\freeglut_init.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\freeglut_input_devices.c"\r
+                               RelativePath="..\..\src\Common\freeglut_input_devices.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\freeglut_joystick.c"\r
+                               RelativePath="..\..\src\Common\freeglut_joystick.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\freeglut_main.c"\r
+                               RelativePath="..\..\src\Common\freeglut_main.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\freeglut_menu.c"\r
+                               RelativePath="..\..\src\Common\freeglut_menu.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\freeglut_misc.c"\r
+                               RelativePath="..\..\src\Common\freeglut_misc.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\freeglut_overlay.c"\r
+                               RelativePath="..\..\src\Common\freeglut_overlay.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\freeglut_spaceball.c"\r
+                               RelativePath="..\..\src\Common\freeglut_spaceball.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\freeglut_state.c"\r
+                               RelativePath="..\..\src\Common\freeglut_state.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\freeglut_stroke_mono_roman.c"\r
+                               RelativePath="..\..\src\Common\freeglut_stroke_mono_roman.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\freeglut_stroke_roman.c"\r
+                               RelativePath="..\..\src\Common\freeglut_stroke_roman.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\freeglut_structure.c"\r
+                               RelativePath="..\..\src\Common\freeglut_structure.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\freeglut_teapot.c"\r
+                               RelativePath="..\..\src\Common\freeglut_teapot.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\freeglut_videoresize.c"\r
+                               RelativePath="..\..\src\Common\freeglut_videoresize.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\freeglut_window.c"\r
+                               RelativePath="..\..\src\Common\freeglut_window.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\freeglutdll.def"\r
+                               RelativePath="..\..\src\Common\freeglutdll.def"\r
                                >\r
                        </File>\r
                </Filter>\r
@@ -436,7 +775,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\freeglut_internal.h"\r
+                               RelativePath="..\..\src\Common\freeglut_internal.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\mswin\freeglut_internal_mswin.h"\r
                                >\r
                        </File>\r
                        <File\r
@@ -444,7 +787,7 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\freeglut_teapot_data.h"\r
+                               RelativePath="..\..\src\Common\freeglut_teapot_data.h"\r
                                >\r
                        </File>\r
                        <File\r
FreeGLUT