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

[<man...@us...>]

Revision: 4453
          http://sourceforge.net/p/modplug/code/4453
Author:   manxorist
Date:     2014-10-20 14:14:37 +0000 (Mon, 20 Oct 2014)
Log Message:
-----------
[Fix] Fix VS2008 Win64 build (broken since r4448 ).

Revision Links:
--------------
    http://sourceforge.net/p/modplug/code/4448

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/MPTRACK_08.sln
    trunk/OpenMPT/mptrack/mptrack_08.vcproj

Modified: trunk/OpenMPT/mptrack/MPTRACK_08.sln
===================================================================
--- trunk/OpenMPT/mptrack/MPTRACK_08.sln	2014-10-20 13:32:53 UTC (rev 4452)
+++ trunk/OpenMPT/mptrack/MPTRACK_08.sln	2014-10-20 14:14:37 UTC (rev 4453)
@@ -37,8 +37,6 @@
 		Debug|x64 = Debug|x64
 		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
-		ReleaseNoLTCG|Win32 = ReleaseNoLTCG|Win32
-		ReleaseNoLTCG|x64 = ReleaseNoLTCG|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{21D95071-FB97-4E69-B3B1-050D0D4A5021}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -49,9 +47,6 @@
 		{21D95071-FB97-4E69-B3B1-050D0D4A5021}.Release|Win32.Build.0 = Release|Win32
 		{21D95071-FB97-4E69-B3B1-050D0D4A5021}.Release|x64.ActiveCfg = Release|x64
 		{21D95071-FB97-4E69-B3B1-050D0D4A5021}.Release|x64.Build.0 = Release|x64
-		{21D95071-FB97-4E69-B3B1-050D0D4A5021}.ReleaseNoLTCG|Win32.ActiveCfg = Release|x64
-		{21D95071-FB97-4E69-B3B1-050D0D4A5021}.ReleaseNoLTCG|x64.ActiveCfg = Release|x64
-		{21D95071-FB97-4E69-B3B1-050D0D4A5021}.ReleaseNoLTCG|x64.Build.0 = Release|x64
 		{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.Debug|Win32.Build.0 = Debug|Win32
 		{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.Debug|x64.ActiveCfg = Debug|x64
@@ -60,9 +55,6 @@
 		{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.Release|Win32.Build.0 = Release|Win32
 		{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.Release|x64.ActiveCfg = Release|x64
 		{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.Release|x64.Build.0 = Release|x64
-		{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32
-		{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32
-		{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|Win32
 		{6B11F6A8-B131-4D2B-80EF-5731A9016436}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6B11F6A8-B131-4D2B-80EF-5731A9016436}.Debug|Win32.Build.0 = Debug|Win32
 		{6B11F6A8-B131-4D2B-80EF-5731A9016436}.Debug|x64.ActiveCfg = Debug|x64
@@ -71,9 +63,6 @@
 		{6B11F6A8-B131-4D2B-80EF-5731A9016436}.Release|Win32.Build.0 = Release|Win32
 		{6B11F6A8-B131-4D2B-80EF-5731A9016436}.Release|x64.ActiveCfg = Release|x64
 		{6B11F6A8-B131-4D2B-80EF-5731A9016436}.Release|x64.Build.0 = Release|x64
-		{6B11F6A8-B131-4D2B-80EF-5731A9016436}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32
-		{6B11F6A8-B131-4D2B-80EF-5731A9016436}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32
-		{6B11F6A8-B131-4D2B-80EF-5731A9016436}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|Win32
 		{189B867F-FF4B-45A1-B741-A97492EE69AF}.Debug|Win32.ActiveCfg = Debug|Win32
 		{189B867F-FF4B-45A1-B741-A97492EE69AF}.Debug|Win32.Build.0 = Debug|Win32
 		{189B867F-FF4B-45A1-B741-A97492EE69AF}.Debug|x64.ActiveCfg = Debug|x64
@@ -82,9 +71,6 @@
 		{189B867F-FF4B-45A1-B741-A97492EE69AF}.Release|Win32.Build.0 = Release|Win32
 		{189B867F-FF4B-45A1-B741-A97492EE69AF}.Release|x64.ActiveCfg = Release|x64
 		{189B867F-FF4B-45A1-B741-A97492EE69AF}.Release|x64.Build.0 = Release|x64
-		{189B867F-FF4B-45A1-B741-A97492EE69AF}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32
-		{189B867F-FF4B-45A1-B741-A97492EE69AF}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32
-		{189B867F-FF4B-45A1-B741-A97492EE69AF}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|Win32
 		{89AF16DD-32CC-4A7E-B219-5F117D761F9F}.Debug|Win32.ActiveCfg = Debug|Win32
 		{89AF16DD-32CC-4A7E-B219-5F117D761F9F}.Debug|Win32.Build.0 = Debug|Win32
 		{89AF16DD-32CC-4A7E-B219-5F117D761F9F}.Debug|x64.ActiveCfg = Debug|x64
@@ -93,9 +79,6 @@
 		{89AF16DD-32CC-4A7E-B219-5F117D761F9F}.Release|Win32.Build.0 = Release|Win32
 		{89AF16DD-32CC-4A7E-B219-5F117D761F9F}.Release|x64.ActiveCfg = Release|x64
 		{89AF16DD-32CC-4A7E-B219-5F117D761F9F}.Release|x64.Build.0 = Release|x64
-		{89AF16DD-32CC-4A7E-B219-5F117D761F9F}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32
-		{89AF16DD-32CC-4A7E-B219-5F117D761F9F}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32
-		{89AF16DD-32CC-4A7E-B219-5F117D761F9F}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|Win32
 		{F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.Debug|Win32.Build.0 = Debug|Win32
 		{F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.Debug|x64.ActiveCfg = Debug|x64
@@ -104,9 +87,6 @@
 		{F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.Release|Win32.Build.0 = Release|Win32
 		{F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.Release|x64.ActiveCfg = Release|x64
 		{F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.Release|x64.Build.0 = Release|x64
-		{F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32
-		{F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32
-		{F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|Win32
 		{1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.Debug|Win32.ActiveCfg = Debug|Win32
 		{1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.Debug|Win32.Build.0 = Debug|Win32
 		{1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.Debug|x64.ActiveCfg = Debug|x64
@@ -115,9 +95,6 @@
 		{1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.Release|Win32.Build.0 = Release|Win32
 		{1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.Release|x64.ActiveCfg = Release|x64
 		{1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.Release|x64.Build.0 = Release|x64
-		{1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32
-		{1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32
-		{1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|Win32
 		{63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.Debug|Win32.ActiveCfg = Debug|Win32
 		{63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.Debug|Win32.Build.0 = Debug|Win32
 		{63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.Debug|x64.ActiveCfg = Debug|x64
@@ -126,9 +103,6 @@
 		{63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.Release|Win32.Build.0 = Release|Win32
 		{63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.Release|x64.ActiveCfg = Release|x64
 		{63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.Release|x64.Build.0 = Release|x64
-		{63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32
-		{63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32
-		{63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|Win32
 		{95CC809B-03FC-4EDB-BB20-FD07A698C05F}.Debug|Win32.ActiveCfg = Debug|Win32
 		{95CC809B-03FC-4EDB-BB20-FD07A698C05F}.Debug|Win32.Build.0 = Debug|Win32
 		{95CC809B-03FC-4EDB-BB20-FD07A698C05F}.Debug|x64.ActiveCfg = Debug|x64
@@ -137,18 +111,14 @@
 		{95CC809B-03FC-4EDB-BB20-FD07A698C05F}.Release|Win32.Build.0 = Release|Win32
 		{95CC809B-03FC-4EDB-BB20-FD07A698C05F}.Release|x64.ActiveCfg = Release|x64
 		{95CC809B-03FC-4EDB-BB20-FD07A698C05F}.Release|x64.Build.0 = Release|x64
-		{95CC809B-03FC-4EDB-BB20-FD07A698C05F}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32
-		{95CC809B-03FC-4EDB-BB20-FD07A698C05F}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32
-		{95CC809B-03FC-4EDB-BB20-FD07A698C05F}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|Win32
 		{BC116B29-9958-4389-B294-7529BB7C7D37}.Debug|Win32.ActiveCfg = Debug|Win32
 		{BC116B29-9958-4389-B294-7529BB7C7D37}.Debug|Win32.Build.0 = Debug|Win32
-		{BC116B29-9958-4389-B294-7529BB7C7D37}.Debug|x64.ActiveCfg = Debug|Win32
+		{BC116B29-9958-4389-B294-7529BB7C7D37}.Debug|x64.ActiveCfg = Debug|x64
+		{BC116B29-9958-4389-B294-7529BB7C7D37}.Debug|x64.Build.0 = Debug|x64
 		{BC116B29-9958-4389-B294-7529BB7C7D37}.Release|Win32.ActiveCfg = Release|Win32
 		{BC116B29-9958-4389-B294-7529BB7C7D37}.Release|Win32.Build.0 = Release|Win32
-		{BC116B29-9958-4389-B294-7529BB7C7D37}.Release|x64.ActiveCfg = Release|Win32
-		{BC116B29-9958-4389-B294-7529BB7C7D37}.ReleaseNoLTCG|Win32.ActiveCfg = ReleaseNoLTCG|Win32
-		{BC116B29-9958-4389-B294-7529BB7C7D37}.ReleaseNoLTCG|Win32.Build.0 = ReleaseNoLTCG|Win32
-		{BC116B29-9958-4389-B294-7529BB7C7D37}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseNoLTCG|Win32
+		{BC116B29-9958-4389-B294-7529BB7C7D37}.Release|x64.ActiveCfg = Release|x64
+		{BC116B29-9958-4389-B294-7529BB7C7D37}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: trunk/OpenMPT/mptrack/mptrack_08.vcproj
===================================================================
--- trunk/OpenMPT/mptrack/mptrack_08.vcproj	2014-10-20 13:32:53 UTC (rev 4452)
+++ trunk/OpenMPT/mptrack/mptrack_08.vcproj	2014-10-20 14:14:37 UTC (rev 4453)
@@ -119,14 +119,13 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\bin\$(PlatformName)\"
-			IntermediateDirectory="..\build\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
+			Name="Debug|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="1"
 			ATLMinimizesCRunTimeLibraryUsage="false"
-			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -143,26 +142,27 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Bin/mptrack.tlb"
+				TargetEnvironment="3"
+				TypeLibraryName=".\Debug/mptrack.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\common;..\soundlib;..\include\msinttypes\stdint;..\include\msinttypes\inttypes;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\zlib;..\;&quot;$(IntDir)\svn_version&quot;;..\build\svn_version"
-				PreprocessorDefinitions="NDEBUG,WIN32,_WINDOWS,MODPLUG_TRACKER"
+				PreprocessorDefinitions="_DEBUG,WIN32,_WINDOWS,MODPLUG_TRACKER"
 				StringPooling="true"
 				ExceptionHandling="2"
-				RuntimeLibrary="0"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
 				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="false"
+				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				WarningLevel="3"
+				BrowseInformation="1"
+				WarningLevel="4"
 				SuppressStartupBanner="false"
 				DebugInformationFormat="3"
 				CompileAs="0"
@@ -172,7 +172,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -180,19 +180,19 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
 				Version="5.0"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=""
 				DelayLoadDLLs="OpenMPT_SoundTouch_f32.dll"
 				GenerateDebugInformation="true"
+				AssemblyDebug="1"
+				GenerateMapFile="true"
 				SubSystem="2"
 				LargeAddressAware="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="2"
+				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -218,13 +218,14 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			Name="Release|Win32"
+			OutputDirectory="..\bin\$(PlatformName)\"
+			IntermediateDirectory="..\build\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="1"
 			ATLMinimizesCRunTimeLibraryUsage="false"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -241,27 +242,26 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
-				TargetEnvironment="3"
-				TypeLibraryName=".\Debug/mptrack.tlb"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Bin/mptrack.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				Optimization="2"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\common;..\soundlib;..\include\msinttypes\stdint;..\include\msinttypes\inttypes;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\zlib;..\;&quot;$(IntDir)\svn_version&quot;;..\build\svn_version"
-				PreprocessorDefinitions="_DEBUG,WIN32,_WINDOWS,MODPLUG_TRACKER"
+				PreprocessorDefinitions="NDEBUG,WIN32,_WINDOWS,MODPLUG_TRACKER"
 				StringPooling="true"
 				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="0"
 				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
+				EnableFunctionLevelLinking="false"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				BrowseInformation="1"
-				WarningLevel="4"
+				WarningLevel="3"
 				SuppressStartupBanner="false"
 				DebugInformationFormat="3"
 				CompileAs="0"
@@ -271,7 +271,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -279,19 +279,19 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
 				Version="5.0"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=""
 				DelayLoadDLLs="OpenMPT_SoundTouch_f32.dll"
 				GenerateDebugInformation="true"
-				AssemblyDebug="1"
-				GenerateMapFile="true"
 				SubSystem="2"
 				LargeAddressAware="2"
-				RandomizedBaseAddress="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="2"
 				DataExecutionPrevention="0"
-				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -795,7 +795,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -803,7 +803,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"

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