[Scummvm-cvs-logs] CVS: tools descumm.vcproj,1.3,1.4 extract.vcproj,1.2,1.3 queenrebuild.vcproj,1.1,1.2 rescumm.vcproj,1.2,1.3 simon2mp3.vcproj,1.2,1.3 util.h,1.10,1.11

Pawel Kolodziejski aquadran at users.sourceforge.net
Fri Jan 9 23:44:01 CET 2004


Update of /cvsroot/scummvm/tools
In directory sc8-pr-cvs1:/tmp/cvs-serv27687

Modified Files:
	descumm.vcproj extract.vcproj queenrebuild.vcproj 
	rescumm.vcproj simon2mp3.vcproj util.h 
Log Message:
updated and fix compilation

Index: descumm.vcproj
===================================================================
RCS file: /cvsroot/scummvm/tools/descumm.vcproj,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- descumm.vcproj	28 Oct 2003 18:34:02 -0000	1.3
+++ descumm.vcproj	10 Jan 2004 07:43:51 -0000	1.4
@@ -127,6 +127,9 @@
 		<File
 			RelativePath="descumm6.cpp">
 		</File>
+		<File
+			RelativePath="util.c">
+		</File>
 	</Files>
 	<Globals>
 	</Globals>

Index: extract.vcproj
===================================================================
RCS file: /cvsroot/scummvm/tools/extract.vcproj,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- extract.vcproj	28 Oct 2003 18:34:02 -0000	1.2
+++ extract.vcproj	10 Jan 2004 07:43:51 -0000	1.3
@@ -116,7 +116,13 @@
 	</Configurations>
 	<Files>
 		<File
+			RelativePath="extract-common.c">
+		</File>
+		<File
 			RelativePath=".\extract.c">
+		</File>
+		<File
+			RelativePath="util.c">
 		</File>
 	</Files>
 	<Globals>

Index: queenrebuild.vcproj
===================================================================
RCS file: /cvsroot/scummvm/tools/queenrebuild.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- queenrebuild.vcproj	28 Oct 2003 18:34:02 -0000	1.1
+++ queenrebuild.vcproj	10 Jan 2004 07:43:51 -0000	1.2
@@ -102,6 +102,9 @@
 		<File
 			RelativePath="queenrebuild.c">
 		</File>
+		<File
+			RelativePath="util.c">
+		</File>
 	</Files>
 	<Globals>
 	</Globals>

Index: rescumm.vcproj
===================================================================
RCS file: /cvsroot/scummvm/tools/rescumm.vcproj,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- rescumm.vcproj	28 Oct 2003 18:34:02 -0000	1.2
+++ rescumm.vcproj	10 Jan 2004 07:43:51 -0000	1.3
@@ -118,6 +118,9 @@
 		<File
 			RelativePath=".\rescumm.c">
 		</File>
+		<File
+			RelativePath="util.c">
+		</File>
 	</Files>
 	<Globals>
 	</Globals>

Index: simon2mp3.vcproj
===================================================================
RCS file: /cvsroot/scummvm/tools/simon2mp3.vcproj,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- simon2mp3.vcproj	28 Oct 2003 18:34:02 -0000	1.2
+++ simon2mp3.vcproj	10 Jan 2004 07:43:51 -0000	1.3
@@ -116,7 +116,13 @@
 	</Configurations>
 	<Files>
 		<File
+			RelativePath="extract-common.c">
+		</File>
+		<File
 			RelativePath=".\simon2mp3.c">
+		</File>
+		<File
+			RelativePath="util.c">
 		</File>
 	</Files>
 	<Globals>

Index: util.h
===================================================================
RCS file: /cvsroot/scummvm/tools/util.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- util.h	6 Jan 2004 12:44:02 -0000	1.10
+++ util.h	10 Jan 2004 07:43:51 -0000	1.11
@@ -62,12 +62,12 @@
 
 #define ARRAYSIZE(x) ((int)(sizeof(x) / sizeof(x[0])))
 
-static uint32 inline SWAP_32(uint32 a) {
+static uint32 SWAP_32(uint32 a) {
 	return ((a >> 24) & 0xFF) + ((a >> 8) & 0xFF00) + ((a << 8) & 0xFF0000) +
 		((a << 24) & 0xFF000000);
 }
 
-static uint16 inline SWAP_16(uint16 a) {
+static uint16 SWAP_16(uint16 a) {
 	return ((a >> 8) & 0xFF) + ((a << 8) & 0xFF00);
 }
 





More information about the Scummvm-git-logs mailing list