graphics

commit dae38f764b7574e3414844936db9f27c7f17174e
parent 32d834d7e606e565fd54c917a56de74d101b6cf4
Author: Brian Swetland <swetland@frotz.net>
Date:   Tue,  2 Jul 2013 11:53:50 -0700

windows: update common library, hello, and objects build

Diffstat:
M
common/buffers.cc
 | 
4
----
M
common/common.vcxproj
 | 
3
++-
M
common/shaders.cc
 | 
4
----
M
hello/hello.cc
 | 
6
+++---
M
test/object.cc
 | 
6
+++---
M
test/test.vcxproj
 | 
5
+++--

6 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/common/buffers.cc b/common/buffers.cc
@@ -16,10 +16,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#ifdef _WIN32
-#define GLUE_DEFINE_EXTENSIONS 1
-#endif
-
 #include "app.h"
 #include "util.h"
 
diff --git a/common/common.vcxproj b/common/common.vcxproj
@@ -99,7 +99,6 @@
   <ItemGroup>
     <ClInclude Include="app.h" />
     <ClInclude Include="dxapp.h" />
-    <ClInclude Include="glapp.h" />
     <ClInclude Include="glcorearb.h" />
     <ClInclude Include="matrix.h" />
     <ClInclude Include="opengl.h" />
@@ -107,6 +106,7 @@
     <ClInclude Include="util.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="buffers.cc" />
     <ClCompile Include="dxapp.cc">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='OpenGL-Debug|Win32'">true</ExcludedFromBuild>
     </ClCompile>
@@ -121,6 +121,7 @@
     <ClCompile Include="loadpng.cc" />
     <ClCompile Include="matrix.cc" />
     <ClCompile Include="savepng.cc" />
+    <ClCompile Include="shaders.cc" />
     <ClCompile Include="simplexnoise.cc" />
     <ClCompile Include="textgrid.cc" />
   </ItemGroup>
diff --git a/common/shaders.cc b/common/shaders.cc
@@ -16,10 +16,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#ifdef _WIN32
-#define GLUE_DEFINE_EXTENSIONS 1
-#endif
-
 #include "app.h"
 #include "util.h"
 
diff --git a/hello/hello.cc b/hello/hello.cc
@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
+#include <stdio.h>
+#include <stdlib.h>
+
 #include "app.h"
 #include "matrix.h"
 #include "util.h"
 #include "textgrid.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 // idx, src, dst, count, offset, stride, divisor
 static VertexAttrDesc layout[] = {
         { 0, SRC_FLOAT, DST_FLOAT,      3,  0, 32, 0 },
diff --git a/test/object.cc b/test/object.cc
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
+#include <stdio.h>
+#include <stdlib.h>
+
 #include "app.h"
 #include "matrix.h"
 #include "util.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 // idx, src, dst, count, offset, stride, divisor
 static VertexAttrDesc layout[] = {
 	{ 0, SRC_FLOAT, DST_FLOAT, 3,  0, 32, 0 },
diff --git a/test/test.vcxproj b/test/test.vcxproj
@@ -15,7 +15,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="test.cc" />
+    <ClCompile Include="object.cc" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{DA776F1D-F023-4821-B8D6-CF901B8B56A8}</ProjectGuid>
@@ -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>
+</Project>
+\ No newline at end of file