Changeset 0424bd8 in opengl-game

Timestamp:

Mar 7, 2018, 1:52:19 AM (7 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

a5b5e95

Parents:

d12d003

Message:

Update the OpenGLGame project to only include mygame.cpp and the files required to run it

Files:

• OpenGLGame.sln (modified) (1 diff)
• OpenGLGame.vcxproj (modified) (2 diffs)
• mygame.cpp (modified) (1 diff)

OpenGLGame.sln

@@ -1 +1 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26430.14
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenGLGame", "OpenGLGame.vcxproj", "{592F30FE-3B41-4EE6-A544-23F924C8A1C0}"

OpenGLGame.vcxproj

@@ -65 +65 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>C:\Users\dportnoy\Desktop\opengl-game\include;D:\Visual Studio Projects\include;$(IncludePath)</IncludePath>
-    <LibraryPath>C:\Users\dportnoy\Desktop\opengl-game\lib;D:\Visual Studio Projects\lib;$(LibraryPath)</LibraryPath>
+    <IncludePath>include;$(IncludePath)</IncludePath>
+    <LibraryPath>lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>D:\Visual Studio Projects\include;$(IncludePath)</IncludePath>
-    <LibraryPath>D:\Visual Studio Projects\lib;$(LibraryPath)</LibraryPath>
+    <IncludePath>include;$(IncludePath)</IncludePath>
+    <LibraryPath>lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -98 +98 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;GLEW_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>

mygame.cpp

@@ -1 @@
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <iostream>
-using namespace std;
-
 #include <GL/glew.h>
-
 #include <GLFW/glfw3.h>
-GLFWwindow* window;
 
 #include <glm/glm.hpp>
 #include <glm/gtc/matrix_transform.hpp>
-using namespace glm;
+
+#include <cstdio>
+#include <cstdlib>
+#include <iostream>
+
+GLFWwindow* window;
 
 #include "common/shader.hpp"
 #include "common/controls.hpp"
+
+using namespace std;
+using namespace glm;
 
 int main(int argc, char* argv[]) {