graphics

commit e722bb8b90ed644d42513e05a863ee19b4b7bde8
parent 54a11ede8d05dc2ff95f6d3e6650e6738bf1214e
Author: Brian Swetland <swetland@frotz.net>
Date:   Mon,  2 Sep 2013 23:57:14 -0700

build: fix win7 build

Diffstat:
M
common/common.vcxproj
 | 
9
+++++++--
M
common/glapp.cc
 | 
10
+++++-----
M
hello/hello.vcxproj
 | 
7
+++----
M
test/test.vcxproj
 | 
7
+++----

4 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/common/common.vcxproj b/common/common.vcxproj
@@ -39,12 +39,12 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IncludePath>..\zlib-1.2.7;..\libpng-1.2.50;$(IncludePath)</IncludePath>
+    <IncludePath>..\thirdparty\zlib-1.2.7;..\thirdparty\libpng-1.2.50;$(IncludePath)</IncludePath>
     <OutDir>$(SolutionDir)_$(Configuration)\</OutDir>
     <IntDir>_$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <IncludePath>..\zlib-1.2.7;..\libpng-1.2.50;$(IncludePath)</IncludePath>
+    <IncludePath>..\thirdparty\zlib-1.2.7;..\thirdparty\libpng-1.2.50;$(IncludePath)</IncludePath>
     <OutDir>$(SolutionDir)_$(Configuration)\</OutDir>
     <IntDir>_$(Configuration)\</IntDir>
   </PropertyGroup>
@@ -79,21 +79,26 @@
   <ItemGroup>
     <ClInclude Include="app.h" />
     <ClInclude Include="dxapp.h" />
+    <ClInclude Include="Effect.h" />
     <ClInclude Include="glcorearb.h" />
     <ClInclude Include="matrix.h" />
+    <ClInclude Include="Model.h" />
     <ClInclude Include="opengl.h" />
+    <ClInclude Include="Renderable.h" />
     <ClInclude Include="textgrid.h" />
     <ClInclude Include="texturefont.h" />
     <ClInclude Include="util.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="buffers.cc" />
+    <ClCompile Include="Effect.cc" />
     <ClCompile Include="glapp.cc" />
     <ClCompile Include="io.cc" />
     <ClCompile Include="loadfile.cc" />
     <ClCompile Include="loadobj.cc" />
     <ClCompile Include="loadpng.cc" />
     <ClCompile Include="matrix.cc" />
+    <ClCompile Include="Model.cc" />
     <ClCompile Include="savepng.cc" />
     <ClCompile Include="shaders.cc" />
     <ClCompile Include="simplexnoise.cc" />
diff --git a/common/glapp.cc b/common/glapp.cc
@@ -160,8 +160,8 @@ static const char *dbg_severity(GLenum n) {
 	default: return "unknown";
 	}
 }
-static void dbg_error_callback(GLenum source, GLenum type, GLenum id, GLenum severity,
-	GLsizei length, const char *message, void *cookie) {
+static void APIENTRY dbg_callback(GLenum source, GLenum type, GLuint id, GLenum severity,
+	GLsizei length, const GLchar *message, GLvoid *cookie) {
 #if VERBOSE
 	error("%s: %s: %x: %s: %s",
 		dbg_source(source), dbg_type(type), id,
@@ -216,11 +216,11 @@ int App::start(void) {
 	gl_map_functions();
 
 	{ // TODO: filter or disable in release mode
-		PFNGLDEBUGMESSAGECALLBACKPROC fn;
-		fn = (PFNGLDEBUGMESSAGECALLBACKPROC)
+		PFNGLDEBUGMESSAGECALLBACKARBPROC fn;
+		fn = (PFNGLDEBUGMESSAGECALLBACKARBPROC)
 			SDL_GL_GetProcAddress("glDebugMessageCallbackARB");
 		if (fn) {
-			fn(dbg_error_callback, NULL);
+			fn(dbg_callback, NULL);
 			glEnable(GL_DEBUG_OUTPUT);
 			// glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS);
 		} else {
diff --git a/hello/hello.vcxproj b/hello/hello.vcxproj
@@ -39,12 +39,12 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IncludePath>..\libpng-1.2.50;..\zlib-1.2.7;$(IncludePath)</IncludePath>
+    <IncludePath>..\thirdparty\libpng-1.2.50;..\thirdparty\zlib-1.2.7;$(IncludePath)</IncludePath>
     <OutDir>$(SolutionDir)_$(Configuration)\$(ProjectName)\</OutDir>
     <IntDir>_$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <IncludePath>..\libpng-1.2.50;..\zlib-1.2.7;$(IncludePath)</IncludePath>
+    <IncludePath>..\thirdparty\libpng-1.2.50;..\thirdparty\zlib-1.2.7;$(IncludePath)</IncludePath>
     <OutDir>$(SolutionDir)_$(Configuration)\$(ProjectName)\</OutDir>
     <IntDir>_$(Configuration)\</IntDir>
   </PropertyGroup>
@@ -98,4 +98,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
@@ -42,12 +42,12 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IncludePath>..\libpng-1.2.50;..\zlib-1.2.7;$(IncludePath)</IncludePath>
+    <IncludePath>..\thirdparty\libpng-1.2.50;..\thirdparty\zlib-1.2.7;$(IncludePath)</IncludePath>
     <OutDir>$(SolutionDir)_$(Configuration)\$(ProjectName)\</OutDir>
     <IntDir>_$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <IncludePath>..\libpng-1.2.50;..\zlib-1.2.7;$(IncludePath)</IncludePath>
+    <IncludePath>..\thirdparty\libpng-1.2.50;..\thirdparty\zlib-1.2.7;$(IncludePath)</IncludePath>
     <OutDir>$(SolutionDir)_$(Configuration)\$(ProjectName)\</OutDir>
     <IntDir>_$(Configuration)\</IntDir>
   </PropertyGroup>
@@ -98,4 +98,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>