Updated Windows.

Calvin-CS · Aug 3, 2015 · e9c5575 · e9c5575
1 parent 782f51f
commit e9c5575
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 24 deletions.
diff --git a/windows-setup.txt b/windows-setup.txt
@@ -1,6 +1,7 @@
 Easy Automatic Installation (Requires Visual Studio 2012):
   Run tsgl-setup.exe, installing to this directory (which should be the default location)
   Open tsgl.sln in Visual Studio 2012
+  Right click on tsgl -> Build
   Right click on solution -> Build Solution
   Done! Right click on any of the test projects -> Debug -> Start New Instance to get started!
 

diff --git a/windows/tsgl.sdf b/windows/tsgl.sdf
diff --git a/windows/tsgl.sln b/windows/tsgl.sln
@@ -113,11 +113,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testNewtonPendulum", "vs201
 		{4436E331-0E22-4404-B1CB-CCC5B20C459E} = {4436E331-0E22-4404-B1CB-CCC5B20C459E}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testNova", "vs2012\testNova.vcxproj", "{AB9E7E75-6E28-4AD0-A6E6-AA98E06AE4D2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4436E331-0E22-4404-B1CB-CCC5B20C459E} = {4436E331-0E22-4404-B1CB-CCC5B20C459E}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testPong", "vs2012\testPong.vcxproj", "{04E2B42D-18F0-4ABF-A5AA-127F0ADA61E7}"
 	ProjectSection(ProjectDependencies) = postProject
 		{4436E331-0E22-4404-B1CB-CCC5B20C459E} = {4436E331-0E22-4404-B1CB-CCC5B20C459E}
@@ -305,10 +300,6 @@ Global
 		{FB523785-E427-45D7-8A4F-6C3ADCFD0AC7}.Debug|Win32.Build.0 = Debug|Win32
 		{FB523785-E427-45D7-8A4F-6C3ADCFD0AC7}.Release|Win32.ActiveCfg = Release|Win32
 		{FB523785-E427-45D7-8A4F-6C3ADCFD0AC7}.Release|Win32.Build.0 = Release|Win32
-		{AB9E7E75-6E28-4AD0-A6E6-AA98E06AE4D2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AB9E7E75-6E28-4AD0-A6E6-AA98E06AE4D2}.Debug|Win32.Build.0 = Debug|Win32
-		{AB9E7E75-6E28-4AD0-A6E6-AA98E06AE4D2}.Release|Win32.ActiveCfg = Release|Win32
-		{AB9E7E75-6E28-4AD0-A6E6-AA98E06AE4D2}.Release|Win32.Build.0 = Release|Win32
 		{04E2B42D-18F0-4ABF-A5AA-127F0ADA61E7}.Debug|Win32.ActiveCfg = Debug|Win32
 		{04E2B42D-18F0-4ABF-A5AA-127F0ADA61E7}.Debug|Win32.Build.0 = Debug|Win32
 		{04E2B42D-18F0-4ABF-A5AA-127F0ADA61E7}.Release|Win32.ActiveCfg = Release|Win32

diff --git a/windows/tsgl.vcxproj b/windows/tsgl.vcxproj
@@ -86,7 +86,6 @@ copy "$(SolutionDir)lib\zlib1.dll" "$(SolutionDir)Debug\zlib1.dll";
     <ClCompile Include="src\tsgl\Canvas.cpp" />
     <ClCompile Include="src\tsgl\CartesianCanvas.cpp" />
     <ClCompile Include="src\tsgl\Color.cpp" />
-    <ClCompile Include="src\tsgl\ColoredPolygon.cpp" />
     <ClCompile Include="src\tsgl\ConcavePolygon.cpp" />
     <ClCompile Include="src\tsgl\ConvexPolygon.cpp" />
     <ClCompile Include="src\TSGL\Error.cpp" />
@@ -101,14 +100,14 @@ copy "$(SolutionDir)lib\zlib1.dll" "$(SolutionDir)Debug\zlib1.dll";
     <ClCompile Include="src\tsgl\TextureHandler.cpp" />
     <ClCompile Include="src\tsgl\Timer.cpp" />
     <ClCompile Include="src\tsgl\Triangle.cpp" />
+    <ClCompile Include="src\TSGL\TriangleStrip.cpp" />
     <ClCompile Include="src\TSGL\VisualTaskQueue.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\tsgl\Array.h" />
     <ClInclude Include="src\tsgl\Canvas.h" />
     <ClInclude Include="src\tsgl\CartesianCanvas.h" />
     <ClInclude Include="src\tsgl\Color.h" />
-    <ClInclude Include="src\tsgl\ColoredPolygon.h" />
     <ClInclude Include="src\tsgl\ConcavePolygon.h" />
     <ClInclude Include="src\tsgl\ConvexPolygon.h" />
     <ClInclude Include="src\TSGL\Error.h" />

diff --git a/windows/tsgl.vcxproj.filters b/windows/tsgl.vcxproj.filters
@@ -24,9 +24,6 @@
     <ClCompile Include="src\tsgl\Color.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\tsgl\ColoredPolygon.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\tsgl\ConcavePolygon.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -57,9 +54,6 @@
     <ClCompile Include="src\tsgl\Triangle.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\TSGL\VisualQueue.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\TSGL\ProgressBar.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -75,6 +69,9 @@
     <ClCompile Include="src\TSGL\VisualTaskQueue.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\TSGL\TriangleStrip.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\tsgl\Array.h">
@@ -89,9 +86,6 @@
     <ClInclude Include="src\tsgl\Color.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\tsgl\ColoredPolygon.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="src\tsgl\ConcavePolygon.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -134,9 +128,6 @@
     <ClInclude Include="src\tsgl\tsgl.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\TSGL\VisualQueue.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="src\TSGL\TsglAssert.h">
       <Filter>Header Files</Filter>
     </ClInclude>

diff --git a/windows/tsgl.vcxproj.user b/windows/tsgl.vcxproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ShowAllFiles>true</ShowAllFiles>
+    <ShowAllFiles>false</ShowAllFiles>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LocalDebuggerEnvironment>PATH=$(TsglDllDir);%PATH%

diff --git a/windows/vs2012/testMandelbrot.vcxproj b/windows/vs2012/testMandelbrot.vcxproj
@@ -70,13 +70,15 @@
     <ClCompile Include="..\src\tests\Mandelbrot\GradientMandelbrot.cpp" />
     <ClCompile Include="..\src\tests\Mandelbrot\Julia.cpp" />
     <ClCompile Include="..\src\tests\Mandelbrot\Mandelbrot.cpp" />
+    <ClCompile Include="..\src\tests\Mandelbrot\Nova.cpp" />
     <ClCompile Include="..\src\tests\testMandelbrot.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\tests\Mandelbrot\Buddhabrot.h" />
     <ClInclude Include="..\src\tests\Mandelbrot\GradientMandelbrot.h" />
     <ClInclude Include="..\src\tests\Mandelbrot\Julia.h" />
     <ClInclude Include="..\src\tests\Mandelbrot\Mandelbrot.h" />
+    <ClInclude Include="..\src\tests\Mandelbrot\Nova.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">