From 5cf84e8a2aed4b35d9d095a56aa0f9e488737f5f Mon Sep 17 00:00:00 2001
From: Mark Vejvoda <mark_vejvoda@hotmail.com>
Date: Fri, 30 Apr 2010 23:30:15 +0000
Subject: [PATCH] win32 compile fixes

---
 mk/windoze/Glest.suo                          | Bin 225280 -> 226304 bytes
 mk/windoze/shared_lib.vcproj                  |  12 ++++++++++++
 .../shared_lib/include/platform/sdl/window.h  |   2 +-
 .../sources/platform/common/base_thread.cpp   |   2 ++
 .../platform/common/simple_threads.cpp        |   4 ++--
 source/shared_lib/sources/util/util.cpp       |   2 +-
 6 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/mk/windoze/Glest.suo b/mk/windoze/Glest.suo
index be10c56cb88ff479d17ef2ad773804bf073809dd..e7c9a3f199b4b1150f9da79f449bc3f4af403273 100755
GIT binary patch
delta 2801
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
PyK9*Rc%7wAO3}XovHZD5

delta 2516
zcmYk83s93+7J&bAE(t*+Mo1}5F-EMQh!6oEphC<df(i!YB}GAGv;w0*t?j4_ztq~D
z`ii;AK`Sdd)5X<J4W{PW&UTD;79YD-s!r`rXSTrTcGnffU1zJi754sUXPTLt$=rMH
zx##hnbE5uzjM_WKTNk9W@k5E^YY1XS{Ru@;-rvc$n3^Eo_tX>uV@ebNMY)KIat#%p
z(LEg-6kmGS=Xy-h`TiT(1gPxuZLxGu50O`uG1?c0bFt(0$s6r*#mS9pr&7XH4qHoj
zXrYOhzi#ni&X56gJ}3yD5IkN=Bq|DJIA8`plWF0$ln7sagFB1c&sD-izW-bz1zc$7
zJMtW7K68wLiL||ly$m|)D`MfiJlpJ3yRGA(gZDjpm%JO9!FTK1_z>#&0Gr5t6+`*%
zJ66vmtIyis5B#{-N#EPi$hYL1ea5?wLwQ1<iA<4jn5#m{Jl-4{(kU(aSgyZOJHnT6
zhgLI41TOY7*l1>o(#WB+f_F5Uh3ysSHPGmA7Ekeup^4+ai|PDTFw?ZJF;cWdL$i*D
znWs>D5ANl?JB++_jg@vyWCipv4(5sT39tYt-~)$nq<{(h@z4SAHXWM|$-2!tMQNtL
zOos^uRsI|r9v&vwOz7f{@F+3f3CW<_uI&q*9e!doaSD8X(8R1faK<E3vmp`$%z}(j
zV`E=r;Nj4NVVO%hUjZ|O>VWOQ`v>yqXb!9<H3uh)$xC4x_%i{5C_fiYQ)v(0)QqO@
zuR;Ta@{EtSa#x0)nmz$5EnWhCZi-5y^bO2F8xv7a*~L&ru0Mg7?D=dZcdxMW`#UU}
zyT!CI3+GYnb(l)38EnFq2faY9>rysT&q`?740&8}7{6$B!6I7LgO_>bG9%TN!d=>5
z4Vk1Su^38R#q^@S5ZoY>79)C!!4BNE%t4N|P(x}JoaJTzu+W5Z*hzb)LKvOO!b2|}
zEQ3Da7c)yqZ3Yv4wo*Rhu7_0ms2sw?k}A-Fe-#8Eq+dqsp<I(RipjP|3ahVc7FS9I
zB7Y5>Msh92HN0b;l`3Odn1+~<j@CdK9hwQVD6v)o+F)i`VsNcYDFuy(Lh8-MXmYzT
zg1%}31086Dh}QL*);FY9T0MY%&%!YBUcyj1QOTl3PCW#Jr%ejfK_BDCZ?|asHcHNh
z1N5DqUE#K>Ms6Pn61F#?7kQv!Ep6*YGgrSbP|K$<#lIO0FVmbokWGQTU>E8hZ~zVN
zm0_PmU+;s&Ru9-cC*%Wexy2*TNjJHab9gj4H5DW2atBO-<8<LS&_K3p7$?dPK%J4E
zbV!}1G>oDnsc06CV{pMl&b5+xSwt3U_Q7_NFo)BUm)JdeHU*Yb*9vfo`=5eYW~(fQ
zVgj&(RKMoFA9_QmxrRlNbr*(;TLFj%`eeQg<18m`@?QjI5X+~+GtelA;XSJ@!trOg
z0NiPd7$Hwc@?>I<7sc@2e}(bDLbF)f17}x?{SOd<n;s=mP78W85-xN1x&#?Bqj)6?
zXM;Zp)nM|bVh;u8ql{1*W;2~rraqfL6Uig7N!N5ct6cKdC~;~LegxvA6N`aY7U+4~
z^w%hEDXLWUdx=n3CO(vW<e=nZ@F1qr;B1MGj7G6I+JapuPA<h#&=@e2OAq5H_5*yE
zS~?(wzvDFuM;@y3q6^)v*-RRfj}{Bep$}{E)z&&Raql`K9jL_?xp%h~rwO$Vx4$Iv
z-^0^E<S?-cQQ^Ty$UD4M8k9DQ--Wm6?gWWvm>b(XZB}93jr|OE6LjORc%a2a>HF~_
zx36;Ygro>6J%R<obr8MMh@ViZJB-I<XG*|Mtq3jTJAkFso`bV_d6GdG+VH7#_DdWF
z?k$QO3B9$@B<>u+C}{1*lm6c#yvCC<ojlK;K)M9nD`Zi3NwQL)o!alC&vUQPv(Q57
zTzO+J!9)pJf?x7fa~WHM{r|x-=yVMr`fnguINmFyzuF`)e|(5@^%VFD)=|a#cv<Ur
z<eC6RvEqOD<8w$z{Sj5JeiupBYK%Xd$s%MSN%x;%KagVp|4HWwjbf3Wg|Lx>A?=`L
z8$?h&FgFj}u6|x?J3`qvt;lY{kjS@doiT_3^2SvbQ5(Vz2JwNS(PFfTEo8jjF^k+|
zSv~K$7fpkcAyTA8F&hY1IP)6F70lLCdLuK7Ut8HtlrF<NbYnbA;JrUYYttf{x5=qc
z6~ms;u~%WPkPY*#AlbIqBwlkRLZsT+C1_oOB~+5ap3?PdkgjRfqQ)}GOr{4;(#a&|
z^~W*LQ~peL`bCtpn2)PbDby3oLg`2{tLAEann;@?P2&yW^GVK--JTyzVycV9%FHA(
zS&*}s>;}%8HrkTPc5?6dIbu!$iw1uh10%oDHIMiF!9X4Hvg3^;HL+M8hRT}JM*PnM
zra70*=yb?p8eOiut*lozD9K6^jjh85R;_HL)46OxYn=929@AQC2^$6~Th4w*?%g00
zRmtW76<ot&ZhK%8n+w?}3F3S-aL2hwau-RsGjmyrag$Q6Y*HGPx1@gITEV=?_pO~d
zQtjf>DwYaVpM$kjTgC2@w}`pu1P3D-%b6*BvNTxx{K9C_T+Uj6^4GAlR8z&Sko!$J
zb)=8;X~rVlM&GPvaokm%q>UvZM_!biUh7yF?I~s(MmYXZj+>t+K`9N_u!2sgX4siu
z%aGs=>7$Mol(PloT+h<Eqd=vu#jurzHbazVb0HmlEJvWU_FEdvMXBpWqX>O|db@#5
a<&}oYUo1PfEh^Uj@3=gD=|Tb)1^)+r5^t3N

diff --git a/mk/windoze/shared_lib.vcproj b/mk/windoze/shared_lib.vcproj
index 502e89d28..bde31e3ea 100755
--- a/mk/windoze/shared_lib.vcproj
+++ b/mk/windoze/shared_lib.vcproj
@@ -707,6 +707,14 @@
 			<Filter
 				Name="platform"
 				>
+				<File
+					RelativePath="..\..\source\shared_lib\sources\platform\common\base_thread.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\source\shared_lib\sources\platform\common\cache_manager.cpp"
+					>
+				</File>
 				<File
 					RelativePath="..\..\source\shared_lib\include\platform\sdl\gl_wrap.h"
 					>
@@ -727,6 +735,10 @@
 					RelativePath="..\..\source\shared_lib\include\platform\sdl\sdl_private.h"
 					>
 				</File>
+				<File
+					RelativePath="..\..\source\shared_lib\sources\platform\common\simple_threads.cpp"
+					>
+				</File>
 				<File
 					RelativePath="..\..\source\shared_lib\include\platform\posix\socket.h"
 					>
diff --git a/source/shared_lib/include/platform/sdl/window.h b/source/shared_lib/include/platform/sdl/window.h
index b725c571d..0e51c6054 100644
--- a/source/shared_lib/include/platform/sdl/window.h
+++ b/source/shared_lib/include/platform/sdl/window.h
@@ -116,7 +116,7 @@ private:
 	static SDL_keysym keystate;
 	
     static void setLastMouseEvent(int64 lastMouseEvent)	{Window::lastMouseEvent = lastMouseEvent;}
-    static unsigned int getLastMouseEvent() 				    {return Window::lastMouseEvent;}
+    static int64 getLastMouseEvent() 				    {return Window::lastMouseEvent;}
 
     static const MouseState &getMouseState() 				    {return Window::mouseState;}
     static void setMouseState(MouseButton b, bool state)		{Window::mouseState.set(b, state);}
diff --git a/source/shared_lib/sources/platform/common/base_thread.cpp b/source/shared_lib/sources/platform/common/base_thread.cpp
index 1680367d0..15d93dc8a 100644
--- a/source/shared_lib/sources/platform/common/base_thread.cpp
+++ b/source/shared_lib/sources/platform/common/base_thread.cpp
@@ -11,7 +11,9 @@
 // ==============================================================
 
 #include "base_thread.h"
+#include "platform_common.h"
 #include "util.h"
+#include <time.h>
 
 using namespace Shared::Util;
 
diff --git a/source/shared_lib/sources/platform/common/simple_threads.cpp b/source/shared_lib/sources/platform/common/simple_threads.cpp
index 9de1ce6ff..b8ca1c07b 100644
--- a/source/shared_lib/sources/platform/common/simple_threads.cpp
+++ b/source/shared_lib/sources/platform/common/simple_threads.cpp
@@ -33,9 +33,9 @@ void FileCRCPreCacheThread::execute() {
 		vector<string> techPaths;
 	    findDirs(techDataPaths, techPaths);
 		if(techPaths.empty() == false) {
-			for(int idx = 0; idx < techPaths.size(); idx++) {
+			for(unsigned int idx = 0; idx < techPaths.size(); idx++) {
 				string &techPath = techPaths[idx];
-				for(int idx2 = 0; idx2 < techPaths.size(); idx2++) {
+				for(unsigned int idx2 = 0; idx2 < techPaths.size(); idx2++) {
 					string techName = techPaths[idx2];
 
 					printf("In [%s::%s Line: %d] caching CRC value for Tech [%s]\n",__FILE__,__FUNCTION__,__LINE__,techName.c_str());
diff --git a/source/shared_lib/sources/util/util.cpp b/source/shared_lib/sources/util/util.cpp
index bd67aa8da..55e45bfe1 100644
--- a/source/shared_lib/sources/util/util.cpp
+++ b/source/shared_lib/sources/util/util.cpp
@@ -60,7 +60,7 @@ inline bool acquire_file_lock(int hnd)
    return -1 != ::fcntl(hnd, F_SETLK, &lock);
 #else
    HANDLE hFile = (HANDLE)_get_osfhandle(hnd);
-   return true == ::LockFile(hFile, 0, 0, 0, -0x10000);
+   return TRUE == ::LockFile(hFile, 0, 0, 0, -0x10000);
 #endif
 }