[Scummvm-cvs-logs] SF.net SVN: scummvm: [32674] residual/trunk

aquadran at users.sourceforge.net aquadran at users.sourceforge.net
Thu Jun 12 19:40:14 CEST 2008


Revision: 32674
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32674&view=rev
Author:   aquadran
Date:     2008-06-12 10:40:13 -0700 (Thu, 12 Jun 2008)

Log Message:
-----------
updated msvc9 compilation

Modified Paths:
--------------
    residual/trunk/dists/msvc9/residual.vcproj
    residual/trunk/engine/lua.cpp

Modified: residual/trunk/dists/msvc9/residual.vcproj
===================================================================
--- residual/trunk/dists/msvc9/residual.vcproj	2008-06-12 16:58:02 UTC (rev 32673)
+++ residual/trunk/dists/msvc9/residual.vcproj	2008-06-12 17:40:13 UTC (rev 32674)
@@ -70,6 +70,7 @@
 				IgnoreDefaultLibraryNames="libcmt"
 				GenerateDebugInformation="true"
 				SubSystem="1"
+				EntryPointSymbol="WinMainCRTStartup"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="1"
@@ -157,6 +158,7 @@
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				LinkTimeCodeGeneration="0"
+				EntryPointSymbol="WinMainCRTStartup"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="1"
@@ -191,6 +193,14 @@
 			Name="common"
 			>
 			<File
+				RelativePath="..\..\common\algorithm.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\array.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\common\debug.cpp"
 				>
 			</File>
@@ -199,10 +209,30 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\common\endian.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\common\frac.h"
 				>
 			</File>
 			<File
+				RelativePath="..\..\common\func.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\hash-str.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\hashmap.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\hashmap.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\common\list.h"
 				>
 			</File>
@@ -223,6 +253,18 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\common\memorypool.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\memorypool.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\module.mk"
+				>
+			</File>
+			<File
 				RelativePath="..\..\common\mutex.cpp"
 				>
 			</File>
@@ -235,10 +277,14 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\common\platform.h"
+				RelativePath="..\..\common\str.cpp"
 				>
 			</File>
 			<File
+				RelativePath="..\..\common\str.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\common\sys.h"
 				>
 			</File>
@@ -247,9 +293,21 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\common\util.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\common\vector3d.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\common\zlib.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\zlib.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="dists"

Modified: residual/trunk/engine/lua.cpp
===================================================================
--- residual/trunk/engine/lua.cpp	2008-06-12 16:58:02 UTC (rev 32673)
+++ residual/trunk/engine/lua.cpp	2008-06-12 17:40:13 UTC (rev 32674)
@@ -20,6 +20,11 @@
  *
  */
 
+#ifdef _WIN32
+#include <windows.h>
+#undef ARRAYSIZE
+#endif
+
 #include "common/sys.h"
 #include "common/endian.h"
 #include "common/util.h"
@@ -54,8 +59,6 @@
 
 #ifdef _WIN32
 
-#include <windows.h>
-
 extern WIN32_FIND_DATAA g_find_file_data;
 extern HANDLE g_searchFile;
 extern bool g_firstFind;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list