[Scummvm-cvs-logs] scummvm-tools master -> 9d458721969b4cfc4f6db8c9976a920cd2fd0b87

Strangerke Strangerke at scummvm.org
Tue Dec 29 23:13:23 CET 2015


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm-tools' repo located at https://github.com/scummvm/scummvm-tools .

Summary:
9d45872196 TOOLS: Fix compilation for MSVC9


Commit: 9d458721969b4cfc4f6db8c9976a920cd2fd0b87
    https://github.com/scummvm/scummvm-tools/commit/9d458721969b4cfc4f6db8c9976a920cd2fd0b87
Author: Strangerke (strangerke at scummvm.org)
Date: 2015-12-29T23:07:50+01:00

Commit Message:
TOOLS: Fix compilation for MSVC9

Changed paths:
    dists/msvc9/degob.vcproj
    dists/msvc9/toolscli.vcproj



diff --git a/dists/msvc9/degob.vcproj b/dists/msvc9/degob.vcproj
index a4b4608..6cc4171 100644
--- a/dists/msvc9/degob.vcproj
+++ b/dists/msvc9/degob.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="windows-1250"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="degob"
 	ProjectGUID="{C151022B-EAC8-4680-9018-C0A897F7F9C6}"
 	RootNamespace="degob"
@@ -256,6 +256,14 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\gob\degob_script_geisha.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\gob\degob_script_littlered.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\gob\degob_script_v1.cpp"
 			>
 		</File>
diff --git a/dists/msvc9/toolscli.vcproj b/dists/msvc9/toolscli.vcproj
index 4b8a29f..beba3c7 100644
--- a/dists/msvc9/toolscli.vcproj
+++ b/dists/msvc9/toolscli.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="toolscli"
 	ProjectGUID="{5204B306-8D89-4A66-8656-8E8F3F759250}"
 	RootNamespace="toolscli"
@@ -61,7 +61,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="zlib.lib libpng.lib libogg_static.lib libvorbis_static.lib libvorbisenc_static.lib libFLAC_static.lib"
+				AdditionalDependencies="zlib.lib libpng.lib libogg_static.lib libvorbis_static.lib libFLAC_static.lib"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames="LIBCMT;MSVCRT"
 				GenerateDebugInformation="true"
@@ -135,7 +135,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="zlib.lib libogg_static.lib libvorbis_static.lib libvorbisenc_static.lib libFLAC_static.lib comctl32.lib Rpcrt4.lib"
+				AdditionalDependencies="zlib.lib libogg_static.lib libvorbis_static.lib libFLAC_static.lib comctl32.lib Rpcrt4.lib"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames="LIBCMT"
 				GenerateDebugInformation="true"
@@ -303,22 +303,14 @@
 				RelativePath="..\..\engines\agos\extract_agos.h"
 				>
 			</File>
-                        <File
-                                RelativePath="..\..\engines\cge\extract_cge.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\..\engines\cge\extract_cge.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\..\engines\cge\pack_cge.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\..\engines\cge\pack_cge.h"
-                                >
-                        </File>
+			<File
+				RelativePath="..\..\engines\cge\extract_cge.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\engines\cge\extract_cge.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\engines\cine\extract_cine.cpp"
 				>
@@ -336,6 +328,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\engines\gob\extract_fascination_cd.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\engines\gob\extract_gob_stk.cpp"
 				>
 			</File>
@@ -392,6 +388,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\engines\prince\extract_prince.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\engines\scumm\extract_scumm_mac.cpp"
 				>
 			</File>
@@ -407,6 +407,18 @@
 				RelativePath="..\..\engines\scumm\extract_zak_c64.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\engines\cge\pack_cge.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\engines\cge\pack_cge.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\engines\prince\pack_prince.cpp"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="util"
@@ -454,19 +466,19 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\version.cpp"
+				RelativePath="..\..\common\util.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\version.h"
+				RelativePath="..\..\common\util.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\common\util.cpp"
+				RelativePath="..\..\version.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\common\util.h"
+				RelativePath="..\..\version.h"
 				>
 			</File>
 			<Filter






More information about the Scummvm-git-logs mailing list