[Scummvm-cvs-logs] SF.net SVN: scummvm: [24759] scummvm/trunk/dists/msvc8

sev at users.sourceforge.net sev at users.sourceforge.net
Wed Nov 22 16:48:16 CET 2006 

Revision: 24759
          http://svn.sourceforge.net/scummvm/?rev=24759&view=rev
Author:   sev
Date:     2006-11-22 07:48:16 -0800 (Wed, 22 Nov 2006)

Log Message:
-----------
Update MSVC2005 project files

Modified Paths:
--------------
    scummvm/trunk/dists/msvc8/agi.vcproj
    scummvm/trunk/dists/msvc8/agos.vcproj
    scummvm/trunk/dists/msvc8/scumm.vcproj
    scummvm/trunk/dists/msvc8/scummvm.sln
    scummvm/trunk/dists/msvc8/scummvm.vcproj

Added Paths:
-----------
    scummvm/trunk/dists/msvc8/touche.vcproj

Modified: scummvm/trunk/dists/msvc8/agi.vcproj
===================================================================
--- scummvm/trunk/dists/msvc8/agi.vcproj	2006-11-22 13:40:32 UTC (rev 24758)
+++ scummvm/trunk/dists/msvc8/agi.vcproj	2006-11-22 15:48:16 UTC (rev 24759)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252"?>
+<?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8,00"
@@ -289,6 +289,10 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\agi\predictive.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\agi\savegame.cpp"
 			>
 		</File>

Modified: scummvm/trunk/dists/msvc8/agos.vcproj
===================================================================
--- scummvm/trunk/dists/msvc8/agos.vcproj	2006-11-22 13:40:32 UTC (rev 24758)
+++ scummvm/trunk/dists/msvc8/agos.vcproj	2006-11-22 15:48:16 UTC (rev 24759)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="windows-1250"?>
+<?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8,00"
@@ -216,10 +216,18 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\agos\gfx.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\agos\icons.cpp"
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\agos\input.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\agos\intern.h"
 			>
 		</File>
@@ -228,6 +236,10 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\agos\menus.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\agos\midi.cpp"
 			>
 		</File>
@@ -252,6 +264,10 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\agos\res_snd.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\agos\rooms.cpp"
 			>
 		</File>
@@ -260,6 +276,38 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\agos\script.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\agos\script_e1.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\agos\script_e2.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\agos\script_ff.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\agos\script_pp.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\agos\script_s1.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\agos\script_s2.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\agos\script_ww.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\agos\sound.cpp"
 			>
 		</File>
@@ -288,9 +336,33 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\agos\vga_e2.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\agos\vga_ff.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\agos\vga_s1.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\agos\vga_s2.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\agos\vga_ww.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\agos\window.cpp"
 			>
 		</File>
+		<File
+			RelativePath="..\..\engines\agos\zones.cpp"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>

Modified: scummvm/trunk/dists/msvc8/scumm.vcproj
===================================================================
--- scummvm/trunk/dists/msvc8/scumm.vcproj	2006-11-22 13:40:32 UTC (rev 24758)
+++ scummvm/trunk/dists/msvc8/scumm.vcproj	2006-11-22 15:48:16 UTC (rev 24759)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="windows-1250"?>
+<?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8,00"
@@ -163,6 +163,10 @@
 			Name="smush"
 			>
 			<File
+				RelativePath="..\..\engines\scumm\smush\channel.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\engines\scumm\smush\channel.h"
 				>
 			</File>
@@ -319,6 +323,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\engines\scumm\he\cup_player_he.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\engines\scumm\he\cup_player_he.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\engines\scumm\he\floodfill_he.cpp"
 				>
 			</File>

Modified: scummvm/trunk/dists/msvc8/scummvm.sln
===================================================================
--- scummvm/trunk/dists/msvc8/scummvm.sln	2006-11-22 13:40:32 UTC (rev 24758)
+++ scummvm/trunk/dists/msvc8/scummvm.sln	2006-11-22 15:48:16 UTC (rev 24759)
@@ -3,17 +3,18 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scummvm", "scummvm.vcproj", "{8434CB15-D08F-427D-9E6D-581AE5B28440}"
 	ProjectSection(ProjectDependencies) = postProject
 		{6CC3E421-779D-4E80-8100-520886A0F9FF} = {6CC3E421-779D-4E80-8100-520886A0F9FF}
+		{D4986356-D0BB-4981-924A-854157BDF11F} = {D4986356-D0BB-4981-924A-854157BDF11F}
+		{676DB4C5-9A3E-4EE1-8483-EBB79DC0700E} = {676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}
+		{9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC} = {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}
+		{976D947A-A45F-4437-991E-412F695C64C7} = {976D947A-A45F-4437-991E-412F695C64C7}
+		{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA} = {E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}
+		{F5F57066-CDF4-4F80-B9E7-7F4D21850D6E} = {F5F57066-CDF4-4F80-B9E7-7F4D21850D6E}
+		{6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7} = {6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}
+		{B5527758-2F51-4CCD-AAE1-B0E28654BD6A} = {B5527758-2F51-4CCD-AAE1-B0E28654BD6A}
+		{1CA4AC50-5426-433A-8B5E-FFE39568098E} = {1CA4AC50-5426-433A-8B5E-FFE39568098E}
+		{B6AFD548-63D2-40CD-A652-E87095AFCBAF} = {B6AFD548-63D2-40CD-A652-E87095AFCBAF}
+		{C8AAE83E-198B-4ECA-A877-166827953979} = {C8AAE83E-198B-4ECA-A877-166827953979}
 		{1A1CA028-61B5-4A6C-A918-F5D8721AB1AC} = {1A1CA028-61B5-4A6C-A918-F5D8721AB1AC}
-		{C8AAE83E-198B-4ECA-A877-166827953979} = {C8AAE83E-198B-4ECA-A877-166827953979}
-		{B6AFD548-63D2-40CD-A652-E87095AFCBAF} = {B6AFD548-63D2-40CD-A652-E87095AFCBAF}
-		{1CA4AC50-5426-433A-8B5E-FFE39568098E} = {1CA4AC50-5426-433A-8B5E-FFE39568098E}
-		{B5527758-2F51-4CCD-AAE1-B0E28654BD6A} = {B5527758-2F51-4CCD-AAE1-B0E28654BD6A}
-		{6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7} = {6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}
-		{F5F57066-CDF4-4F80-B9E7-7F4D21850D6E} = {F5F57066-CDF4-4F80-B9E7-7F4D21850D6E}
-		{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA} = {E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}
-		{976D947A-A45F-4437-991E-412F695C64C7} = {976D947A-A45F-4437-991E-412F695C64C7}
-		{9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC} = {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}
-		{676DB4C5-9A3E-4EE1-8483-EBB79DC0700E} = {676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sword2", "sword2.vcproj", "{6CC3E421-779D-4E80-8100-520886A0F9FF}"
@@ -40,6 +41,8 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "agi", "agi.vcproj", "{F5F57066-CDF4-4F80-B9E7-7F4D21850D6E}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "touche", "touche.vcproj", "{D4986356-D0BB-4981-924A-854157BDF11F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -98,6 +101,10 @@
 		{F5F57066-CDF4-4F80-B9E7-7F4D21850D6E}.Debug|Win32.Build.0 = Debug|Win32
 		{F5F57066-CDF4-4F80-B9E7-7F4D21850D6E}.Release|Win32.ActiveCfg = Release|Win32
 		{F5F57066-CDF4-4F80-B9E7-7F4D21850D6E}.Release|Win32.Build.0 = Release|Win32
+		{D4986356-D0BB-4981-924A-854157BDF11F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D4986356-D0BB-4981-924A-854157BDF11F}.Debug|Win32.Build.0 = Debug|Win32
+		{D4986356-D0BB-4981-924A-854157BDF11F}.Release|Win32.ActiveCfg = Release|Win32
+		{D4986356-D0BB-4981-924A-854157BDF11F}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: scummvm/trunk/dists/msvc8/scummvm.vcproj
===================================================================
--- scummvm/trunk/dists/msvc8/scummvm.vcproj	2006-11-22 13:40:32 UTC (rev 24758)
+++ scummvm/trunk/dists/msvc8/scummvm.vcproj	2006-11-22 15:48:16 UTC (rev 24759)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="windows-1250"?>
+<?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8,00"
@@ -703,6 +703,26 @@
 					</File>
 				</Filter>
 			</Filter>
+			<Filter
+				Name="mods"
+				>
+				<File
+					RelativePath="..\..\sound\mods\module.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\sound\mods\module.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\sound\mods\protracker.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\sound\mods\protracker.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="txt"
@@ -989,7 +1009,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gui\ThemeNew.cpp"
+				RelativePath="..\..\gui\ThemeModern.cpp"
 				>
 			</File>
 			<File
@@ -1131,7 +1151,7 @@
 						>
 						<Tool
 							Name="VCCustomBuildTool"
-							CommandLine="nasm.exe -O1 -f win32 -g -o "$(OutDir)\$(InputName).obj" "$(InputPath)"&#x0D;&#x0A;"
+							CommandLine="nasm.exe -f win32 -g -o "$(OutDir)\$(InputName).obj" "$(InputPath)"&#x0D;&#x0A;"
 							Outputs="$(OutDir)\$(InputName).obj"
 						/>
 					</FileConfiguration>
@@ -1140,7 +1160,7 @@
 						>
 						<Tool
 							Name="VCCustomBuildTool"
-							CommandLine="nasm.exe -O1 -f win32 -o "$(OutDir)\$(InputName).obj" "$(InputPath)"&#x0D;&#x0A;"
+							CommandLine="nasm.exe  -f win32 -o "$(OutDir)\$(InputName).obj" "$(InputPath)"&#x0D;&#x0A;"
 							Outputs="$(OutDir)\$(InputName).obj"
 						/>
 					</FileConfiguration>
@@ -1161,7 +1181,7 @@
 						>
 						<Tool
 							Name="VCCustomBuildTool"
-							CommandLine="nasm.exe -O1 -f win32 -g -o "$(OutDir)\$(InputName).obj" "$(InputPath)"&#x0D;&#x0A;"
+							CommandLine="nasm.exe -f win32 -g -o "$(OutDir)\$(InputName).obj" "$(InputPath)"&#x0D;&#x0A;"
 							Outputs="$(OutDir)\$(InputName).obj"
 						/>
 					</FileConfiguration>
@@ -1170,7 +1190,7 @@
 						>
 						<Tool
 							Name="VCCustomBuildTool"
-							CommandLine="nasm.exe -O1 -f win32 -o "$(OutDir)\$(InputName).obj" "$(InputPath)"&#x0D;&#x0A;"
+							CommandLine="nasm.exe -f win32 -o "$(OutDir)\$(InputName).obj" "$(InputPath)"&#x0D;&#x0A;"
 							Outputs="$(OutDir)\$(InputName).obj"
 						/>
 					</FileConfiguration>

Added: scummvm/trunk/dists/msvc8/touche.vcproj
===================================================================
--- scummvm/trunk/dists/msvc8/touche.vcproj	                        (rev 0)
+++ scummvm/trunk/dists/msvc8/touche.vcproj	2006-11-22 15:48:16 UTC (rev 24759)
@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8,00"
+	Name="touche"
+	ProjectGUID="{D4986356-D0BB-4981-924A-854157BDF11F}"
+	RootNamespace="touche"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="touche_Debug"
+			IntermediateDirectory="touche_Debug"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
+				Optimization="0"
+				AdditionalIncludeDirectories="../..;../../engines"
+				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
+				MinimalRebuild="true"
+				ExceptionHandling="1"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="true"
+				EnableFunctionLevelLinking="true"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				WarnAsError="false"
+				SuppressStartupBanner="false"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/touche.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="touche_Release"
+			IntermediateDirectory="touche_Release"
+			ConfigurationType="4"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
+				Optimization="3"
+				InlineFunctionExpansion="2"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories="../../;../../engines"
+				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
+				StringPooling="true"
+				ExceptionHandling="1"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="false"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				WarnAsError="true"
+				DebugInformationFormat="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/touche.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\..\engines\touche\graphics.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\touche\graphics.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\touche\midi.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\touche\midi.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\touche\opcodes.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\touche\plugin.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\touche\resource.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\touche\saveload.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\touche\staticres.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\touche\touche.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\touche\touche.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\touche\ui.cpp"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>


Property changes on: scummvm/trunk/dists/msvc8/touche.vcproj
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native


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