# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1384601213 -7200
# Node ID 7bd5ebec3b6fbd4c48c5a879e32548492db0066c
# Parent  51685f8fe859d97489ba83c4cf06bd42623e5483
fixed visual studio project files, removed the dll crap

diff -r 51685f8fe859 -r 7bd5ebec3b6f goat3dgfx.sln
--- a/goat3dgfx.sln	Sat Nov 16 08:52:30 2013 +0200
+++ b/goat3dgfx.sln	Sat Nov 16 13:26:53 2013 +0200
@@ -3,8 +3,6 @@
 # Visual Studio 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "goat3dgfx", "goat3dgfx.vcproj", "{251F8AFF-5A37-4F10-A519-C55C40E127AF}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "goat3dgfx_static", "goat3dgfx_static.vcproj", "{153DAAFD-385E-44A3-8030-563AFFA70215}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -15,10 +13,6 @@
 		{251F8AFF-5A37-4F10-A519-C55C40E127AF}.Debug|Win32.Build.0 = Debug|Win32
 		{251F8AFF-5A37-4F10-A519-C55C40E127AF}.Release|Win32.ActiveCfg = Release|Win32
 		{251F8AFF-5A37-4F10-A519-C55C40E127AF}.Release|Win32.Build.0 = Release|Win32
-		{153DAAFD-385E-44A3-8030-563AFFA70215}.Debug|Win32.ActiveCfg = Debug|Win32
-		{153DAAFD-385E-44A3-8030-563AFFA70215}.Debug|Win32.Build.0 = Debug|Win32
-		{153DAAFD-385E-44A3-8030-563AFFA70215}.Release|Win32.ActiveCfg = Release|Win32
-		{153DAAFD-385E-44A3-8030-563AFFA70215}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff -r 51685f8fe859 -r 7bd5ebec3b6f goat3dgfx.vcproj
--- a/goat3dgfx.vcproj	Sat Nov 16 08:52:30 2013 +0200
+++ b/goat3dgfx.vcproj	Sat Nov 16 13:26:53 2013 +0200
@@ -20,7 +20,7 @@
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
+			ConfigurationType="4"
 			CharacterSet="1"
 			>
 			<Tool
@@ -48,6 +48,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
+				DisableSpecificWarnings="4244;4996;4305"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -59,19 +60,12 @@
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
+				Name="VCLibrarianTool"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
 			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
@@ -81,9 +75,6 @@
 				Name="VCFxCopTool"
 			/>
 			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
@@ -91,7 +82,8 @@
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
+			ConfigurationType="4"
+			InheritedPropertySheets=".\goat3dgfx.vsprops"
 			CharacterSet="1"
 			WholeProgramOptimization="1"
 			>
@@ -120,6 +112,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4244;4996;4305"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -131,21 +124,12 @@
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
+				Name="VCLibrarianTool"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
 			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
@@ -155,9 +139,6 @@
 				Name="VCFxCopTool"
 			/>
 			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
diff -r 51685f8fe859 -r 7bd5ebec3b6f goat3dgfx_static.vcproj
--- a/goat3dgfx_static.vcproj	Sat Nov 16 08:52:30 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,367 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="goat3dgfx_static"
-	ProjectGUID="{153DAAFD-385E-44A3-8030-563AFFA70215}"
-	RootNamespace="goat3dgfx_static"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				DisableSpecificWarnings="4244"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4244"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="src"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\src\assload.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\src\curve.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\src\curveload.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\src\datapath.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\src\geom.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\src\gfxutil.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\src\image.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\src\logger.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\src\material.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\src\mesh.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\src\meshgen.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\src\object.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\src\opengl.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\src\psyspp.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\src\rtarg.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\src\scene.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\src\sdrman.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\src\shader.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\src\texgen.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\src\texman.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\src\texture.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\src\timer.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\src\unistate.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\src\xform_node.cc"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="include"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\src\3dschunks.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\assload.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\curve.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\curveload.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\datapath.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\dataset.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\dataset.inl"
-				>
-			</File>
-			<File
-				RelativePath=".\src\geom.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\gfxutil.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\image.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\logger.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\material.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\mesh.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\meshgen.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\object.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\opengl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\psyspp.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\rtarg.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\scene.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\sdrman.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\shader.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\texgen.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\texman.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\texture.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\timer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\unistate.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\xform_node.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff -r 51685f8fe859 -r 7bd5ebec3b6f install.bat
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/install.bat	Sat Nov 16 13:26:53 2013 +0200
@@ -0,0 +1,5 @@
+mkdir c:\usr\include\goat3dgfx
+copy /Y usr\include\goat3dgfx\* c:\usr\include\goat3dgfx\
+mkdir c:\usr\lib
+copy /Y usr\lib\* c:\usr\lib\
+pause
diff -r 51685f8fe859 -r 7bd5ebec3b6f src/curveload.cc
--- a/src/curveload.cc	Sat Nov 16 08:52:30 2013 +0200
+++ b/src/curveload.cc	Sat Nov 16 13:26:53 2013 +0200
@@ -1,10 +1,20 @@
 #include <string>
 #include <assert.h>
-#include <stdint.h>
 #include "curveload.h"
 #include "3dschunks.h"
 #include "logger.h"
 
+#ifndef _MSC_VER
+#include <stdint.h>
+#else
+typedef __int8 int8_t;
+typedef __int16 int16_t;
+typedef __int32 int32_t;
+typedef unsigned __int8 uint8_t;
+typedef unsigned __int16 uint16_t;
+typedef unsigned __int32 uint32_t;
+#endif
+
 static uint32_t read_counter;
 
 struct ChunkHeader {
diff -r 51685f8fe859 -r 7bd5ebec3b6f src/texture.cc
--- a/src/texture.cc	Sat Nov 16 08:52:30 2013 +0200
+++ b/src/texture.cc	Sat Nov 16 13:26:53 2013 +0200
@@ -188,7 +188,7 @@
 bool Texture2D::load(const char *fname)
 {
 	Image img;
-	if(!img.load(fname) == -1) {
+	if(!img.load(fname)) {
 		error_log("failed to load 2D texture: %s\n", fname);
 		return false;
 	}