graphics

commit c4bfb2d7d5a108b0c0b23429b7a5a2a9f5c5811a
parent f1fbb67946ba1476a3cf66a2edd475ba1c297129
Author: Brian Swetland <swetland@frotz.net>
Date:   Fri, 14 Jun 2013 19:23:36 -0700

Update windows build for SDL2

Diffstat:
M
common/common.vcxproj
 | 
2
+-
M
common/glapp.cc
 | 
7
-------
M
hello/hello.vcxproj
 | 
11
+++++------
M
test/test.vcxproj
 | 
11
+++++------

4 files changed, 11 insertions(+), 20 deletions(-)
diff --git a/common/common.vcxproj b/common/common.vcxproj
@@ -76,7 +76,7 @@
       <Optimization>Disabled</Optimization>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
       <PreprocessorDefinitions>USE_OPENGL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\SDL-1.2.15\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\SDL-2.0.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
diff --git a/common/glapp.cc b/common/glapp.cc
@@ -49,13 +49,6 @@ void __check_gl_error(const char *fn, int line) {
 #endif
 
 #ifdef _WIN32
-static int SDL_GL_ExtensionSupported(const char *name) {
-	if (strstr((char*)glGetString(GL_EXTENSIONS), name))
-		return 1;
-	else
-		return 0;
-}
-
 static void gl_map_functions(void) {
 	int n;
 	if (!SDL_GL_ExtensionSupported("GL_ARB_shader_objects") ||
diff --git a/hello/hello.vcxproj b/hello/hello.vcxproj
@@ -89,17 +89,17 @@ XCOPY "$(ProjectDir)assets" "$(TargetDir)assets" /E /I /F /Y</Command>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <AdditionalIncludeDirectories>..\..\SDL-1.2.15\include;..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\SDL-2.0.0\include;..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>USE_OPENGL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>common.lib;SDL.lib;SDLmain.lib;libpng-1.2.50.lib;zlib-1.2.7.lib;OpenGL32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>common.lib;SDL2.lib;SDL2main.lib;libpng-1.2.50.lib;zlib-1.2.7.lib;OpenGL32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Windows</SubSystem>
-      <AdditionalLibraryDirectories>..\..\SDL-1.2.15\lib\x86;..\OpenGL-Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\SDL-2.0.0\lib\x86;..\OpenGL-Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <PostBuildEvent>
-      <Command>XCOPY "$(ProjectDir)..\..\SDL-1.2.15\lib\x86\SDL.dll" "$(TargetDir)" /E /I /F /Y
+      <Command>XCOPY "$(ProjectDir)..\..\SDL-2.0.0\lib\x86\SDL2.dll" "$(TargetDir)" /E /I /F /Y
 XCOPY "$(ProjectDir)..\common\assets" "$(TargetDir)assets" /E /I /F /Y
 XCOPY "$(ProjectDir)assets" "$(TargetDir)assets" /E /I /F /Y</Command>
     </PostBuildEvent>
@@ -132,4 +132,4 @@ XCOPY "$(ProjectDir)assets" "$(TargetDir)assets" /E /I /F /Y</Command>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
-\ No newline at end of file
+</Project>
diff --git a/test/test.vcxproj b/test/test.vcxproj
@@ -92,17 +92,17 @@ XCOPY "$(ProjectDir)assets" "$(TargetDir)assets" /E /I /F /Y</Command>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <AdditionalIncludeDirectories>..\..\SDL-1.2.15\include;..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\SDL-2.0.0\include;..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>USE_OPENGL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>common.lib;SDL.lib;SDLmain.lib;libpng-1.2.50.lib;zlib-1.2.7.lib;OpenGL32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>common.lib;SDL2.lib;SDL2main.lib;libpng-1.2.50.lib;zlib-1.2.7.lib;OpenGL32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Windows</SubSystem>
-      <AdditionalLibraryDirectories>..\..\SDL-1.2.15\lib\x86;..\OpenGL-Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\SDL-2.0.0\lib\x86;..\OpenGL-Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <PostBuildEvent>
-      <Command>XCOPY "$(ProjectDir)..\..\SDL-1.2.15\lib\x86\SDL.dll" "$(TargetDir)" /E /I /F /Y
+      <Command>XCOPY "$(ProjectDir)..\..\SDL-2.0.0\lib\x86\SDL2.dll" "$(TargetDir)" /E /I /F /Y
 XCOPY "$(ProjectDir)..\common\assets" "$(TargetDir)assets" /E /I /F /Y
 XCOPY "$(ProjectDir)assets" "$(TargetDir)assets" /E /I /F /Y</Command>
     </PostBuildEvent>
@@ -132,4 +132,4 @@ XCOPY "$(ProjectDir)assets" "$(TargetDir)assets" /E /I /F /Y</Command>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
-\ No newline at end of file
+</Project>