From eb8ea04e8614dec2123f00abc8d18960b44e5c11 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 6 Jun 2009 15:47:14 +0100 Subject: [PATCH] Sort out profiles on Windows --- msvc9/Lander/Lander.suo | Bin 23552 -> 24064 bytes msvc9/Lander/Lander/Lander.vcproj | 6 +++--- src/Main.cpp | 9 ++++++++- src/Platform.hpp | 6 +++--- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/msvc9/Lander/Lander.suo b/msvc9/Lander/Lander.suo index 2257c7b5723f847e0ec3bf29b6b834b22e4dc8ff..96141615f42943c50322f36032567179d2b5fade 100644 GIT binary patch delta 4652 zcmcJTdvsJ+6~@n<+<7GAMH2F2AQLiqkPw(5Atk&rd62{qk|1dVAs{7Ciqa;+&=#yt zT3uohfo8MBwrWvZl~Oh7SlcSCBT#B@ta^nDTdLyEzI`T3voK3MV?~x|ra$Iy>F28&2wSv5#*1axAIaF;m}} z*6k>@-00Y}PKTT^gAz{da(NJ)q@z>MTk=@i%*e@v0!I>`{}+cc5JFqL@u<`Gl=Agi z{Wnw9zA;WcCr7CTfX|z(KY;76gXv(k+M{-=u-c)bhteN6 z*cs<%pdXRF8LQ-MQozMDzMd#oGT!61a+6~9+{wz1%HGU2w=oTFs;x4Cm*gLrPpz(o z_aRlU7OG~oQeCI2@fpO}G+2HWydeIXQ~+MRb*~;?0DtwMQPtwJ+4^f#RnhURCaZ4} z&VI#ZqUjtvui>17hLIgL@)``c!C8@R=QW)FF-I&hdL_Tja1}%L>2Pni;c(ji*sK)C z_5Es>8c@5zO-OfMZF*D zR%r9p%~Dd+lQ~1ZWjv!X-$&6+POvoH%{iTkMl$+$ZPJa+>9oe+AjDSLThx|la86I$ zFKRIQ#0a*?NNcu}YsS7BY|Az>4D6P{1-a5xd`Mz# z!!lTE%7x-V@%b~1MAW+{8ZMpVh{no8PA5CG$*x3w8nEjA9`#N*b$XWUw?aYC+F zNI9l9l5YpHGrIs6|7}|1O1T}RfW2B{+yT%6KB+av9R%#qr?kdhsatw_iXyCiA4mgF z0d^}DoC0;=X+VvwJOdc_T|kXr`xu~|2GqD(o(0^$&H-xd)%OAGo(J*vUST$?ApCHW z_#Au}xS%y|m}da($4Wv~u}D9X-=_wx$-Nz)H>z8d4^w;xCg?V6I^P2S|1$Y8!~@gu z=xtadE0B8ZXfQca9mE&@uiKdws8oq;ULFxoFeCwM_Vq4(o27)|@ z#t{E6S{rQ3lG2(Rg73I3S<%uUmup(2wW<&OS+kP^IeBmH!1X@B#V}c4k0~(#I724u ztk2Vt+wo+b3(*HSv*NlOS(GJL)63+sEU%Z-unD8I1-saGb*JjFcC{+(*GrWYRu&lj za=bWKE?4-(7cj*vZ^z8KX}H`Jf1o3zf(xgfN$j})WwZqXMxsGVE4A;xS|-> z1b9x-Rsw3=K$-!q4N$8GtCWhMQ0jevB5gC^gSP-`1)v|$wgYP1{_X-b;BG*T$K=g` z7T zO!pK@$Z5JNpv||=BG>oeUQUpGy?)t}H(LUxDX|=nBVga<2J{Joca4BuJKuCMx0Uw& zpTYeJ?tA@4t-fFFx&*P$kSp~aj(jUj!VT8@PBh$jF~KOqELa>JYH>RxP?3w}(A)Bk z7ZjdgTeUIiZ6g|Lt2ZL=>Xk!%7>i;V-j8-*zwF19i0_>%pigOk9d2*(@Rclnc1OeQ zM-7uNUy|J6H6N!lufrdC4bGhhV}R{{le3!6w;((Lo&-GQV&FS~r`*$kCmSadW65dw zXTVwTEI0>vF!2<79=rg40A2(yftSH~fD_GXgNN5e@FQ$IIJGc&z)t}i|2fKEfM0@N zfnS5)fZqb%{~gNTgFk>*!5=}qV}FAGXI|gCW<$ho+Ko##V}N|XFHgG!s4W3(lE$W} z`2Yuo_6DHFt>;ZZb3mZRtt5dCEJbSz;ipo=^Hq)(SHjQLfpfIR%0*h6r?qBim0G(_ zYplCiYYkdk2dzph(ERtA|F zKj1en)|wM#iPlQBmW*-{m=9{SmWHwsaJZVZmWq-?&m*oyYxFw-zfc!v6FZd+a28p{ zIY5mMUT-NAM-d;)-JP}-#N)PEio)*|TT4NCtJdz&8tdMvwf$Pl5$%@GN+xF{XMmHADPztDncH V@2ozJ9OGXvc0bwI|3tt{`X|Rf5RL!< delta 3671 zcmbW4TWnNS6o&Vn&I|>58Kx~zDD9M%DU_C$w$Kij&>Juv2g;>t1tchf5)lX#C=;ywA8eZE@7xY~qGP?t5$G zf_JQoZzz!sNg=oD4>!T8$K_ce|0JE3I}_3*A;pKNi3%fA6>727)VfGday8mYhvu_p zq+#GSS1NwR^H-!{&>pS55uIA8r7Cf>gh0)?Ap;e6?#2;xWXmQ1oF|rL^X(lD08k?UaH^v*lJ!w$%HNTI#B5ua1{}IXk5z z)T;Z)O8*w=%8rd>k2GZW+VUOAV$GSZP-?vg)7`?SM)Ux(i> z9T{;_o*$c>VD%Q=uTYif{xqywKspK!IZyn)D=Z7g7B&w?#Ax6I;{o?gUoZmD%7DF> z0`MJRlF@i;!mD8^$M z1K5E@s!Ga>JH%I(D4n4la-bwvF4q+Lkyq?Jx!}?HZ=1hfcP?1Z(~LR1>5@!mvJOjI zX|n`_>#(`pvaRg7-c+7xRgNuaLd7}ALA_`<7;Se<<5P6n5!CW$X+h9!Wh`~a%EU?P zcFa_Vbq@b$%+U?N33z1DQFP`t%E@u_dO!Tmye4Z5HKik;W(s1f8!>xzdBr8;aOiq5 zgQ4gQPTk1rxy2>Ds%$U&Cdnv$;w8WPLcXL`=4n5ZnKV>hjpnxGXa=pi9wSMCK%`}Q zABT7*rODmEY*|&>C+ErTA|=NrrANv`6;%YLsno=k zqqO5H;4_!-?xTi8*{r6*;qhgHqR4zu4QRE%uFT}b%5#jy%=t<>} zNsSA<6wr19YWxm(2UyYjQBdS44+5_EhkzQB@F76$BVfn1!lxYv)R^?IfH1fQs0{&a zzzKc;)M!6O3-uF9&AV{|_}PdzC;}h23246nYWx!U70~VhEtlp7FkC+4_DrP%8;+9h zG>~Pqe4}yqjWJr8(dwZEj8<(lZt1B;t1%is?LtPIYqS(jcbySmG2%pMON`cFv}9;& zjkdvPkkm%_T-HrS #include -using namespace std; - #ifdef HAVE_CONFIG_H #include "config.h" #else @@ -56,7 +54,6 @@ using namespace std; #endif #include -using namespace std::tr1; #define msleep(n) Sleep(n) @@ -136,6 +133,9 @@ using namespace std::tr1; #endif /* #ifdef LINUX */ +using namespace std; +using namespace std::tr1; + void RecreateScreens(); string LocateResource(const string& file); string GetConfigDir(); -- 2.39.2