[Scummvm-cvs-logs] CVS: scummvm/dists/msvc7 saga.vcproj,NONE,1.1 scummvm.sln,1.5,1.6 scummvm.vcproj,1.22,1.23 sword1.vcproj,1.5,1.6

Pawel Kolodziejski aquadran at users.sourceforge.net
Mon Mar 22 13:37:10 CET 2004


Update of /cvsroot/scummvm/scummvm/dists/msvc7
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32424

Modified Files:
	scummvm.sln scummvm.vcproj sword1.vcproj 
Added Files:
	saga.vcproj 
Log Message:
update

--- NEW FILE: saga.vcproj ---
<?xml version="1.0" encoding = "windows-1250"?>
<VisualStudioProject
	ProjectType="Visual C++"
	Version="7.00"
	Name="saga"
	ProjectGUID="{676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}"
	Keyword="Win32Proj">
	<Platforms>
		<Platform
			Name="Win32"/>
	</Platforms>
	<Configurations>
		<Configuration
			Name="Debug|Win32"
			OutputDirectory="saga_Debug"
			IntermediateDirectory="saga_Debug"
			ConfigurationType="4"
			CharacterSet="2">
			<Tool
				Name="VCCLCompilerTool"
				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4702"
				Optimization="0"
				AdditionalIncludeDirectories="../../;../../common"
				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
				MinimalRebuild="TRUE"
				ExceptionHandling="TRUE"
				BasicRuntimeChecks="3"
				RuntimeLibrary="1"
				BufferSecurityCheck="TRUE"
				EnableFunctionLevelLinking="TRUE"
				ForceConformanceInForLoopScope="TRUE"
				UsePrecompiledHeader="0"
				WarningLevel="4"
				WarnAsError="TRUE"
				SuppressStartupBanner="FALSE"
				DebugInformationFormat="4"/>
			<Tool
				Name="VCCustomBuildTool"/>
			<Tool
				Name="VCLibrarianTool"
				OutputFile="$(OutDir)/saga.lib"/>
			<Tool
				Name="VCMIDLTool"/>
			<Tool
				Name="VCPostBuildEventTool"/>
			<Tool
				Name="VCPreBuildEventTool"/>
			<Tool
				Name="VCPreLinkEventTool"/>
			<Tool
				Name="VCResourceCompilerTool"/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"/>
		</Configuration>
		<Configuration
			Name="Release|Win32"
			OutputDirectory="saga_Release"
			IntermediateDirectory="saga_Release"
			ConfigurationType="4"
			CharacterSet="2"
			WholeProgramOptimization="FALSE">
			<Tool
				Name="VCCLCompilerTool"
				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4702"
				Optimization="2"
				InlineFunctionExpansion="1"
				OmitFramePointers="TRUE"
				AdditionalIncludeDirectories="../../;../../common"
				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
				StringPooling="TRUE"
				ExceptionHandling="TRUE"
				RuntimeLibrary="0"
				BufferSecurityCheck="FALSE"
				EnableFunctionLevelLinking="FALSE"
				ForceConformanceInForLoopScope="TRUE"
				UsePrecompiledHeader="0"
				WarningLevel="4"
				WarnAsError="TRUE"
				DebugInformationFormat="0"/>
			<Tool
				Name="VCCustomBuildTool"/>
			<Tool
				Name="VCLibrarianTool"
				OutputFile="$(OutDir)/saga.lib"/>
			<Tool
				Name="VCMIDLTool"/>
			<Tool
				Name="VCPostBuildEventTool"/>
			<Tool
				Name="VCPreBuildEventTool"/>
			<Tool
				Name="VCPreLinkEventTool"/>
			<Tool
				Name="VCResourceCompilerTool"/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"/>
		</Configuration>
	</Configurations>
	<Files>
		<File
			RelativePath="..\..\saga\binread.cpp">
		</File>
		<File
			RelativePath="..\..\saga\binread.h">
		</File>
		<File
			RelativePath="..\..\saga\gamedesc.cpp">
		</File>
		<File
			RelativePath="..\..\saga\gamedesc.h">
		</File>
		<File
			RelativePath="..\..\saga\gamedesc_priv.h">
		</File>
		<File
			RelativePath="..\..\saga\resfile.cpp">
		</File>
		<File
			RelativePath="..\..\saga\resfile.h">
		</File>
		<File
			RelativePath="..\..\saga\resnames.h">
		</File>
		<File
			RelativePath="..\..\saga\saga.cpp">
		</File>
		<File
			RelativePath="..\..\saga\saga.h">
		</File>
	</Files>
	<Globals>
	</Globals>
</VisualStudioProject>

Index: scummvm.sln
===================================================================
RCS file: /cvsroot/scummvm/scummvm/dists/msvc7/scummvm.sln,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- scummvm.sln	21 Dec 2003 08:44:01 -0000	1.5
+++ scummvm.sln	22 Mar 2004 21:26:04 -0000	1.6
@@ -13,6 +13,8 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sword1", "sword1.vcproj", "{C8AAE83E-198B-4ECA-A877-166827953979}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "saga", "saga.vcproj", "{676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}"
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		ConfigName.0 = Debug
@@ -20,11 +22,12 @@
 	EndGlobalSection
 	GlobalSection(ProjectDependencies) = postSolution
 		{8434CB15-D08F-427D-9E6D-581AE5B28440}.0 = {6CC3E421-779D-4E80-8100-520886A0F9FF}
-		{8434CB15-D08F-427D-9E6D-581AE5B28440}.1 = {C8AAE83E-198B-4ECA-A877-166827953979}
-		{8434CB15-D08F-427D-9E6D-581AE5B28440}.2 = {B5527758-2F51-4CCD-AAE1-B0E28654BD6A}
-		{8434CB15-D08F-427D-9E6D-581AE5B28440}.3 = {E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}
-		{8434CB15-D08F-427D-9E6D-581AE5B28440}.4 = {B6AFD548-63D2-40CD-A652-E87095AFCBAF}
-		{8434CB15-D08F-427D-9E6D-581AE5B28440}.5 = {6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}
+		{8434CB15-D08F-427D-9E6D-581AE5B28440}.1 = {676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}
+		{8434CB15-D08F-427D-9E6D-581AE5B28440}.2 = {6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}
+		{8434CB15-D08F-427D-9E6D-581AE5B28440}.3 = {B6AFD548-63D2-40CD-A652-E87095AFCBAF}
+		{8434CB15-D08F-427D-9E6D-581AE5B28440}.4 = {E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}
+		{8434CB15-D08F-427D-9E6D-581AE5B28440}.5 = {B5527758-2F51-4CCD-AAE1-B0E28654BD6A}
+		{8434CB15-D08F-427D-9E6D-581AE5B28440}.6 = {C8AAE83E-198B-4ECA-A877-166827953979}
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
 		{8434CB15-D08F-427D-9E6D-581AE5B28440}.Debug.ActiveCfg = Debug|Win32
@@ -55,6 +58,10 @@
 		{C8AAE83E-198B-4ECA-A877-166827953979}.Debug.Build.0 = Debug|Win32
 		{C8AAE83E-198B-4ECA-A877-166827953979}.Release.ActiveCfg = Release|Win32
 		{C8AAE83E-198B-4ECA-A877-166827953979}.Release.Build.0 = Release|Win32
+		{676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}.Debug.ActiveCfg = Debug|Win32
+		{676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}.Debug.Build.0 = Debug|Win32
+		{676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}.Release.ActiveCfg = Release|Win32
+		{676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection

Index: scummvm.vcproj
===================================================================
RCS file: /cvsroot/scummvm/scummvm/dists/msvc7/scummvm.vcproj,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- scummvm.vcproj	13 Mar 2004 17:52:44 -0000	1.22
+++ scummvm.vcproj	22 Mar 2004 21:26:04 -0000	1.23
@@ -21,7 +21,7 @@
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4702"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../;../../common"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2"
 				MinimalRebuild="TRUE"
 				ExceptionHandling="TRUE"
 				BasicRuntimeChecks="3"
@@ -467,12 +467,6 @@
 				RelativePath="..\..\gui\dialog.h">
 			</File>
 			<File
-				RelativePath="..\..\gui\font.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\font.h">
-			</File>
-			<File
 				RelativePath="..\..\gui\launcher.cpp">
 			</File>
 			<File
@@ -485,9 +479,6 @@
 				RelativePath="..\..\gui\message.h">
 			</File>
 			<File
-				RelativePath="..\..\gui\newfont.cpp">
-			</File>
-			<File
 				RelativePath="..\..\gui\newgui.cpp">
 			</File>
 			<File
@@ -503,15 +494,37 @@
 				RelativePath="..\..\gui\options.h">
 			</File>
 			<File
-				RelativePath="..\..\gui\scummfont.cpp">
-			</File>
-			<File
 				RelativePath="..\..\gui\widget.cpp">
 			</File>
 			<File
 				RelativePath="..\..\gui\widget.h">
 			</File>
 		</Filter>
+		<Filter
+			Name="graphics"
+			Filter="">
+			<File
+				RelativePath="..\..\graphics\animation.cpp">
+			</File>
+			<File
+				RelativePath="..\..\graphics\animation.h">
+			</File>
+			<File
+				RelativePath="..\..\graphics\font.cpp">
+			</File>
+			<File
+				RelativePath="..\..\graphics\font.h">
+			</File>
+			<File
+				RelativePath="..\..\graphics\newfont.cpp">
+			</File>
+			<File
+				RelativePath="..\..\graphics\scummfont.cpp">
+			</File>
+			<File
+				RelativePath="..\..\graphics\surface.h">
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>

Index: sword1.vcproj
===================================================================
RCS file: /cvsroot/scummvm/scummvm/dists/msvc7/sword1.vcproj,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- sword1.vcproj	18 Jan 2004 21:01:44 -0000	1.5
+++ sword1.vcproj	22 Mar 2004 21:26:05 -0000	1.6
@@ -21,7 +21,7 @@
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4702"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../;../../common"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
+				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2"
 				MinimalRebuild="TRUE"
 				ExceptionHandling="TRUE"
 				BasicRuntimeChecks="3"
@@ -66,7 +66,7 @@
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
 				AdditionalIncludeDirectories="../../;../../common"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
+				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2"
 				StringPooling="TRUE"
 				ExceptionHandling="TRUE"
 				RuntimeLibrary="0"





More information about the Scummvm-git-logs mailing list