From: <man...@us...> - 2014-09-09 09:15:07
|
Revision: 4271 http://sourceforge.net/p/modplug/code/4271 Author: manxorist Date: 2014-09-09 09:14:56 +0000 (Tue, 09 Sep 2014) Log Message: ----------- [Fix] libopenmpt: Fixup VS2008 build. Modified Paths: -------------- trunk/OpenMPT/build/vs2008/libopenmpt/libopenmpt.vcproj trunk/OpenMPT/build/vs2008/libopenmpt.sln trunk/OpenMPT/common/version.cpp Added Paths: ----------- trunk/OpenMPT/build/vs2008/libopenmpt_example_c/ trunk/OpenMPT/build/vs2008/libopenmpt_example_c/libopenmpt_example_c.vcproj Removed Paths: ------------- trunk/OpenMPT/build/vs2008/libopenmpt_example_c/libopenmpt_example_c.c.vcproj trunk/OpenMPT/build/vs2008/libopenmpt_example_c.c/ Modified: trunk/OpenMPT/build/vs2008/libopenmpt/libopenmpt.vcproj =================================================================== --- trunk/OpenMPT/build/vs2008/libopenmpt/libopenmpt.vcproj 2014-09-09 08:52:08 UTC (rev 4270) +++ trunk/OpenMPT/build/vs2008/libopenmpt/libopenmpt.vcproj 2014-09-09 09:14:56 UTC (rev 4271) @@ -186,6 +186,10 @@ > </File> <File + RelativePath="..\..\..\common\mptAtomic.h" + > + </File> + <File RelativePath="..\..\..\common\mptFstream.h" > </File> Modified: trunk/OpenMPT/build/vs2008/libopenmpt.sln =================================================================== --- trunk/OpenMPT/build/vs2008/libopenmpt.sln 2014-09-09 08:52:08 UTC (rev 4270) +++ trunk/OpenMPT/build/vs2008/libopenmpt.sln 2014-09-09 09:14:56 UTC (rev 4271) @@ -5,7 +5,7 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "portaudio", "..\gen\portaudio.vcproj", "{189B867F-FF4B-45A1-B741-A97492EE69AF}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libopenmpt_example_c.c", "libopenmpt_example_c.c\libopenmpt_example_c.c.vcproj", "{89D1117D-7787-45C1-9240-A24AACF4A414}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libopenmpt_example_c", "libopenmpt_example_c\libopenmpt_example_c.vcproj", "{89D1117D-7787-45C1-9240-A24AACF4A414}" ProjectSection(ProjectDependencies) = postProject {189B867F-FF4B-45A1-B741-A97492EE69AF} = {189B867F-FF4B-45A1-B741-A97492EE69AF} {D19450B0-4497-418C-B3EC-10D51967814E} = {D19450B0-4497-418C-B3EC-10D51967814E} Deleted: trunk/OpenMPT/build/vs2008/libopenmpt_example_c/libopenmpt_example_c.c.vcproj =================================================================== --- trunk/OpenMPT/build/vs2008/libopenmpt_example_c.c/libopenmpt_example_c.c.vcproj 2014-09-09 08:52:08 UTC (rev 4270) +++ trunk/OpenMPT/build/vs2008/libopenmpt_example_c/libopenmpt_example_c.c.vcproj 2014-09-09 09:14:56 UTC (rev 4271) @@ -1,170 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="libopenmpt_example_c.c" - ProjectGUID="{89D1117D-7787-45C1-9240-A24AACF4A414}" - RootNamespace="libopenmpt_example_cc" - TargetFrameworkVersion="196613" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="1" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="../../../include/msinttypes/stdint;../../..;../../../include/portaudio/include" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - WarningLevel="3" - DebugInformationFormat="4" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="ksuser.lib ksguid.lib" - GenerateDebugInformation="true" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="1" - CharacterSet="2" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="../../../include/msinttypes/stdint;../../..;../../../include/portaudio/include" - RuntimeLibrary="0" - EnableFunctionLevelLinking="true" - WarningLevel="3" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="ksuser.lib ksguid.lib" - GenerateDebugInformation="true" - OptimizeReferences="2" - EnableCOMDATFolding="2" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath="..\..\..\libopenmpt\examples\libopenmpt_example_c.c" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> Copied: trunk/OpenMPT/build/vs2008/libopenmpt_example_c/libopenmpt_example_c.vcproj (from rev 4270, trunk/OpenMPT/build/vs2008/libopenmpt_example_c.c/libopenmpt_example_c.c.vcproj) =================================================================== --- trunk/OpenMPT/build/vs2008/libopenmpt_example_c/libopenmpt_example_c.vcproj (rev 0) +++ trunk/OpenMPT/build/vs2008/libopenmpt_example_c/libopenmpt_example_c.vcproj 2014-09-09 09:14:56 UTC (rev 4271) @@ -0,0 +1,170 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9,00" + Name="libopenmpt_example_c" + ProjectGUID="{89D1117D-7787-45C1-9240-A24AACF4A414}" + RootNamespace="libopenmpt_example_cc" + TargetFrameworkVersion="196613" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="1" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="../../../include/msinttypes/stdint;../../..;../../../include/portaudio/include" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + WarningLevel="3" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ksuser.lib ksguid.lib" + GenerateDebugInformation="true" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="1" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + EnableIntrinsicFunctions="true" + AdditionalIncludeDirectories="../../../include/msinttypes/stdint;../../..;../../../include/portaudio/include" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" + WarningLevel="3" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ksuser.lib ksguid.lib" + GenerateDebugInformation="true" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath="..\..\..\libopenmpt\examples\libopenmpt_example_c.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: trunk/OpenMPT/common/version.cpp =================================================================== --- trunk/OpenMPT/common/version.cpp 2014-09-09 08:52:08 UTC (rev 4270) +++ trunk/OpenMPT/common/version.cpp 2014-09-09 09:14:56 UTC (rev 4271) @@ -151,7 +151,7 @@ return revision; #else #if MPT_COMPILER_MSVC - #pragma message "SVN revision unknown. Please check your build system." + #pragma message("SVN revision unknown. Please check your build system.") #elif MPT_COMPILER_GCC || MPT_COMPILER_CLANG #warning "SVN revision unknown. Please check your build system." #else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |