From: <man...@us...> - 2013-06-25 19:31:17
|
Revision: 2407 http://sourceforge.net/p/modplug/code/2407 Author: manxorist Date: 2013-06-25 19:31:10 +0000 (Tue, 25 Jun 2013) Log Message: ----------- [Fix] Also convert VS2008 project files to use lhasa. Modified Paths: -------------- trunk/OpenMPT/mptrack/MPTRACK_08.sln trunk/OpenMPT/mptrack/mptrack_08.vcproj Added Paths: ----------- trunk/OpenMPT/include/lhasa/lhasa.vcproj Added: trunk/OpenMPT/include/lhasa/lhasa.vcproj =================================================================== --- trunk/OpenMPT/include/lhasa/lhasa.vcproj (rev 0) +++ trunk/OpenMPT/include/lhasa/lhasa.vcproj 2013-06-25 19:31:10 UTC (rev 2407) @@ -0,0 +1,298 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9,00" + Name="lhasa" + ProjectGUID="{3960775B-D852-4974-903D-573E54FF565D}" + RootNamespace="lhasa" + TargetFrameworkVersion="196613" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\msinttypes\stdint;..\msinttypes\inttypes" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + WarningLevel="3" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="0" + 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="..\msinttypes\stdint;..\msinttypes\inttypes" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + WarningLevel="3" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath=".\lib\crc16.c" + > + </File> + <File + RelativePath=".\lib\ext_header.c" + > + </File> + <File + RelativePath=".\lib\lh1_decoder.c" + > + </File> + <File + RelativePath=".\lib\lh5_decoder.c" + > + </File> + <File + RelativePath=".\lib\lh6_decoder.c" + > + </File> + <File + RelativePath=".\lib\lh7_decoder.c" + > + </File> + <File + RelativePath=".\lib\lha_arch_unix.c" + > + </File> + <File + RelativePath=".\lib\lha_arch_win32.c" + > + </File> + <File + RelativePath=".\lib\lha_basic_reader.c" + > + </File> + <File + RelativePath=".\lib\lha_decoder.c" + > + </File> + <File + RelativePath=".\lib\lha_endian.c" + > + </File> + <File + RelativePath=".\lib\lha_file_header.c" + > + </File> + <File + RelativePath=".\lib\lha_input_stream.c" + > + </File> + <File + RelativePath=".\lib\lha_reader.c" + > + </File> + <File + RelativePath=".\lib\lz5_decoder.c" + > + </File> + <File + RelativePath=".\lib\lzs_decoder.c" + > + </File> + <File + RelativePath=".\lib\macbinary.c" + > + </File> + <File + RelativePath=".\lib\null_decoder.c" + > + </File> + <File + RelativePath=".\lib\pm1_decoder.c" + > + </File> + <File + RelativePath=".\lib\pm2_decoder.c" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + <File + RelativePath=".\lib\crc16.h" + > + </File> + <File + RelativePath=".\lib\ext_header.h" + > + </File> + <File + RelativePath=".\lib\lha_arch.h" + > + </File> + <File + RelativePath=".\lib\lha_basic_reader.h" + > + </File> + <File + RelativePath=".\lib\lha_decoder.h" + > + </File> + <File + RelativePath=".\lib\lha_endian.h" + > + </File> + <File + RelativePath=".\lib\lha_file_header.h" + > + </File> + <File + RelativePath=".\lib\lha_input_stream.h" + > + </File> + <File + RelativePath=".\lib\macbinary.h" + > + </File> + <Filter + Name="public" + > + <File + RelativePath=".\lib\public\lha_decoder.h" + > + </File> + <File + RelativePath=".\lib\public\lha_file_header.h" + > + </File> + <File + RelativePath=".\lib\public\lha_input_stream.h" + > + </File> + <File + RelativePath=".\lib\public\lha_reader.h" + > + </File> + <File + RelativePath=".\lib\public\lhasa.h" + > + </File> + </Filter> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Property changes on: trunk/OpenMPT/include/lhasa/lhasa.vcproj ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/x-ms-vcproj \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +CRLF \ No newline at end of property Modified: trunk/OpenMPT/mptrack/MPTRACK_08.sln =================================================================== --- trunk/OpenMPT/mptrack/MPTRACK_08.sln 2013-06-25 19:09:04 UTC (rev 2406) +++ trunk/OpenMPT/mptrack/MPTRACK_08.sln 2013-06-25 19:31:10 UTC (rev 2407) @@ -4,6 +4,7 @@ ProjectSection(ProjectDependencies) = postProject {DCC2BB2F-6778-4FD3-9C00-D6CD8DC917B8} = {DCC2BB2F-6778-4FD3-9C00-D6CD8DC917B8} {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8} = {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8} + {3960775B-D852-4974-903D-573E54FF565D} = {3960775B-D852-4974-903D-573E54FF565D} {0A18A071-125E-442F-AFF7-A3F68ABECF99} = {0A18A071-125E-442F-AFF7-A3F68ABECF99} {4CEFBC84-C215-11DB-8314-0800200C9A66} = {4CEFBC84-C215-11DB-8314-0800200C9A66} {CF3C2CA5-5D45-4635-BBA4-C1F435E10896} = {CF3C2CA5-5D45-4635-BBA4-C1F435E10896} @@ -19,6 +20,8 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "portaudio", "..\include\portaudio\build\msvc\portaudio_openmpt_vs2008.vcproj", "{0A18A071-125E-442F-AFF7-A3F68ABECF99}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lhasa", "..\include\lhasa\lhasa.vcproj", "{3960775B-D852-4974-903D-573E54FF565D}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -49,6 +52,10 @@ {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|Win32.Build.0 = Debug|Win32 {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|Win32.ActiveCfg = Release|Win32 {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|Win32.Build.0 = Release|Win32 + {3960775B-D852-4974-903D-573E54FF565D}.Debug|Win32.ActiveCfg = Debug|Win32 + {3960775B-D852-4974-903D-573E54FF565D}.Debug|Win32.Build.0 = Debug|Win32 + {3960775B-D852-4974-903D-573E54FF565D}.Release|Win32.ActiveCfg = Release|Win32 + {3960775B-D852-4974-903D-573E54FF565D}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Modified: trunk/OpenMPT/mptrack/mptrack_08.vcproj =================================================================== --- trunk/OpenMPT/mptrack/mptrack_08.vcproj 2013-06-25 19:09:04 UTC (rev 2406) +++ trunk/OpenMPT/mptrack/mptrack_08.vcproj 2013-06-25 19:31:10 UTC (rev 2407) @@ -49,7 +49,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\common;..\soundlib;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\zlib;..\;..\common\svn_version;..\common\svn_version_default" + AdditionalIncludeDirectories="..\common;..\soundlib;..\include\msinttypes\stdint;..\include\msinttypes\inttypes;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\zlib;..\;..\common\svn_version;..\common\svn_version_default" PreprocessorDefinitions="_DEBUG,WIN32,_WINDOWS,MODPLUG_TRACKER" StringPooling="true" ExceptionHandling="2" @@ -158,7 +158,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="2" - AdditionalIncludeDirectories="..\common;..\soundlib;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\zlib;..\;..\common\svn_version;..\common\svn_version_default" + AdditionalIncludeDirectories="..\common;..\soundlib;..\include\msinttypes\stdint;..\include\msinttypes\inttypes;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\zlib;..\;..\common\svn_version;..\common\svn_version_default" PreprocessorDefinitions="NDEBUG,WIN32,_WINDOWS,MODPLUG_TRACKER" StringPooling="true" ExceptionHandling="2" @@ -845,10 +845,6 @@ > </File> <File - RelativePath="..\common\CompilerDetect.h" - > - </File> - <File RelativePath=".\ChildFrm.h" > </File> @@ -865,6 +861,10 @@ > </File> <File + RelativePath="..\common\CompilerDetect.h" + > + </File> + <File RelativePath=".\CreditStatic.h" > </File> @@ -1521,230 +1521,6 @@ > </File> <Filter - Name="unlha" - > - <File - RelativePath="..\unarchiver\unlha\DHUF.CPP" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\unarchiver\unlha\EXTRACT.CPP" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\unarchiver\unlha\Header.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\unarchiver\unlha\HUF.CPP" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\unarchiver\unlha\LARC.CPP" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\unarchiver\unlha\LHARC.H" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\unarchiver\unlha\LHEXT.CPP" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\unarchiver\unlha\MAKETBL.CPP" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\unarchiver\unlha\SHUF.CPP" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\unarchiver\unlha\SLIDE.CPP" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\unarchiver\unlha\SLIDEHUF.H" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - </Filter> - <Filter Name="unrar" > <File This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |