[OMPT-svn-commit] SF.net SVN: modplug:[554] trunk/OpenMPT

[<rel...@us...>]

Revision: 554
          http://modplug.svn.sourceforge.net/modplug/?rev=554&view=rev
Author:   relabsoluness
Date:     2010-03-26 23:00:54 +0000 (Fri, 26 Mar 2010)

Log Message:
-----------
[Fix] Internal: Build fixes.

Modified Paths:
--------------
    trunk/OpenMPT/soundlib/Load_ult.cpp
    trunk/OpenMPT/zlib/contrib/vstudio/vc7/zlibstat.vcproj
    trunk/OpenMPT/zlib/contrib/vstudio/vc9/zlibstat.vcproj

Modified: trunk/OpenMPT/soundlib/Load_ult.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_ult.cpp	2010-03-26 19:17:27 UTC (rev 553)
+++ trunk/OpenMPT/soundlib/Load_ult.cpp	2010-03-26 23:00:54 UTC (rev 554)
@@ -395,7 +395,7 @@
 		pSmp->nC5Speed = ultSmp.speed;
 		if(ultSmp.finetune)
 		{
-			pSmp->nC5Speed = (UINT)(((double)pSmp->nC5Speed) * pow(2, (((double)ultSmp.finetune) / (12.0 * 32768))));
+			pSmp->nC5Speed = (UINT)(((double)pSmp->nC5Speed) * pow(2.0, (((double)ultSmp.finetune) / (12.0 * 32768))));
 		}
 
 		if(ultSmp.flags & ULT_LOOP)

Modified: trunk/OpenMPT/zlib/contrib/vstudio/vc7/zlibstat.vcproj
===================================================================
--- trunk/OpenMPT/zlib/contrib/vstudio/vc7/zlibstat.vcproj	2010-03-26 19:17:27 UTC (rev 553)
+++ trunk/OpenMPT/zlib/contrib/vstudio/vc7/zlibstat.vcproj	2010-03-26 23:00:54 UTC (rev 554)
@@ -231,9 +231,6 @@
 				RelativePath="..\..\masmx86\gvmat32c.c">
 			</File>
 			<File
-				RelativePath="..\..\..\gzio.c">
-			</File>
-			<File
 				RelativePath="..\..\..\infback.c">
 			</File>
 			<File

Modified: trunk/OpenMPT/zlib/contrib/vstudio/vc9/zlibstat.vcproj
===================================================================
--- trunk/OpenMPT/zlib/contrib/vstudio/vc9/zlibstat.vcproj	2010-03-26 19:17:27 UTC (rev 553)
+++ trunk/OpenMPT/zlib/contrib/vstudio/vc9/zlibstat.vcproj	2010-03-26 23:00:54 UTC (rev 554)
@@ -26,7 +26,7 @@
 			OutputDirectory="x86\ZlibStat$(ConfigurationName)"
 			IntermediateDirectory="x86\ZlibStat$(ConfigurationName)\Tmp"
 			ConfigurationType="4"
-			InheritedPropertySheets="C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\VCProjectDefaults\UpgradeFromVC70.vsprops"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			>
@@ -99,7 +99,7 @@
 			OutputDirectory="x86\ZlibStat$(ConfigurationName)"
 			IntermediateDirectory="x86\ZlibStat$(ConfigurationName)\Tmp"
 			ConfigurationType="4"
-			InheritedPropertySheets="C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\VCProjectDefaults\UpgradeFromVC70.vsprops"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			>
@@ -173,7 +173,7 @@
 			OutputDirectory="x86\ZlibStat$(ConfigurationName)"
 			IntermediateDirectory="x86\ZlibStat$(ConfigurationName)\Tmp"
 			ConfigurationType="4"
-			InheritedPropertySheets="C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\VCProjectDefaults\UpgradeFromVC70.vsprops"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.