From 77fccb8c4c7fe52f29c4ea79518263c57792247e Mon Sep 17 00:00:00 2001
From: Mark Vejvoda <mark_vejvoda@hotmail.com>
Date: Sat, 1 May 2010 09:39:20 +0000
Subject: [PATCH] a few win32 compile fixes

---
 mk/windoze/Glest.suo                          | Bin 238080 -> 238080 bytes
 mk/windoze/glest_game.vcproj                  |   1 +
 .../sources/platform/sdl/window.cpp           |   8 +++++++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/mk/windoze/Glest.suo b/mk/windoze/Glest.suo
index a7338754bdda14489b2feee2fde3238d630703ce..eeb2666bcb29779393d81bdd8a9a6a77401e6682 100755
GIT binary patch
delta 834
zcmZ8fT}YHc6#dT3rfV+x?JBN6rE4JVX6Qy%8x?+9;+h$<nU&^G`4_cRN)bJ|8&MD8
z8Vz}SDj~235z4I{dI+t|q(4oF3VYDU2sSgJ2O*mcU+Thvxx<}v&pmenV@ZLrr2Br;
zDtFn}#pH0O=|G~{qG{T)3NmgnXLvC=l_fBBWmnMXM>R_k7TcP;hHa}oR+*z<Rd_pC
zWc&U*x(sNd*y}<-JPjTaNj*A!ZsE4RAk1M_5$Dv+(6j`FSj67k=ycvSIuB;#ujDHn
zTB*wS#)?GA`1){QJa|kz``Aj~T6h{Y`LKubC-H&KR-j5&Ig!H#HiFT-I>~Dra2_<}
zL_Eb8pe^Etq1(;>(Wj|AOU+Ykz$F6)f}jU+e3)_yF-QHc;E(J9Of>C)Tl5EYIaG=R
ziqwS!alg(%E-!XR_M(GPPB#A}MlaatNd<QIU11$moXb~5_5(~Tq<CppBfl&hmoll+
zhwJpZ5L;+;iQN%znv<x$p4U=Sl<lPC6h0wFn=PVx&JnB3rQAa15$++27-%n$T{U>l
zsjUGvd8U9J1(mnLL*<8&7pYT?Xs(-2(XJzSPV-(Ry%D3Zw<(iPE3El<avEuZivsm<
zNJq2sO$4Srv5qw~>4ZVc3v5C-W;4a@lbLiep8MpB<G6=NJGe<~FzK?pHRjcqo7{in
zmZI=uj+6B)LNpRax|o`Yqd^Dv(Wz6oN&SbFm@b&J^g<<Mhl0K$rmqJlWS|EI?9bHa
zdaJPdf1M#@(0m9J(B$J@c-PVJJ61~xQC36tPJE?V!PbgUcRDToWZNPSfi$wdLY;g$
zjO`$Ilx?QoVR%qPCFR_Z#vA1d=`OY3s@DjU+XX+p&*mPHU6v~MP2o`kSvT?1a>j=|
jwdzuwxys#4ayKu_!Y{JMBcIMy@){)mJ<G*PZmInPZ>SVM

delta 765
zcmXAnT}V`65Qg{tK7Y2d&DJHiHTASoZd#j$g%`;lQ`1VLR<qs2pE8WhGOdsTYqyIc
zNHf3i?J9_%ppbs7bLb*k$;7h6h{)(hFT04Sq%I=rWCH^OFY^pD??gr%krBtewz&Ao
zANIh!p^muf1@@mdo9&Mk)UOKP(Ci|YP?}RiE|>2VsW)`z1{JFC^>?@tQNz*Q%F&a|
z56#j!5QTk6Y)SAbtwW=(!+k^V*ae}&quENYa1TXBqkGl9vPu?h77p{vDl8V%OOR=1
z`f&m`S3}G%Siiw$OR=4lV{Guq-^w4zv9Jjo--H)N9`s~}bodx+#8Q>j5-?*rilMwN
zH;WqNMb+D2XE=y{zOBHpQ3}M-`C53`lnw`<Y(dGuIdOoQ8FEU+x}0k4(=r~eLbkCL
z2LuDlt*LsSoUgRA9_D&w9~(=MZfpkxhjVaS#hN^<tCO|n-5_>?$@#L~Z1;;5;Qew@
zsPYDr)Xf&Z*;#{Uk_-KC@?#h)IDJOGQ5y#xYVu<O2ah7ir{mDsRd2!fSa8+v%45}c
zaYbEgb@TZq?Bk&vtmOKTMfmegTre6C1E(6{8|Z<XkveFm)`U#UmuZjH<l)Ig88pND
zaSPOT$W$}672PmeAmhkGILLb;ME{@t(ow{t|EdLO!;Iwh5c=i>T7G1(I*2{I^8lZW
zPT13^^`MEdUbxLj4|L3Hwm##8mFX<*mMQUBRvFKkUc84iA74U+S9P8#;IHqZ#!P>S
zE*KAiC5#5Kj)8g<qQIEI6|lHm>Zbn6T1rJz*05><r!1#e^K-LwanY<O<x?Nt@lA#-
zR2gM1vvLxT>UnvyIP%ZCF%_xtGVd7djGcyyRbkX}Z6yl%(}#beU&X$9&!^=JGc8}P
Z@n8WLCtBZoe4DI6(p+uMZj(v1e*q2K0lNSI

diff --git a/mk/windoze/glest_game.vcproj b/mk/windoze/glest_game.vcproj
index 6975744c7..5b00c25b8 100755
--- a/mk/windoze/glest_game.vcproj
+++ b/mk/windoze/glest_game.vcproj
@@ -167,6 +167,7 @@
 				OptimizeReferences="0"
 				EnableCOMDATFolding="0"
 				LinkTimeCodeGeneration="0"
+				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
diff --git a/source/shared_lib/sources/platform/sdl/window.cpp b/source/shared_lib/sources/platform/sdl/window.cpp
index ab5009543..fec55b8d3 100644
--- a/source/shared_lib/sources/platform/sdl/window.cpp
+++ b/source/shared_lib/sources/platform/sdl/window.cpp
@@ -18,7 +18,13 @@
 #include "sdl_private.h"
 #include "noimpl.h"
 #include "util.h"
-//#include "SDL_syswm.h"
+
+#ifdef WIN32
+
+#include "SDL_syswm.h"
+
+#endif
+
 #include "leak_dumper.h"
 
 using namespace Shared::Util;