# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1384628982 -7200
# Node ID ae47239c8c0da03de92aeab6e6a9257bbe0fbae6
# Parent  eb75bff2182469803c6e88e2c1d488cc6b7c6515# Parent  7bd5ebec3b6fbd4c48c5a879e32548492db0066c
merged changes from windows

diff -r eb75bff21824 -r ae47239c8c0d .hgignore
--- a/.hgignore	Sat Nov 16 21:09:16 2013 +0200
+++ b/.hgignore	Sat Nov 16 21:09:42 2013 +0200
@@ -5,3 +5,6 @@
 \.so\.
 \.so$
 \.dylib$
+\.ncb$
+\.suo$
+\.user$
diff -r eb75bff21824 -r ae47239c8c0d goat3dgfx.sln
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/goat3dgfx.sln	Sat Nov 16 21:09:42 2013 +0200
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "goat3dgfx", "goat3dgfx.vcproj", "{251F8AFF-5A37-4F10-A519-C55C40E127AF}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{251F8AFF-5A37-4F10-A519-C55C40E127AF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{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
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff -r eb75bff21824 -r ae47239c8c0d goat3dgfx.vcproj
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/goat3dgfx.vcproj	Sat Nov 16 21:09:42 2013 +0200
@@ -0,0 +1,368 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="goat3dgfx"
+	ProjectGUID="{251F8AFF-5A37-4F10-A519-C55C40E127AF}"
+	RootNamespace="goat3dgfx"
+	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;_WINDOWS;_USRDLL;GOAT3DGFX_EXPORTS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+				DisableSpecificWarnings="4244;4996;4305"
+			/>
+			<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"
+			InheritedPropertySheets=".\goat3dgfx.vsprops"
+			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;_WINDOWS;_USRDLL;GOAT3DGFX_EXPORTS"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4244;4996;4305"
+			/>
+			<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\3dschunks.h"
+				>
+			</File>
+			<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\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 eb75bff21824 -r ae47239c8c0d install.bat
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/install.bat	Sat Nov 16 21:09:42 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 eb75bff21824 -r ae47239c8c0d src/curveload.cc
--- a/src/curveload.cc	Sat Nov 16 21:09:16 2013 +0200
+++ b/src/curveload.cc	Sat Nov 16 21:09:42 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 eb75bff21824 -r ae47239c8c0d src/texture.cc
--- a/src/texture.cc	Sat Nov 16 21:09:16 2013 +0200
+++ b/src/texture.cc	Sat Nov 16 21:09:42 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;
 	}