From e1cafeb1e93c8c84ed6defc46f7d7213f43b6354 Mon Sep 17 00:00:00 2001 From: squall-leonhart Date: Sun, 4 Dec 2011 02:55:52 +0000 Subject: [PATCH] trunk fex fixed --- project/vs2010_mfc/VBA2010.sln | 2 +- project/vs2010_mfc/VBA2010.suo | Bin 19968 -> 20992 bytes project/vs2010_mfc/VBA2010.vcxproj | 46 ++++++++++------------------- 3 files changed, 16 insertions(+), 32 deletions(-) diff --git a/project/vs2010_mfc/VBA2010.sln b/project/vs2010_mfc/VBA2010.sln index 1dd439f7..4cf958ce 100644 --- a/project/vs2010_mfc/VBA2010.sln +++ b/project/vs2010_mfc/VBA2010.sln @@ -10,7 +10,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SFML_Network", "..\..\..\de EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "..\..\..\dependencies\lpng140\projects\visualc10\libpng.vcxproj", "{0008960E-E0DD-41A6-8265-00B31DDB4C21}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "File_Extractor", "..\..\fex\File_Extractor2010.vcxproj", "{7AEC599C-7C82-4F00-AA60-411E0A359CB0}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "File_Extractor", "..\..\..\dependencies\fex\File_Extractor2010.vcxproj", "{7AEC599C-7C82-4F00-AA60-411E0A359CB0}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/project/vs2010_mfc/VBA2010.suo b/project/vs2010_mfc/VBA2010.suo index 9fa6140abd9d1f1cfdfb2e53ef6244b472b36198..279d74938e69b33a74ef08036f1f4ce37ab25bc4 100644 GIT binary patch delta 2382 zcmb_e?QfG+6u-B7+O^$V$4dcuS%GbAYr8#N%QnUs?b?->ZLY}-nAikHw?Uy>N!ww8 zL8n1QMIt>2h^V}Yg2-D*B*qV&7!AgNB>n;V7nqotC?BZ5`?P~Pf*%O?$#3`EbMHC# z+|zS^cjKq{_<4Tqs7hVU7+Xf=O%>NSujNUpn@ed122eUFkxPuTrL&)ScDBS zE8EE8RPLyyZ%aCEl-}k#z6=%yVU-IvHCcAJpxrMq##xGcT4j8DU5(z(W=E&Z+R^N= zTWvOvY;|?oTvl0j$?g@h*XwoL_l>pn1fv0OFf^D-&vbD0oA7#z{+ZRKErL{>w})mC z23sWBGkYDm%T^_gYo)ThX>|n#cWJk=ODYg*<)B98phYi2QHS6Z{Zd!TIro&F#usRo zyI3RhvQE~_9QbR)Q9Bgb4#|ek!(>PgM!K|6sFCZrJ- zU_taz=4V6b#;#?3z4CNlA?z{2wjv@2BJg7r zf&F%P6`sUyyRb`?jly>bI-9a81l^XbC0(zagPksAchWuDi4s+R8GesFJnR1Ym+~tw zu+w+SGPkK*Tazr&rfyc3sgzXL#uQ9$YXXUEq|-L59X5MX|t1@UK5$>D^uxuNu`~ERW*4lQJ1b#&VaKd1>~^o!;f}VCxm*3dNO)_cf7m4MUDQ+)Z)vLa z_XGoxa5Ov=Gi?Y)NBcvjzS!tMFl@5P^|F71+ut7x4G#tU(MZ5A`q(y2WFQcZ4AS8i zi<>jfm3A z$~Nk4SfuX7j~JtSOV-id)s0=#>7@_E(!;uO^|#>K3yK*~XdnPelXC`JV9Z5U@IuZ&vKHmq-)hu!Lh9E6E8%2m8nn^LU!IxGa8Mw zy>lmdJ6cueIr$7DQ}?{>Y1R8jU~l1-x?4TpP5it*w*Trx7u?~R{HM`+chkIng>D70 z_8`LPZ&iC$4K>PqD^ z94w@Csa7f!4svw9EZ<27jKmQJaj+5Ar<7GpIoeiQTv~zuT{M(dYb8yd1I_Cg=o#&i gt9c8ZvGl1gLGcrD!y2rY==+{FG8kGQ7f+Y}1r%{`+5i9m delta 1290 zcmbVK-%nC;6#stVBA^l~$e5K<2%`xM5S2^^UT$hCiPnQ98zE|$`D2JpQzvWo()uOG zhvwXB*?Q=qRkx?s8m?dKCFgSw_0(TL54EP9uYx1jdg$Dp-Sgvf&iUMPPvRj>tk9=R z61w@UYnUdv4tfv{aTR&NZjJPd6k^;4_$|()ii0Ux2PY$hz+#IP(y|3^b8Bl0X7gU` z7;d>?$LNvYIKWa&XAwV#%IvH>R|pb?7K0_MS-9;GI5>Gyg9Gw|TwYEL()sI3s=!Ej zPP9;k&Q(+UaNRWp zJut0n2f^Ziv~FES%?yWYD>#Y9x9yqe8=FL*ekC80-UiScQ?OtRGO{R3xt}uFR7v*) z3>h4OE}usJm zajmM3N|vSY)A~_KGzgabQDAd{sjUnf$q?TQdi!B9W#=Rc6Qa~PNHOiWOT`YsO(9k7 zgT(Q(Fw$sVO`sp;58`%(g7bZm5UMQ_8-c}oZE5x(*n0t6T|?bm?AouoiN-DFU;+cH z;@4UOg>tW+-iKb^#F`aG$3{lRMnl0!JbD4US>dJUJ)GkWnDn*wk3~b>1Cjo~fIZOc zx5uaAv$HcEzS`r$$5!idxNJ_R;Iw%>bq<>YrP)(gQ+HHw&EZAt{2oGve2+5Is*`qe z&K4RU9HYj_XmlVP2*qQQqr;(zSTqzFp9~!z92|(oC&K(B8ZkzT=8K62DxvqX#9`TO zhS7#%sP*b}PqMSf;nb^)Eo7$(C4XvoAZhfp9(=pRc*D)bCA^Yv`)ga5zw4A0${o=`l)>$|=s zmE5)Ac4Ha5_FLhSUkkD7a=gh(khren@%@r=`w^EtcQM}D$tg)GhPa$Cq&qs{4d;~2 OVDJ%iDca#}u;DivgLz&6 diff --git a/project/vs2010_mfc/VBA2010.vcxproj b/project/vs2010_mfc/VBA2010.vcxproj index 8f34f2e6..ca192463 100644 --- a/project/vs2010_mfc/VBA2010.vcxproj +++ b/project/vs2010_mfc/VBA2010.vcxproj @@ -24,9 +24,7 @@ Application Static - false NotSet - false true @@ -58,8 +56,6 @@ $(ProjectDir)$(Platform)\$(Configuration)\ $(ProjectDir)$(Platform)\$(Configuration)_temp\ true - false - false AllRules.ruleset @@ -90,7 +86,7 @@ Disabled - ..\..\fex;..\..\..\dependencies\lpng140;..\..\..\dependencies\msvc;..\..\..\dependencies\SFML\include;..\..\..\dependencies\zlib;%(AdditionalIncludeDirectories) + ..\..\..\dependencies\fex;..\..\..\dependencies\lpng140;..\..\..\dependencies\msvc;..\..\..\dependencies\SFML\include;..\..\..\dependencies\zlib;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;_DEBUG;DEV_VERSION;BKPT_SUPPORT;GBA_LOGGING;MMX;ASM;_CRT_SECURE_NO_WARNINGS;HAS_FILE_EXTRACTOR;%(PreprocessorDefinitions) false true @@ -125,10 +121,9 @@ Windows false false - false - MachineX86 + 5.0 @@ -146,57 +141,46 @@ /D_ST_MODEL /D_SECURE_SCL=0 /MP %(AdditionalOptions) - Full AnySuitable Speed true - ..\..\fex;..\..\..\dependencies\lpng140;..\..\..\dependencies\msvc;..\..\..\dependencies\SFML\include;..\..\..\dependencies\zlib;%(AdditionalIncludeDirectories) + ..\..\..\dependencies\fex;..\..\..\dependencies\lpng140;..\..\..\dependencies\msvc;..\..\..\dependencies\SFML\include;..\..\..\dependencies\zlib;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;NDEBUG;GBA_LOGGING;OEMRESOURCE;MMX;ASM;FINAL_VERSION;BKPT_SUPPORT;_CRT_SECURE_NO_DEPRECATE;HAS_FILE_EXTRACTOR;%(PreprocessorDefinitions) MultiThreaded - false StreamingSIMDExtensions Fast - $(IntDir)$(ProjectName).pdb - Level3 - - true true true + true + true + true + Level3 NDEBUG;%(PreprocessorDefinitions) - 0x0409 %(AdditionalIncludeDirectories) - false nafxcw.lib;libcmt.lib;zlib.lib;libpng.lib;%(AdditionalDependencies) - $(OutDir)VisualBoyAdvance-M.exe - true ..\..\..\dependencies\lpng140\projects\visualc10\Win32_LIB_Release;..\..\..\dependencies\zlib;%(AdditionalLibraryDirectories) %(AdditionalManifestDependencies) nafxcw.lib;libcmt.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) - false false - false - false Windows - - - - - UseLinkTimeCodeGeneration - false - true - MachineX86 5.0 - true + true + true + true + false + + 1 + @@ -714,7 +698,7 @@ {3e03c179-8251-46e4-81f4-466f114bac63} false - + {7aec599c-7c82-4f00-aa60-411e0a359cb0} false