# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1380339120 -10800
# Node ID 6b651613bd9f3478e7e47de15e9362ded39475ed
# Parent  b59a3650ed51c3f2c2b2afb588881a1370d8daf0
fixed the windows stuff

diff -r b59a3650ed51 -r 6b651613bd9f goat3d.vcxproj
--- a/goat3d.vcxproj	Fri Sep 27 07:20:22 2013 +0300
+++ b/goat3d.vcxproj	Sat Sep 28 06:32:00 2013 +0300
@@ -19,11 +19,24 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="libs\openctm\internal.h" />
+    <ClInclude Include="libs\openctm\liblzma\Alloc.h" />
+    <ClInclude Include="libs\openctm\liblzma\LzFind.h" />
+    <ClInclude Include="libs\openctm\liblzma\LzHash.h" />
+    <ClInclude Include="libs\openctm\liblzma\LzmaDec.h" />
+    <ClInclude Include="libs\openctm\liblzma\LzmaEnc.h" />
+    <ClInclude Include="libs\openctm\liblzma\LzmaLib.h" />
+    <ClInclude Include="libs\openctm\liblzma\NameMangle.h" />
+    <ClInclude Include="libs\openctm\liblzma\Types.h" />
+    <ClInclude Include="libs\openctm\openctm.h" />
+    <ClInclude Include="libs\openctm\openctmpp.h" />
+    <ClInclude Include="libs\tinyxml2\tinyxml2.h" />
     <ClInclude Include="src\camera.h" />
     <ClInclude Include="src\chunk.h" />
     <ClInclude Include="src\goat3d.h" />
     <ClInclude Include="src\goat3d_impl.h" />
     <ClInclude Include="src\light.h" />
+    <ClInclude Include="src\log.h" />
     <ClInclude Include="src\material.h" />
     <ClInclude Include="src\mesh.h" />
     <ClInclude Include="src\node.h" />
@@ -31,12 +44,29 @@
     <ClInclude Include="src\xform_node.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="libs\openctm\compressMG1.c" />
+    <ClCompile Include="libs\openctm\compressMG2.c" />
+    <ClCompile Include="libs\openctm\compressRAW.c" />
+    <ClCompile Include="libs\openctm\liblzma\Alloc.c" />
+    <ClCompile Include="libs\openctm\liblzma\LzFind.c" />
+    <ClCompile Include="libs\openctm\liblzma\LzmaDec.c" />
+    <ClCompile Include="libs\openctm\liblzma\LzmaEnc.c" />
+    <ClCompile Include="libs\openctm\liblzma\LzmaLib.c" />
+    <ClCompile Include="libs\openctm\openctm.c" />
+    <ClCompile Include="libs\openctm\stream.c" />
+    <ClCompile Include="libs\tinyxml2\tinyxml2.cpp" />
     <ClCompile Include="src\camera.cc" />
+    <ClCompile Include="src\chunk.cc" />
     <ClCompile Include="src\goat3d.cc" />
+    <ClCompile Include="src\goat3d_readxml.cc" />
+    <ClCompile Include="src\goat3d_write.cc" />
+    <ClCompile Include="src\goat3d_writexml.cc" />
     <ClCompile Include="src\light.cc" />
+    <ClCompile Include="src\log.cc" />
     <ClCompile Include="src\material.cc" />
     <ClCompile Include="src\mesh.cc" />
     <ClCompile Include="src\node.cc" />
+    <ClCompile Include="src\scene.cc" />
     <ClCompile Include="src\xform_node.cc" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
@@ -113,8 +143,9 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4244;4305</DisableSpecificWarnings>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions);OPENCTM_STATIC</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4244;4305;4996</DisableSpecificWarnings>
+      <AdditionalIncludeDirectories>$(SolutionDir)\libs\openctm;$(SolutionDir)\libs\openctm\liblzma;$(SolutionDir)\libs\tinyxml2</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -147,8 +178,9 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4244;4305</DisableSpecificWarnings>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions);OPENCTM_STATIC</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4244;4305;4996</DisableSpecificWarnings>
+      <AdditionalIncludeDirectories>$(SolutionDir)\libs\openctm;$(SolutionDir)\libs\openctm\liblzma;$(SolutionDir)\libs\tinyxml2</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
diff -r b59a3650ed51 -r 6b651613bd9f goat3d.vcxproj.filters
--- a/goat3d.vcxproj.filters	Fri Sep 27 07:20:22 2013 +0300
+++ b/goat3d.vcxproj.filters	Sat Sep 28 06:32:00 2013 +0300
@@ -5,6 +5,18 @@
       <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
     </Filter>
+    <Filter Include="libs">
+      <UniqueIdentifier>{bbf568eb-077e-4cb6-8607-e6a016ab7360}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="libs\tinyxml2">
+      <UniqueIdentifier>{8215d0ae-e53d-4dd7-8ca0-ba4470326776}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="libs\openctm">
+      <UniqueIdentifier>{d8a998b8-6390-40ac-b62a-8e5dbf61d437}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="libs\openctm\liblzma">
+      <UniqueIdentifier>{18a85bea-ddb2-49a1-a7b1-bd11b23d5549}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\camera.h">
@@ -37,6 +49,45 @@
     <ClInclude Include="src\object.h">
       <Filter>src</Filter>
     </ClInclude>
+    <ClInclude Include="src\log.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="libs\tinyxml2\tinyxml2.h">
+      <Filter>libs\tinyxml2</Filter>
+    </ClInclude>
+    <ClInclude Include="libs\openctm\internal.h">
+      <Filter>libs\openctm</Filter>
+    </ClInclude>
+    <ClInclude Include="libs\openctm\openctm.h">
+      <Filter>libs\openctm</Filter>
+    </ClInclude>
+    <ClInclude Include="libs\openctm\openctmpp.h">
+      <Filter>libs\openctm</Filter>
+    </ClInclude>
+    <ClInclude Include="libs\openctm\liblzma\Alloc.h">
+      <Filter>libs\openctm\liblzma</Filter>
+    </ClInclude>
+    <ClInclude Include="libs\openctm\liblzma\LzFind.h">
+      <Filter>libs\openctm\liblzma</Filter>
+    </ClInclude>
+    <ClInclude Include="libs\openctm\liblzma\LzHash.h">
+      <Filter>libs\openctm\liblzma</Filter>
+    </ClInclude>
+    <ClInclude Include="libs\openctm\liblzma\LzmaDec.h">
+      <Filter>libs\openctm\liblzma</Filter>
+    </ClInclude>
+    <ClInclude Include="libs\openctm\liblzma\LzmaEnc.h">
+      <Filter>libs\openctm\liblzma</Filter>
+    </ClInclude>
+    <ClInclude Include="libs\openctm\liblzma\LzmaLib.h">
+      <Filter>libs\openctm\liblzma</Filter>
+    </ClInclude>
+    <ClInclude Include="libs\openctm\liblzma\NameMangle.h">
+      <Filter>libs\openctm\liblzma</Filter>
+    </ClInclude>
+    <ClInclude Include="libs\openctm\liblzma\Types.h">
+      <Filter>libs\openctm\liblzma</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\goat3d.cc">
@@ -60,5 +111,56 @@
     <ClCompile Include="src\node.cc">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="src\chunk.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\goat3d_readxml.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\goat3d_write.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\goat3d_writexml.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\log.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\scene.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="libs\tinyxml2\tinyxml2.cpp">
+      <Filter>libs\tinyxml2</Filter>
+    </ClCompile>
+    <ClCompile Include="libs\openctm\compressMG1.c">
+      <Filter>libs\openctm</Filter>
+    </ClCompile>
+    <ClCompile Include="libs\openctm\compressMG2.c">
+      <Filter>libs\openctm</Filter>
+    </ClCompile>
+    <ClCompile Include="libs\openctm\compressRAW.c">
+      <Filter>libs\openctm</Filter>
+    </ClCompile>
+    <ClCompile Include="libs\openctm\openctm.c">
+      <Filter>libs\openctm</Filter>
+    </ClCompile>
+    <ClCompile Include="libs\openctm\stream.c">
+      <Filter>libs\openctm</Filter>
+    </ClCompile>
+    <ClCompile Include="libs\openctm\liblzma\Alloc.c">
+      <Filter>libs\openctm\liblzma</Filter>
+    </ClCompile>
+    <ClCompile Include="libs\openctm\liblzma\LzFind.c">
+      <Filter>libs\openctm\liblzma</Filter>
+    </ClCompile>
+    <ClCompile Include="libs\openctm\liblzma\LzmaDec.c">
+      <Filter>libs\openctm\liblzma</Filter>
+    </ClCompile>
+    <ClCompile Include="libs\openctm\liblzma\LzmaEnc.c">
+      <Filter>libs\openctm\liblzma</Filter>
+    </ClCompile>
+    <ClCompile Include="libs\openctm\liblzma\LzmaLib.c">
+      <Filter>libs\openctm\liblzma</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff -r b59a3650ed51 -r 6b651613bd9f src/chunk.cc
--- a/src/chunk.cc	Fri Sep 27 07:20:22 2013 +0300
+++ b/src/chunk.cc	Sat Sep 28 06:32:00 2013 +0300
@@ -11,8 +11,8 @@
 
 bool write_chunk_header(const ChunkHeader *hdr, goat3d_io *io)
 {
-	io->seek(-hdr->size, SEEK_CUR, io->cls);
-	if(io->write(hdr, sizeof *hdr, io->cls) < (ssize_t)sizeof *hdr) {
+	io->seek(-(long)hdr->size, SEEK_CUR, io->cls);
+	if(io->write(hdr, sizeof *hdr, io->cls) < (long)sizeof *hdr) {
 		return false;
 	}
 	return true;
@@ -20,7 +20,7 @@
 
 bool read_chunk_header(ChunkHeader *hdr, goat3d_io *io)
 {
-	if(io->read(hdr, sizeof *hdr, io->cls) < (ssize_t)sizeof *hdr) {
+	if(io->read(hdr, sizeof *hdr, io->cls) < (long)sizeof *hdr) {
 		return false;
 	}
 	return true;