[Scummvm-cvs-logs] SF.net SVN: scummvm:[41988] scummvm/branches/gsoc2009-mods
nolange at users.sourceforge.net
nolange at users.sourceforge.net
Wed Jul 1 15:25:48 CEST 2009
Revision: 41988
http://scummvm.svn.sourceforge.net/scummvm/?rev=41988&view=rev
Author: nolange
Date: 2009-07-01 13:25:48 +0000 (Wed, 01 Jul 2009)
Log Message:
-----------
Added kyra project
removed 1 potentially troublesome assert
Modified Paths:
--------------
scummvm/branches/gsoc2009-mods/dists/msvc9/kyra.vcproj
scummvm/branches/gsoc2009-mods/dists/msvc9/scumm.vcproj
scummvm/branches/gsoc2009-mods/dists/msvc9/scummvm-tfmx.sln
scummvm/branches/gsoc2009-mods/dists/msvc9/scummvm-tfmx.vcproj
scummvm/branches/gsoc2009-mods/sound/mods/tfmx.cpp
Modified: scummvm/branches/gsoc2009-mods/dists/msvc9/kyra.vcproj
===================================================================
--- scummvm/branches/gsoc2009-mods/dists/msvc9/kyra.vcproj 2009-07-01 11:35:48 UTC (rev 41987)
+++ scummvm/branches/gsoc2009-mods/dists/msvc9/kyra.vcproj 2009-07-01 13:25:48 UTC (rev 41988)
@@ -44,7 +44,7 @@
Optimization="0"
InlineFunctionExpansion="0"
AdditionalIncludeDirectories="../../;../../engines"
- PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;ENABLE_LOL"
+ PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;ENABLE_LOL"
MinimalRebuild="true"
ExceptionHandling="1"
BasicRuntimeChecks="3"
@@ -55,7 +55,6 @@
ForceConformanceInForLoopScope="true"
UsePrecompiledHeader="0"
WarningLevel="4"
- WarnAsError="true"
SuppressStartupBanner="false"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="4"
@@ -121,7 +120,7 @@
FavorSizeOrSpeed="2"
OmitFramePointers="true"
AdditionalIncludeDirectories="../../;../../engines"
- PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;ENABLE_LOL"
+ PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;ENABLE_LOL"
StringPooling="true"
ExceptionHandling="1"
RuntimeLibrary="0"
@@ -131,7 +130,6 @@
ForceConformanceInForLoopScope="true"
UsePrecompiledHeader="0"
WarningLevel="4"
- WarnAsError="true"
DebugInformationFormat="0"
/>
<Tool
Modified: scummvm/branches/gsoc2009-mods/dists/msvc9/scumm.vcproj
===================================================================
--- scummvm/branches/gsoc2009-mods/dists/msvc9/scumm.vcproj 2009-07-01 11:35:48 UTC (rev 41987)
+++ scummvm/branches/gsoc2009-mods/dists/msvc9/scumm.vcproj 2009-07-01 13:25:48 UTC (rev 41988)
@@ -44,7 +44,7 @@
Optimization="0"
InlineFunctionExpansion="0"
AdditionalIncludeDirectories="../../;../../engines"
- PreprocessorDefinitions="WIN32;_DEBUG;ENABLE_SCUMM_7_8;ENABLE_HE;USE_ZLIB;USE_MAD;USE_VORBIS"
+ PreprocessorDefinitions="WIN32;_DEBUG;ENABLE_SCUMM_7_8;ENABLE_HE;USE_ZLIB"
MinimalRebuild="true"
ExceptionHandling="1"
BasicRuntimeChecks="3"
Modified: scummvm/branches/gsoc2009-mods/dists/msvc9/scummvm-tfmx.sln
===================================================================
--- scummvm/branches/gsoc2009-mods/dists/msvc9/scummvm-tfmx.sln 2009-07-01 11:35:48 UTC (rev 41987)
+++ scummvm/branches/gsoc2009-mods/dists/msvc9/scummvm-tfmx.sln 2009-07-01 13:25:48 UTC (rev 41988)
@@ -4,10 +4,13 @@
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scummvm", "scummvm-tfmx.vcproj", "{8434CB15-D08F-427D-9E6D-581AE5B28440}"
ProjectSection(ProjectDependencies) = postProject
{B6AFD548-63D2-40CD-A652-E87095AFCBAF} = {B6AFD548-63D2-40CD-A652-E87095AFCBAF}
+ {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC} = {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scumm", "scumm.vcproj", "{B6AFD548-63D2-40CD-A652-E87095AFCBAF}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kyra", "kyra.vcproj", "{9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug_Command|Win32 = Debug_Command|Win32
@@ -25,12 +28,19 @@
{8434CB15-D08F-427D-9E6D-581AE5B28440}.Release|Win32.ActiveCfg = Release|Win32
{8434CB15-D08F-427D-9E6D-581AE5B28440}.Release|Win32.Build.0 = Release|Win32
{B6AFD548-63D2-40CD-A652-E87095AFCBAF}.Debug_Command|Win32.ActiveCfg = Debug|Win32
- {B6AFD548-63D2-40CD-A652-E87095AFCBAF}.Debug_Command|Win32.Build.0 = Debug|Win32
{B6AFD548-63D2-40CD-A652-E87095AFCBAF}.Debug|Win32.ActiveCfg = Debug|Win32
{B6AFD548-63D2-40CD-A652-E87095AFCBAF}.Debug|Win32.Build.0 = Debug|Win32
{B6AFD548-63D2-40CD-A652-E87095AFCBAF}.Release_Command|Win32.ActiveCfg = Release|Win32
{B6AFD548-63D2-40CD-A652-E87095AFCBAF}.Release|Win32.ActiveCfg = Release|Win32
{B6AFD548-63D2-40CD-A652-E87095AFCBAF}.Release|Win32.Build.0 = Release|Win32
+ {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}.Debug_Command|Win32.ActiveCfg = Debug|Win32
+ {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}.Debug_Command|Win32.Build.0 = Debug|Win32
+ {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}.Debug|Win32.ActiveCfg = Debug|Win32
+ {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}.Debug|Win32.Build.0 = Debug|Win32
+ {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}.Release_Command|Win32.ActiveCfg = Release|Win32
+ {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}.Release_Command|Win32.Build.0 = Release|Win32
+ {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}.Release|Win32.ActiveCfg = Release|Win32
+ {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: scummvm/branches/gsoc2009-mods/dists/msvc9/scummvm-tfmx.vcproj
===================================================================
--- scummvm/branches/gsoc2009-mods/dists/msvc9/scummvm-tfmx.vcproj 2009-07-01 11:35:48 UTC (rev 41987)
+++ scummvm/branches/gsoc2009-mods/dists/msvc9/scummvm-tfmx.vcproj 2009-07-01 13:25:48 UTC (rev 41988)
@@ -43,7 +43,7 @@
Optimization="0"
InlineFunctionExpansion="0"
AdditionalIncludeDirectories="../../;../../engines"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;ENABLE_SCUMM;USE_ZLIB;USE_MAD;USE_VORBIS"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;ENABLE_SCUMM;ENABLE_LOL;USE_ZLIB"
MinimalRebuild="true"
ExceptionHandling="1"
BasicRuntimeChecks="3"
@@ -135,7 +135,7 @@
EnableIntrinsicFunctions="true"
OmitFramePointers="true"
AdditionalIncludeDirectories="../../;../../engines"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;ENABLE_SCUMM;USE_ZLIB"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;ENABLE_SCUMM;ENABLE_LOL;USE_ZLIB"
StringPooling="true"
MinimalRebuild="false"
ExceptionHandling="1"
@@ -223,7 +223,7 @@
Optimization="0"
InlineFunctionExpansion="0"
AdditionalIncludeDirectories="../../;../../engines"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;TFMX_CMDLINE_TOOL;USE_ZLIB;USE_MAD;USE_VORBIS"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;TFMX_CMDLINE_TOOL"
MinimalRebuild="true"
ExceptionHandling="1"
BasicRuntimeChecks="3"
@@ -251,6 +251,7 @@
/>
<Tool
Name="VCLinkerTool"
+ LinkLibraryDependencies="false"
AdditionalDependencies="winmm.lib sdl.lib zlib.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib"
OutputFile="$(OutDir)\$(ProjectName)-tfmx.exe"
LinkIncremental="2"
Modified: scummvm/branches/gsoc2009-mods/sound/mods/tfmx.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/sound/mods/tfmx.cpp 2009-07-01 11:35:48 UTC (rev 41987)
+++ scummvm/branches/gsoc2009-mods/sound/mods/tfmx.cpp 2009-07-01 13:25:48 UTC (rev 41988)
@@ -101,7 +101,7 @@
if (channel.macroRun) {
if (!channel.macroWait) {
macroRun(channel);
- assert( !channel.deferWait ); // we can remove this variable as it should be never true after macroRun?
+ //assert( !channel.deferWait ); // we can remove this variable as it should be never true after macroRun?
}
else
--channel.macroWait;
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