Index: .gitignore
===================================================================
--- .gitignore	(revision fe70cd3fbf730291e144b80bfe5a3c83a194ce21)
+++ .gitignore	(revision 4813066fb726b8c5141f75fc6d219816572233fe)
@@ -8,4 +8,6 @@
 .vs/
 *.filters
+include/
+lib/
 Debug/
 Release/
Index: OpenGLGame.vcxproj
===================================================================
--- OpenGLGame.vcxproj	(revision fe70cd3fbf730291e144b80bfe5a3c83a194ce21)
+++ OpenGLGame.vcxproj	(revision 4813066fb726b8c5141f75fc6d219816572233fe)
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -22,4 +22,5 @@
     <ProjectGuid>{592F30FE-3B41-4EE6-A544-23F924C8A1C0}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -27,20 +28,20 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -64,6 +65,6 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>D:\Visual Studio Projects\include;$(IncludePath)</IncludePath>
-    <LibraryPath>D:\Visual Studio Projects\lib;$(LibraryPath)</LibraryPath>
+    <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>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -72,7 +73,11 @@
     <LibraryPath>D:\Visual Studio Projects\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <IncludePath>C:\Users\dportnoy\Desktop\opengl-game\include;C:\Users\dportnoy\Desktop\opengl-game\include;$(IncludePath)</IncludePath>
+    <LibraryPath>C:\Users\dportnoy\Desktop\opengl-game\lib;C:\Users\dportnoy\Desktop\opengl-game\lib;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;GLEW_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -108,6 +113,14 @@
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Link>
+      <AdditionalDependencies>
+      </AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="game.cpp" />
+    <ClCompile Include="common\controls-new.cpp" />
+    <ClCompile Include="common\shader.cpp" />
+    <ClCompile Include="mygame.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Index: README.txt
===================================================================
--- README.txt	(revision fe70cd3fbf730291e144b80bfe5a3c83a194ce21)
+++ README.txt	(revision 4813066fb726b8c5141f75fc6d219816572233fe)
@@ -1,4 +1,2 @@
-TODO: Make sure the instructions in this README still work and, if not, update them
-
 Installation Instructions for Linux
 ---------------------------------------
@@ -24,7 +22,8 @@
 ---------------------------------------
 
-Download the precompiled 32bit binaries of GLFW and GLEW.
-Create /lib and /include folders and add the paths to those folders to the
-VC++ project. Copy the include/GL and include/GLFW folders into your /include
-folder and all the files in the include folders of both libraries into your /lib
-folder. This should be enough to compile and run the project.
+Download the precompiled 32bit binaries of GLFW, GLEW, and glm (a header-only
+library). Create lib/ and include/ folders in the root opengl-game directory
+you cloned. Copy the include/GL/, include/GLFW/, and glm/ folders into your
+include/ folder and all the files in the lib/ folders of the GLFW and GLEW
+libraries into your lib/ folder (glm has no lib/ folder). This should be enough
+to compile and run the project.