1.1 --- a/goat3dgfx.sln	Sat Nov 16 08:52:30 2013 +0200
     1.2 +++ b/goat3dgfx.sln	Sat Nov 16 13:26:53 2013 +0200
     1.3 @@ -3,8 +3,6 @@
     1.4  # Visual Studio 2008
     1.5  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "goat3dgfx", "goat3dgfx.vcproj", "{251F8AFF-5A37-4F10-A519-C55C40E127AF}"
     1.6  EndProject
     1.7 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "goat3dgfx_static", "goat3dgfx_static.vcproj", "{153DAAFD-385E-44A3-8030-563AFFA70215}"
     1.8 -EndProject
     1.9  Global
    1.10  	GlobalSection(SolutionConfigurationPlatforms) = preSolution
    1.11  		Debug|Win32 = Debug|Win32
    1.12 @@ -15,10 +13,6 @@
    1.13  		{251F8AFF-5A37-4F10-A519-C55C40E127AF}.Debug|Win32.Build.0 = Debug|Win32
    1.14  		{251F8AFF-5A37-4F10-A519-C55C40E127AF}.Release|Win32.ActiveCfg = Release|Win32
    1.15  		{251F8AFF-5A37-4F10-A519-C55C40E127AF}.Release|Win32.Build.0 = Release|Win32
    1.16 -		{153DAAFD-385E-44A3-8030-563AFFA70215}.Debug|Win32.ActiveCfg = Debug|Win32
    1.17 -		{153DAAFD-385E-44A3-8030-563AFFA70215}.Debug|Win32.Build.0 = Debug|Win32
    1.18 -		{153DAAFD-385E-44A3-8030-563AFFA70215}.Release|Win32.ActiveCfg = Release|Win32
    1.19 -		{153DAAFD-385E-44A3-8030-563AFFA70215}.Release|Win32.Build.0 = Release|Win32
    1.20  	EndGlobalSection
    1.21  	GlobalSection(SolutionProperties) = preSolution
    1.22  		HideSolutionNode = FALSE

     2.1 --- a/goat3dgfx.vcproj	Sat Nov 16 08:52:30 2013 +0200
     2.2 +++ b/goat3dgfx.vcproj	Sat Nov 16 13:26:53 2013 +0200
     2.3 @@ -20,7 +20,7 @@
     2.4  			Name="Debug|Win32"
     2.5  			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
     2.6  			IntermediateDirectory="$(ConfigurationName)"
     2.7 -			ConfigurationType="2"
     2.8 +			ConfigurationType="4"
     2.9  			CharacterSet="1"
    2.10  			>
    2.11  			<Tool
    2.12 @@ -48,6 +48,7 @@
    2.13  				UsePrecompiledHeader="0"
    2.14  				WarningLevel="3"
    2.15  				DebugInformationFormat="4"
    2.16 +				DisableSpecificWarnings="4244;4996;4305"
    2.17  			/>
    2.18  			<Tool
    2.19  				Name="VCManagedResourceCompilerTool"
    2.20 @@ -59,19 +60,12 @@
    2.21  				Name="VCPreLinkEventTool"
    2.22  			/>
    2.23  			<Tool
    2.24 -				Name="VCLinkerTool"
    2.25 -				LinkIncremental="2"
    2.26 -				GenerateDebugInformation="true"
    2.27 -				SubSystem="2"
    2.28 -				TargetMachine="1"
    2.29 +				Name="VCLibrarianTool"
    2.30  			/>
    2.31  			<Tool
    2.32  				Name="VCALinkTool"
    2.33  			/>
    2.34  			<Tool
    2.35 -				Name="VCManifestTool"
    2.36 -			/>
    2.37 -			<Tool
    2.38  				Name="VCXDCMakeTool"
    2.39  			/>
    2.40  			<Tool
    2.41 @@ -81,9 +75,6 @@
    2.42  				Name="VCFxCopTool"
    2.43  			/>
    2.44  			<Tool
    2.45 -				Name="VCAppVerifierTool"
    2.46 -			/>
    2.47 -			<Tool
    2.48  				Name="VCPostBuildEventTool"
    2.49  			/>
    2.50  		</Configuration>
    2.51 @@ -91,7 +82,8 @@
    2.52  			Name="Release|Win32"
    2.53  			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
    2.54  			IntermediateDirectory="$(ConfigurationName)"
    2.55 -			ConfigurationType="2"
    2.56 +			ConfigurationType="4"
    2.57 +			InheritedPropertySheets=".\goat3dgfx.vsprops"
    2.58  			CharacterSet="1"
    2.59  			WholeProgramOptimization="1"
    2.60  			>
    2.61 @@ -120,6 +112,7 @@
    2.62  				UsePrecompiledHeader="0"
    2.63  				WarningLevel="3"
    2.64  				DebugInformationFormat="3"
    2.65 +				DisableSpecificWarnings="4244;4996;4305"
    2.66  			/>
    2.67  			<Tool
    2.68  				Name="VCManagedResourceCompilerTool"
    2.69 @@ -131,21 +124,12 @@
    2.70  				Name="VCPreLinkEventTool"
    2.71  			/>
    2.72  			<Tool
    2.73 -				Name="VCLinkerTool"
    2.74 -				LinkIncremental="1"
    2.75 -				GenerateDebugInformation="true"
    2.76 -				SubSystem="2"
    2.77 -				OptimizeReferences="2"
    2.78 -				EnableCOMDATFolding="2"
    2.79 -				TargetMachine="1"
    2.80 +				Name="VCLibrarianTool"
    2.81  			/>
    2.82  			<Tool
    2.83  				Name="VCALinkTool"
    2.84  			/>
    2.85  			<Tool
    2.86 -				Name="VCManifestTool"
    2.87 -			/>
    2.88 -			<Tool
    2.89  				Name="VCXDCMakeTool"
    2.90  			/>
    2.91  			<Tool
    2.92 @@ -155,9 +139,6 @@
    2.93  				Name="VCFxCopTool"
    2.94  			/>
    2.95  			<Tool
    2.96 -				Name="VCAppVerifierTool"
    2.97 -			/>
    2.98 -			<Tool
    2.99  				Name="VCPostBuildEventTool"
   2.100  			/>
   2.101  		</Configuration>

     3.1 --- a/goat3dgfx_static.vcproj	Sat Nov 16 08:52:30 2013 +0200
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,367 +0,0 @@
     3.4 -<?xml version="1.0" encoding="Windows-1252"?>
     3.5 -<VisualStudioProject
     3.6 -	ProjectType="Visual C++"
     3.7 -	Version="9.00"
     3.8 -	Name="goat3dgfx_static"
     3.9 -	ProjectGUID="{153DAAFD-385E-44A3-8030-563AFFA70215}"
    3.10 -	RootNamespace="goat3dgfx_static"
    3.11 -	Keyword="Win32Proj"
    3.12 -	TargetFrameworkVersion="196613"
    3.13 -	>
    3.14 -	<Platforms>
    3.15 -		<Platform
    3.16 -			Name="Win32"
    3.17 -		/>
    3.18 -	</Platforms>
    3.19 -	<ToolFiles>
    3.20 -	</ToolFiles>
    3.21 -	<Configurations>
    3.22 -		<Configuration
    3.23 -			Name="Debug|Win32"
    3.24 -			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
    3.25 -			IntermediateDirectory="$(ConfigurationName)"
    3.26 -			ConfigurationType="4"
    3.27 -			CharacterSet="1"
    3.28 -			>
    3.29 -			<Tool
    3.30 -				Name="VCPreBuildEventTool"
    3.31 -			/>
    3.32 -			<Tool
    3.33 -				Name="VCCustomBuildTool"
    3.34 -			/>
    3.35 -			<Tool
    3.36 -				Name="VCXMLDataGeneratorTool"
    3.37 -			/>
    3.38 -			<Tool
    3.39 -				Name="VCWebServiceProxyGeneratorTool"
    3.40 -			/>
    3.41 -			<Tool
    3.42 -				Name="VCMIDLTool"
    3.43 -			/>
    3.44 -			<Tool
    3.45 -				Name="VCCLCompilerTool"
    3.46 -				Optimization="0"
    3.47 -				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
    3.48 -				MinimalRebuild="true"
    3.49 -				BasicRuntimeChecks="3"
    3.50 -				RuntimeLibrary="3"
    3.51 -				UsePrecompiledHeader="0"
    3.52 -				WarningLevel="3"
    3.53 -				DebugInformationFormat="4"
    3.54 -				DisableSpecificWarnings="4244"
    3.55 -			/>
    3.56 -			<Tool
    3.57 -				Name="VCManagedResourceCompilerTool"
    3.58 -			/>
    3.59 -			<Tool
    3.60 -				Name="VCResourceCompilerTool"
    3.61 -			/>
    3.62 -			<Tool
    3.63 -				Name="VCPreLinkEventTool"
    3.64 -			/>
    3.65 -			<Tool
    3.66 -				Name="VCLibrarianTool"
    3.67 -			/>
    3.68 -			<Tool
    3.69 -				Name="VCALinkTool"
    3.70 -			/>
    3.71 -			<Tool
    3.72 -				Name="VCXDCMakeTool"
    3.73 -			/>
    3.74 -			<Tool
    3.75 -				Name="VCBscMakeTool"
    3.76 -			/>
    3.77 -			<Tool
    3.78 -				Name="VCFxCopTool"
    3.79 -			/>
    3.80 -			<Tool
    3.81 -				Name="VCPostBuildEventTool"
    3.82 -			/>
    3.83 -		</Configuration>
    3.84 -		<Configuration
    3.85 -			Name="Release|Win32"
    3.86 -			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
    3.87 -			IntermediateDirectory="$(ConfigurationName)"
    3.88 -			ConfigurationType="4"
    3.89 -			CharacterSet="1"
    3.90 -			WholeProgramOptimization="1"
    3.91 -			>
    3.92 -			<Tool
    3.93 -				Name="VCPreBuildEventTool"
    3.94 -			/>
    3.95 -			<Tool
    3.96 -				Name="VCCustomBuildTool"
    3.97 -			/>
    3.98 -			<Tool
    3.99 -				Name="VCXMLDataGeneratorTool"
   3.100 -			/>
   3.101 -			<Tool
   3.102 -				Name="VCWebServiceProxyGeneratorTool"
   3.103 -			/>
   3.104 -			<Tool
   3.105 -				Name="VCMIDLTool"
   3.106 -			/>
   3.107 -			<Tool
   3.108 -				Name="VCCLCompilerTool"
   3.109 -				Optimization="2"
   3.110 -				EnableIntrinsicFunctions="true"
   3.111 -				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
   3.112 -				RuntimeLibrary="2"
   3.113 -				EnableFunctionLevelLinking="true"
   3.114 -				UsePrecompiledHeader="0"
   3.115 -				WarningLevel="3"
   3.116 -				DebugInformationFormat="3"
   3.117 -				DisableSpecificWarnings="4244"
   3.118 -			/>
   3.119 -			<Tool
   3.120 -				Name="VCManagedResourceCompilerTool"
   3.121 -			/>
   3.122 -			<Tool
   3.123 -				Name="VCResourceCompilerTool"
   3.124 -			/>
   3.125 -			<Tool
   3.126 -				Name="VCPreLinkEventTool"
   3.127 -			/>
   3.128 -			<Tool
   3.129 -				Name="VCLibrarianTool"
   3.130 -			/>
   3.131 -			<Tool
   3.132 -				Name="VCALinkTool"
   3.133 -			/>
   3.134 -			<Tool
   3.135 -				Name="VCXDCMakeTool"
   3.136 -			/>
   3.137 -			<Tool
   3.138 -				Name="VCBscMakeTool"
   3.139 -			/>
   3.140 -			<Tool
   3.141 -				Name="VCFxCopTool"
   3.142 -			/>
   3.143 -			<Tool
   3.144 -				Name="VCPostBuildEventTool"
   3.145 -			/>
   3.146 -		</Configuration>
   3.147 -	</Configurations>
   3.148 -	<References>
   3.149 -	</References>
   3.150 -	<Files>
   3.151 -		<Filter
   3.152 -			Name="src"
   3.153 -			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
   3.154 -			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
   3.155 -			>
   3.156 -			<File
   3.157 -				RelativePath=".\src\assload.cc"
   3.158 -				>
   3.159 -			</File>
   3.160 -			<File
   3.161 -				RelativePath=".\src\curve.cc"
   3.162 -				>
   3.163 -			</File>
   3.164 -			<File
   3.165 -				RelativePath=".\src\curveload.cc"
   3.166 -				>
   3.167 -			</File>
   3.168 -			<File
   3.169 -				RelativePath=".\src\datapath.cc"
   3.170 -				>
   3.171 -			</File>
   3.172 -			<File
   3.173 -				RelativePath=".\src\geom.cc"
   3.174 -				>
   3.175 -			</File>
   3.176 -			<File
   3.177 -				RelativePath=".\src\gfxutil.cc"
   3.178 -				>
   3.179 -			</File>
   3.180 -			<File
   3.181 -				RelativePath=".\src\image.cc"
   3.182 -				>
   3.183 -			</File>
   3.184 -			<File
   3.185 -				RelativePath=".\src\logger.cc"
   3.186 -				>
   3.187 -			</File>
   3.188 -			<File
   3.189 -				RelativePath=".\src\material.cc"
   3.190 -				>
   3.191 -			</File>
   3.192 -			<File
   3.193 -				RelativePath=".\src\mesh.cc"
   3.194 -				>
   3.195 -			</File>
   3.196 -			<File
   3.197 -				RelativePath=".\src\meshgen.cc"
   3.198 -				>
   3.199 -			</File>
   3.200 -			<File
   3.201 -				RelativePath=".\src\object.cc"
   3.202 -				>
   3.203 -			</File>
   3.204 -			<File
   3.205 -				RelativePath=".\src\opengl.cc"
   3.206 -				>
   3.207 -			</File>
   3.208 -			<File
   3.209 -				RelativePath=".\src\psyspp.cc"
   3.210 -				>
   3.211 -			</File>
   3.212 -			<File
   3.213 -				RelativePath=".\src\rtarg.cc"
   3.214 -				>
   3.215 -			</File>
   3.216 -			<File
   3.217 -				RelativePath=".\src\scene.cc"
   3.218 -				>
   3.219 -			</File>
   3.220 -			<File
   3.221 -				RelativePath=".\src\sdrman.cc"
   3.222 -				>
   3.223 -			</File>
   3.224 -			<File
   3.225 -				RelativePath=".\src\shader.cc"
   3.226 -				>
   3.227 -			</File>
   3.228 -			<File
   3.229 -				RelativePath=".\src\texgen.cc"
   3.230 -				>
   3.231 -			</File>
   3.232 -			<File
   3.233 -				RelativePath=".\src\texman.cc"
   3.234 -				>
   3.235 -			</File>
   3.236 -			<File
   3.237 -				RelativePath=".\src\texture.cc"
   3.238 -				>
   3.239 -			</File>
   3.240 -			<File
   3.241 -				RelativePath=".\src\timer.cc"
   3.242 -				>
   3.243 -			</File>
   3.244 -			<File
   3.245 -				RelativePath=".\src\unistate.cc"
   3.246 -				>
   3.247 -			</File>
   3.248 -			<File
   3.249 -				RelativePath=".\src\xform_node.cc"
   3.250 -				>
   3.251 -			</File>
   3.252 -		</Filter>
   3.253 -		<Filter
   3.254 -			Name="include"
   3.255 -			Filter="h;hpp;hxx;hm;inl;inc;xsd"
   3.256 -			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
   3.257 -			>
   3.258 -			<File
   3.259 -				RelativePath=".\src\3dschunks.h"
   3.260 -				>
   3.261 -			</File>
   3.262 -			<File
   3.263 -				RelativePath=".\src\assload.h"
   3.264 -				>
   3.265 -			</File>
   3.266 -			<File
   3.267 -				RelativePath=".\src\curve.h"
   3.268 -				>
   3.269 -			</File>
   3.270 -			<File
   3.271 -				RelativePath=".\src\curveload.h"
   3.272 -				>
   3.273 -			</File>
   3.274 -			<File
   3.275 -				RelativePath=".\src\datapath.h"
   3.276 -				>
   3.277 -			</File>
   3.278 -			<File
   3.279 -				RelativePath=".\src\dataset.h"
   3.280 -				>
   3.281 -			</File>
   3.282 -			<File
   3.283 -				RelativePath=".\src\dataset.inl"
   3.284 -				>
   3.285 -			</File>
   3.286 -			<File
   3.287 -				RelativePath=".\src\geom.h"
   3.288 -				>
   3.289 -			</File>
   3.290 -			<File
   3.291 -				RelativePath=".\src\gfxutil.h"
   3.292 -				>
   3.293 -			</File>
   3.294 -			<File
   3.295 -				RelativePath=".\src\image.h"
   3.296 -				>
   3.297 -			</File>
   3.298 -			<File
   3.299 -				RelativePath=".\src\logger.h"
   3.300 -				>
   3.301 -			</File>
   3.302 -			<File
   3.303 -				RelativePath=".\src\material.h"
   3.304 -				>
   3.305 -			</File>
   3.306 -			<File
   3.307 -				RelativePath=".\src\mesh.h"
   3.308 -				>
   3.309 -			</File>
   3.310 -			<File
   3.311 -				RelativePath=".\src\meshgen.h"
   3.312 -				>
   3.313 -			</File>
   3.314 -			<File
   3.315 -				RelativePath=".\src\object.h"
   3.316 -				>
   3.317 -			</File>
   3.318 -			<File
   3.319 -				RelativePath=".\src\opengl.h"
   3.320 -				>
   3.321 -			</File>
   3.322 -			<File
   3.323 -				RelativePath=".\src\psyspp.h"
   3.324 -				>
   3.325 -			</File>
   3.326 -			<File
   3.327 -				RelativePath=".\src\rtarg.h"
   3.328 -				>
   3.329 -			</File>
   3.330 -			<File
   3.331 -				RelativePath=".\src\scene.h"
   3.332 -				>
   3.333 -			</File>
   3.334 -			<File
   3.335 -				RelativePath=".\src\sdrman.h"
   3.336 -				>
   3.337 -			</File>
   3.338 -			<File
   3.339 -				RelativePath=".\src\shader.h"
   3.340 -				>
   3.341 -			</File>
   3.342 -			<File
   3.343 -				RelativePath=".\src\texgen.h"
   3.344 -				>
   3.345 -			</File>
   3.346 -			<File
   3.347 -				RelativePath=".\src\texman.h"
   3.348 -				>
   3.349 -			</File>
   3.350 -			<File
   3.351 -				RelativePath=".\src\texture.h"
   3.352 -				>
   3.353 -			</File>
   3.354 -			<File
   3.355 -				RelativePath=".\src\timer.h"
   3.356 -				>
   3.357 -			</File>
   3.358 -			<File
   3.359 -				RelativePath=".\src\unistate.h"
   3.360 -				>
   3.361 -			</File>
   3.362 -			<File
   3.363 -				RelativePath=".\src\xform_node.h"
   3.364 -				>
   3.365 -			</File>
   3.366 -		</Filter>
   3.367 -	</Files>
   3.368 -	<Globals>
   3.369 -	</Globals>
   3.370 -</VisualStudioProject>

     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/install.bat	Sat Nov 16 13:26:53 2013 +0200
     4.3 @@ -0,0 +1,5 @@
     4.4 +mkdir c:\usr\include\goat3dgfx
     4.5 +copy /Y usr\include\goat3dgfx\* c:\usr\include\goat3dgfx\
     4.6 +mkdir c:\usr\lib
     4.7 +copy /Y usr\lib\* c:\usr\lib\
     4.8 +pause

     5.1 --- a/src/curveload.cc	Sat Nov 16 08:52:30 2013 +0200
     5.2 +++ b/src/curveload.cc	Sat Nov 16 13:26:53 2013 +0200
     5.3 @@ -1,10 +1,20 @@
     5.4  #include <string>
     5.5  #include <assert.h>
     5.6 -#include <stdint.h>
     5.7  #include "curveload.h"
     5.8  #include "3dschunks.h"
     5.9  #include "logger.h"
    5.10  
    5.11 +#ifndef _MSC_VER
    5.12 +#include <stdint.h>
    5.13 +#else
    5.14 +typedef __int8 int8_t;
    5.15 +typedef __int16 int16_t;
    5.16 +typedef __int32 int32_t;
    5.17 +typedef unsigned __int8 uint8_t;
    5.18 +typedef unsigned __int16 uint16_t;
    5.19 +typedef unsigned __int32 uint32_t;
    5.20 +#endif
    5.21 +
    5.22  static uint32_t read_counter;
    5.23  
    5.24  struct ChunkHeader {

     6.1 --- a/src/texture.cc	Sat Nov 16 08:52:30 2013 +0200
     6.2 +++ b/src/texture.cc	Sat Nov 16 13:26:53 2013 +0200
     6.3 @@ -188,7 +188,7 @@
     6.4  bool Texture2D::load(const char *fname)
     6.5  {
     6.6  	Image img;
     6.7 -	if(!img.load(fname) == -1) {
     6.8 +	if(!img.load(fname)) {
     6.9  		error_log("failed to load 2D texture: %s\n", fname);
    6.10  		return false;
    6.11  	}