Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[3097] trunk/OpenMPT
|
From: <man...@us...> - 2013-11-06 15:34:23
|
Revision: 3097
http://sourceforge.net/p/modplug/code/3097
Author: manxorist
Date: 2013-11-06 15:34:12 +0000 (Wed, 06 Nov 2013)
Log Message:
-----------
[Int] Move all VS2010 mptrack related binaries to toplevel bin/$PLATFORM . (VS2008 and library projects will follow later).
[Int] Move all VS2010 mptrack temporary files to build/obj or build/lib . (VS2008 and library projects will follow later).
[Ref] Cleanup VS2010 project files (i.e. remove all options (mainly path names) that are set to the equivalent of the default value (or to a value that fits our needs just as good)). This makes the project settings less confusing without any functional change.
[Fix] Adjust path detection for test cases.
[Int] Remove old bin/ directories.
[Mod] Remove "64" suffix from included win64 libraries.
Modified Paths:
--------------
trunk/OpenMPT/build/UnRAR.vcproj
trunk/OpenMPT/build/UnRAR.vcxproj
trunk/OpenMPT/build/UnRAR.vcxproj.filters
trunk/OpenMPT/build/flac.vcproj
trunk/OpenMPT/build/flac.vcxproj
trunk/OpenMPT/build/flac.vcxproj.filters
trunk/OpenMPT/build/lhasa.vcproj
trunk/OpenMPT/build/lhasa.vcxproj
trunk/OpenMPT/build/lhasa.vcxproj.filters
trunk/OpenMPT/build/miniz.vcproj
trunk/OpenMPT/build/miniz.vcxproj
trunk/OpenMPT/build/miniz.vcxproj.filters
trunk/OpenMPT/build/minizip.vcproj
trunk/OpenMPT/build/minizip.vcxproj
trunk/OpenMPT/build/minizip.vcxproj.filters
trunk/OpenMPT/build/portaudio.vcproj
trunk/OpenMPT/build/portaudio.vcxproj
trunk/OpenMPT/build/portaudio.vcxproj.filters
trunk/OpenMPT/build/portmidi.vcproj
trunk/OpenMPT/build/portmidi.vcxproj
trunk/OpenMPT/build/portmidi.vcxproj.filters
trunk/OpenMPT/build/smbPitchShift.vcproj
trunk/OpenMPT/build/smbPitchShift.vcxproj
trunk/OpenMPT/build/smbPitchShift.vcxproj.filters
trunk/OpenMPT/build/soundtouch.vcproj
trunk/OpenMPT/build/soundtouch.vcxproj
trunk/OpenMPT/build/soundtouch.vcxproj.filters
trunk/OpenMPT/build/zlib.vcproj
trunk/OpenMPT/build/zlib.vcxproj
trunk/OpenMPT/build/zlib.vcxproj.filters
trunk/OpenMPT/include/premake4-defaults-DLL.lua
trunk/OpenMPT/include/premake4-defaults.lua
trunk/OpenMPT/installer/install.iss
trunk/OpenMPT/mptrack/mptrack_10.vcxproj
trunk/OpenMPT/pluginBridge/PluginBridge.vcxproj
trunk/OpenMPT/plugins/MidiInOut/MidiInOut.vcxproj
trunk/OpenMPT/test/test.cpp
Added Paths:
-----------
trunk/OpenMPT/bin/
Removed Paths:
-------------
trunk/OpenMPT/mptrack/bin/
trunk/OpenMPT/plugins/bin/
Property Changed:
----------------
trunk/OpenMPT/
trunk/OpenMPT/build/
Index: trunk/OpenMPT
===================================================================
--- trunk/OpenMPT 2013-11-06 12:59:58 UTC (rev 3096)
+++ trunk/OpenMPT 2013-11-06 15:34:12 UTC (rev 3097)
Property changes on: trunk/OpenMPT
___________________________________________________________________
Modified: svn:ignore
## -1,6 +1,6 ##
Debug
Release
ipch
+libopenmpt.opensdf
libopenmpt.sdf
-libopenmpt.opensdf
libopenmpt.suo
Index: trunk/OpenMPT/bin
===================================================================
--- trunk/OpenMPT/bin 2013-11-06 12:59:58 UTC (rev 3096)
+++ trunk/OpenMPT/bin 2013-11-06 15:34:12 UTC (rev 3097)
Property changes on: trunk/OpenMPT/bin
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+*
Added: tsvn:logminsize
## -0,0 +1 ##
+10
\ No newline at end of property
Index: trunk/OpenMPT/build
===================================================================
--- trunk/OpenMPT/build 2013-11-06 12:59:58 UTC (rev 3096)
+++ trunk/OpenMPT/build 2013-11-06 15:34:12 UTC (rev 3097)
Property changes on: trunk/OpenMPT/build
___________________________________________________________________
Modified: svn:ignore
## -1 +1,2 ##
+lib
obj
Modified: trunk/OpenMPT/build/UnRAR.vcproj
===================================================================
--- trunk/OpenMPT/build/UnRAR.vcproj 2013-11-06 12:59:58 UTC (rev 3096)
+++ trunk/OpenMPT/build/UnRAR.vcproj 2013-11-06 15:34:12 UTC (rev 3097)
@@ -20,7 +20,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\include\bin\Debug"
+ OutputDirectory="lib\x32\Debug"
IntermediateDirectory="obj\unrar\x32\Debug"
ConfigurationType="4"
CharacterSet="2"
@@ -96,7 +96,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
- OutputDirectory="..\include\bin\Debug"
+ OutputDirectory="lib\x64\Debug"
IntermediateDirectory="obj\unrar\x64\Debug"
ConfigurationType="4"
CharacterSet="2"
@@ -128,7 +128,7 @@
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
- ProgramDataBaseFileName="$(OutDir)\UnRAR64.pdb"
+ ProgramDataBaseFileName="$(OutDir)\UnRAR.pdb"
DebugInformationFormat="3"
/>
<Tool
@@ -144,7 +144,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)\UnRAR64.lib"
+ OutputFile="$(OutDir)\UnRAR.lib"
/>
<Tool
Name="VCALinkTool"
@@ -173,7 +173,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\include\bin\Release"
+ OutputDirectory="lib\x32\Release"
IntermediateDirectory="obj\unrar\x32\Release"
ConfigurationType="4"
CharacterSet="2"
@@ -250,7 +250,7 @@
</Configuration>
<Configuration
Name="Release|x64"
- OutputDirectory="..\include\bin\Release"
+ OutputDirectory="lib\x64\Release"
IntermediateDirectory="obj\unrar\x64\Release"
ConfigurationType="4"
CharacterSet="2"
@@ -283,7 +283,7 @@
FloatingPointModel="2"
UsePrecompiledHeader="0"
WarningLevel="3"
- ProgramDataBaseFileName="$(OutDir)\UnRAR64.pdb"
+ ProgramDataBaseFileName="$(OutDir)\UnRAR.pdb"
DebugInformationFormat="3"
/>
<Tool
@@ -299,7 +299,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)\UnRAR64.lib"
+ OutputFile="$(OutDir)\UnRAR.lib"
/>
<Tool
Name="VCALinkTool"
@@ -328,7 +328,7 @@
</Configuration>
<Configuration
Name="ReleaseNoLTCG|Win32"
- OutputDirectory="..\include\bin\ReleaseNoLTCG"
+ OutputDirectory="lib\x32\ReleaseNoLTCG"
IntermediateDirectory="obj\unrar\x32\ReleaseNoLTCG"
ConfigurationType="4"
CharacterSet="2"
@@ -405,7 +405,7 @@
</Configuration>
<Configuration
Name="ReleaseNoLTCG|x64"
- OutputDirectory="..\include\bin\ReleaseNoLTCG"
+ OutputDirectory="lib\x64\ReleaseNoLTCG"
IntermediateDirectory="obj\unrar\x64\ReleaseNoLTCG"
ConfigurationType="4"
CharacterSet="2"
@@ -438,7 +438,7 @@
FloatingPointModel="2"
UsePrecompiledHeader="0"
WarningLevel="3"
- ProgramDataBaseFileName="$(OutDir)\UnRAR64.pdb"
+ ProgramDataBaseFileName="$(OutDir)\UnRAR.pdb"
DebugInformationFormat="3"
/>
<Tool
@@ -454,7 +454,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)\UnRAR64.lib"
+ OutputFile="$(OutDir)\UnRAR.lib"
/>
<Tool
Name="VCALinkTool"
Modified: trunk/OpenMPT/build/UnRAR.vcxproj
===================================================================
--- trunk/OpenMPT/build/UnRAR.vcxproj 2013-11-06 12:59:58 UTC (rev 3096)
+++ trunk/OpenMPT/build/UnRAR.vcxproj 2013-11-06 15:34:12 UTC (rev 3097)
@@ -90,24 +90,24 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\include\bin\Debug\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">lib\x32\Debug\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">obj\unrar\x32\Debug\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">UnRAR</TargetName>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\include\bin\Debug\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">lib\x64\Debug\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">obj\unrar\x64\Debug\</IntDir>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">UnRAR64</TargetName>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\include\bin\Release\</OutDir>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">UnRAR</TargetName>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">lib\x32\Release\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">obj\unrar\x32\Release\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">UnRAR</TargetName>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\include\bin\Release\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">lib\x64\Release\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">obj\unrar\x64\Release\</IntDir>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">UnRAR64</TargetName>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">..\include\bin\ReleaseNoLTCG\</OutDir>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">UnRAR</TargetName>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">lib\x32\ReleaseNoLTCG\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">obj\unrar\x32\ReleaseNoLTCG\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">UnRAR</TargetName>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">..\include\bin\ReleaseNoLTCG\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">lib\x64\ReleaseNoLTCG\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">obj\unrar\x64\ReleaseNoLTCG\</IntDir>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">UnRAR64</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">UnRAR</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -153,12 +153,12 @@
<AdditionalIncludeDirectories>..\include\unrar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Lib>
- <OutputFile>$(OutDir)UnRAR64.lib</OutputFile>
+ <OutputFile>$(OutDir)UnRAR.lib</OutputFile>
</Lib>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDataBaseFileName>$(OutDir)UnRAR64.pdb</ProgramDataBaseFileName>
+ <ProgramDataBaseFileName>$(OutDir)UnRAR.pdb</ProgramDataBaseFileName>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -211,14 +211,14 @@
<AdditionalIncludeDirectories>..\include\unrar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Lib>
- <OutputFile>$(OutDir)UnRAR64.lib</OutputFile>
+ <OutputFile>$(OutDir)UnRAR.lib</OutputFile>
</Lib>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
- <ProgramDataBaseFileName>$(OutDir)UnRAR64.pdb</ProgramDataBaseFileName>
+ <ProgramDataBaseFileName>$(OutDir)UnRAR.pdb</ProgramDataBaseFileName>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">
@@ -271,14 +271,14 @@
<AdditionalIncludeDirectories>..\include\unrar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Lib>
- <OutputFile>$(OutDir)UnRAR64.lib</OutputFile>
+ <OutputFile>$(OutDir)UnRAR.lib</OutputFile>
</Lib>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
- <ProgramDataBaseFileName>$(OutDir)UnRAR64.pdb</ProgramDataBaseFileName>
+ <ProgramDataBaseFileName>$(OutDir)UnRAR.pdb</ProgramDataBaseFileName>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
Modified: trunk/OpenMPT/build/UnRAR.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/UnRAR.vcxproj.filters 2013-11-06 12:59:58 UTC (rev 3096)
+++ trunk/OpenMPT/build/UnRAR.vcxproj.filters 2013-11-06 15:34:12 UTC (rev 3097)
@@ -2,10 +2,10 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="include">
- <UniqueIdentifier>{9FE71192-DB6B-5041-A92C-32BDD18C730D}</UniqueIdentifier>
+ <UniqueIdentifier>{51B7AB45-ACC4-A449-9AF7-00C9FCCFB1D3}</UniqueIdentifier>
</Filter>
<Filter Include="include\unrar">
- <UniqueIdentifier>{3A336712-7D81-3948-BA4A-D73201BEA649}</UniqueIdentifier>
+ <UniqueIdentifier>{9F0BFE6F-155F-6846-918A-6175DC85C5E7}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
Modified: trunk/OpenMPT/build/flac.vcproj
===================================================================
--- trunk/OpenMPT/build/flac.vcproj 2013-11-06 12:59:58 UTC (rev 3096)
+++ trunk/OpenMPT/build/flac.vcproj 2013-11-06 15:34:12 UTC (rev 3097)
@@ -20,7 +20,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\include\bin\Debug"
+ OutputDirectory="lib\x32\Debug"
IntermediateDirectory="obj\flac\x32\Debug"
ConfigurationType="4"
CharacterSet="2"
@@ -98,7 +98,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
- OutputDirectory="..\include\bin\Debug"
+ OutputDirectory="lib\x64\Debug"
IntermediateDirectory="obj\flac\x64\Debug"
ConfigurationType="4"
CharacterSet="2"
@@ -131,7 +131,7 @@
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
- ProgramDataBaseFileName="$(OutDir)\flac64.pdb"
+ ProgramDataBaseFileName="$(OutDir)\flac.pdb"
DebugInformationFormat="3"
CompileAs="1"
/>
@@ -148,7 +148,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)\flac64.lib"
+ OutputFile="$(OutDir)\flac.lib"
/>
<Tool
Name="VCALinkTool"
@@ -177,7 +177,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\include\bin\Release"
+ OutputDirectory="lib\x32\Release"
IntermediateDirectory="obj\flac\x32\Release"
ConfigurationType="4"
CharacterSet="2"
@@ -255,7 +255,7 @@
</Configuration>
<Configuration
Name="Release|x64"
- OutputDirectory="..\include\bin\Release"
+ OutputDirectory="lib\x64\Release"
IntermediateDirectory="obj\flac\x64\Release"
ConfigurationType="4"
CharacterSet="2"
@@ -288,7 +288,7 @@
FloatingPointModel="2"
UsePrecompiledHeader="0"
WarningLevel="3"
- ProgramDataBaseFileName="$(OutDir)\flac64.pdb"
+ ProgramDataBaseFileName="$(OutDir)\flac.pdb"
DebugInformationFormat="3"
CompileAs="1"
/>
@@ -305,7 +305,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)\flac64.lib"
+ OutputFile="$(OutDir)\flac.lib"
/>
<Tool
Name="VCALinkTool"
@@ -334,7 +334,7 @@
</Configuration>
<Configuration
Name="ReleaseNoLTCG|Win32"
- OutputDirectory="..\include\bin\ReleaseNoLTCG"
+ OutputDirectory="lib\x32\ReleaseNoLTCG"
IntermediateDirectory="obj\flac\x32\ReleaseNoLTCG"
ConfigurationType="4"
CharacterSet="2"
@@ -412,7 +412,7 @@
</Configuration>
<Configuration
Name="ReleaseNoLTCG|x64"
- OutputDirectory="..\include\bin\ReleaseNoLTCG"
+ OutputDirectory="lib\x64\ReleaseNoLTCG"
IntermediateDirectory="obj\flac\x64\ReleaseNoLTCG"
ConfigurationType="4"
CharacterSet="2"
@@ -445,7 +445,7 @@
FloatingPointModel="2"
UsePrecompiledHeader="0"
WarningLevel="3"
- ProgramDataBaseFileName="$(OutDir)\flac64.pdb"
+ ProgramDataBaseFileName="$(OutDir)\flac.pdb"
DebugInformationFormat="3"
CompileAs="1"
/>
@@ -462,7 +462,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)\flac64.lib"
+ OutputFile="$(OutDir)\flac.lib"
/>
<Tool
Name="VCALinkTool"
Modified: trunk/OpenMPT/build/flac.vcxproj
===================================================================
--- trunk/OpenMPT/build/flac.vcxproj 2013-11-06 12:59:58 UTC (rev 3096)
+++ trunk/OpenMPT/build/flac.vcxproj 2013-11-06 15:34:12 UTC (rev 3097)
@@ -90,24 +90,24 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\include\bin\Debug\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">lib\x32\Debug\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">obj\flac\x32\Debug\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">flac</TargetName>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\include\bin\Debug\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">lib\x64\Debug\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">obj\flac\x64\Debug\</IntDir>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">flac64</TargetName>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\include\bin\Release\</OutDir>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">flac</TargetName>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">lib\x32\Release\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">obj\flac\x32\Release\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">flac</TargetName>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\include\bin\Release\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">lib\x64\Release\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">obj\flac\x64\Release\</IntDir>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">flac64</TargetName>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">..\include\bin\ReleaseNoLTCG\</OutDir>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">flac</TargetName>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">lib\x32\ReleaseNoLTCG\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">obj\flac\x32\ReleaseNoLTCG\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">flac</TargetName>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">..\include\bin\ReleaseNoLTCG\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">lib\x64\ReleaseNoLTCG\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">obj\flac\x64\ReleaseNoLTCG\</IntDir>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">flac64</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">flac</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -157,12 +157,12 @@
<AdditionalIncludeDirectories>..\include\flac\include;..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Lib>
- <OutputFile>$(OutDir)flac64.lib</OutputFile>
+ <OutputFile>$(OutDir)flac.lib</OutputFile>
</Lib>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDataBaseFileName>$(OutDir)flac64.pdb</ProgramDataBaseFileName>
+ <ProgramDataBaseFileName>$(OutDir)flac.pdb</ProgramDataBaseFileName>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -217,14 +217,14 @@
<AdditionalIncludeDirectories>..\include\flac\include;..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Lib>
- <OutputFile>$(OutDir)flac64.lib</OutputFile>
+ <OutputFile>$(OutDir)flac.lib</OutputFile>
</Lib>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
- <ProgramDataBaseFileName>$(OutDir)flac64.pdb</ProgramDataBaseFileName>
+ <ProgramDataBaseFileName>$(OutDir)flac.pdb</ProgramDataBaseFileName>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">
@@ -279,14 +279,14 @@
<AdditionalIncludeDirectories>..\include\flac\include;..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Lib>
- <OutputFile>$(OutDir)flac64.lib</OutputFile>
+ <OutputFile>$(OutDir)flac.lib</OutputFile>
</Lib>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
- <ProgramDataBaseFileName>$(OutDir)flac64.pdb</ProgramDataBaseFileName>
+ <ProgramDataBaseFileName>$(OutDir)flac.pdb</ProgramDataBaseFileName>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
Modified: trunk/OpenMPT/build/flac.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/flac.vcxproj.filters 2013-11-06 12:59:58 UTC (rev 3096)
+++ trunk/OpenMPT/build/flac.vcxproj.filters 2013-11-06 15:34:12 UTC (rev 3097)
@@ -2,31 +2,31 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="include">
- <UniqueIdentifier>{15185494-76EB-8B47-B933-96DB3E256190}</UniqueIdentifier>
+ <UniqueIdentifier>{BC279AC7-C6B4-AE41-9ECC-A7C52B3C8A0D}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac">
- <UniqueIdentifier>{593AB6B7-383E-BA42-B1A5-21A12FFC6E17}</UniqueIdentifier>
+ <UniqueIdentifier>{3CFFBEDE-7D8E-A945-A8EC-D6F443D35E0A}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac\src">
- <UniqueIdentifier>{1E7FF733-2E9B-9340-A8DE-6B2D05191C7D}</UniqueIdentifier>
+ <UniqueIdentifier>{95A41CB5-5215-8D4F-8396-C62A7188EFEA}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac\src\libFLAC">
- <UniqueIdentifier>{93D40968-3ABD-B649-BED6-4EE88041D22C}</UniqueIdentifier>
+ <UniqueIdentifier>{520298DF-75E3-F349-A4A1-6EFED0096B06}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac\src\libFLAC\include">
- <UniqueIdentifier>{D79C2522-5B53-1544-9930-D5DFFC6CB112}</UniqueIdentifier>
+ <UniqueIdentifier>{E982D50B-C72D-B142-B902-2654348C1634}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac\src\libFLAC\include\private">
- <UniqueIdentifier>{614D2380-3BBF-7E40-88A5-8D045D5D3EB5}</UniqueIdentifier>
+ <UniqueIdentifier>{6A4252D2-AFB2-484A-9255-12EE5A59463A}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac\src\libFLAC\include\protected">
- <UniqueIdentifier>{55FD65F0-65DC-7546-8F4B-16C46A417DC0}</UniqueIdentifier>
+ <UniqueIdentifier>{C5A39CAF-4859-6C44-A0BC-8B8CAA772238}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac\include">
- <UniqueIdentifier>{DB4C430F-246D-DD49-9B9B-9F3FA19B6E12}</UniqueIdentifier>
+ <UniqueIdentifier>{1B8F9693-09EE-2147-815C-476B021C5415}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac\include\FLAC">
- <UniqueIdentifier>{F9E0C192-74B7-9C4F-A474-F49E35056ADA}</UniqueIdentifier>
+ <UniqueIdentifier>{7ACCC449-A61B-0F47-A15B-DDF1E1736629}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
Modified: trunk/OpenMPT/build/lhasa.vcproj
===================================================================
--- trunk/OpenMPT/build/lhasa.vcproj 2013-11-06 12:59:58 UTC (rev 3096)
+++ trunk/OpenMPT/build/lhasa.vcproj 2013-11-06 15:34:12 UTC (rev 3097)
@@ -20,7 +20,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\include\bin\Debug"
+ OutputDirectory="lib\x32\Debug"
IntermediateDirectory="obj\lhasa\x32\Debug"
ConfigurationType="4"
CharacterSet="2"
@@ -97,7 +97,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
- OutputDirectory="..\include\bin\Debug"
+ OutputDirectory="lib\x64\Debug"
IntermediateDirectory="obj\lhasa\x64\Debug"
ConfigurationType="4"
CharacterSet="2"
@@ -129,7 +129,7 @@
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
- ProgramDataBaseFileName="$(OutDir)\lhasa64.pdb"
+ ProgramDataBaseFileName="$(OutDir)\lhasa.pdb"
DebugInformationFormat="3"
CompileAs="1"
/>
@@ -146,7 +146,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)\lhasa64.lib"
+ OutputFile="$(OutDir)\lhasa.lib"
/>
<Tool
Name="VCALinkTool"
@@ -175,7 +175,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\include\bin\Release"
+ OutputDirectory="lib\x32\Release"
IntermediateDirectory="obj\lhasa\x32\Release"
ConfigurationType="4"
CharacterSet="2"
@@ -253,7 +253,7 @@
</Configuration>
<Configuration
Name="Release|x64"
- OutputDirectory="..\include\bin\Release"
+ OutputDirectory="lib\x64\Release"
IntermediateDirectory="obj\lhasa\x64\Release"
ConfigurationType="4"
CharacterSet="2"
@@ -286,7 +286,7 @@
FloatingPointModel="2"
UsePrecompiledHeader="0"
WarningLevel="3"
- ProgramDataBaseFileName="$(OutDir)\lhasa64.pdb"
+ ProgramDataBaseFileName="$(OutDir)\lhasa.pdb"
DebugInformationFormat="3"
CompileAs="1"
/>
@@ -303,7 +303,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)\lhasa64.lib"
+ OutputFile="$(OutDir)\lhasa.lib"
/>
<Tool
Name="VCALinkTool"
@@ -332,7 +332,7 @@
</Configuration>
<Configuration
Name="ReleaseNoLTCG|Win32"
- OutputDirectory="..\include\bin\ReleaseNoLTCG"
+ OutputDirectory="lib\x32\ReleaseNoLTCG"
IntermediateDirectory="obj\lhasa\x32\ReleaseNoLTCG"
ConfigurationType="4"
CharacterSet="2"
@@ -410,7 +410,7 @@
</Configuration>
<Configuration
Name="ReleaseNoLTCG|x64"
- OutputDirectory="..\include\bin\ReleaseNoLTCG"
+ OutputDirectory="lib\x64\ReleaseNoLTCG"
IntermediateDirectory="obj\lhasa\x64\ReleaseNoLTCG"
ConfigurationType="4"
CharacterSet="2"
@@ -443,7 +443,7 @@
FloatingPointModel="2"
UsePrecompiledHeader="0"
WarningLevel="3"
- ProgramDataBaseFileName="$(OutDir)\lhasa64.pdb"
+ ProgramDataBaseFileName="$(OutDir)\lhasa.pdb"
DebugInformationFormat="3"
CompileAs="1"
/>
@@ -460,7 +460,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)\lhasa64.lib"
+ OutputFile="$(OutDir)\lhasa.lib"
/>
<Tool
Name="VCALinkTool"
Modified: trunk/OpenMPT/build/lhasa.vcxproj
===================================================================
--- trunk/OpenMPT/build/lhasa.vcxproj 2013-11-06 12:59:58 UTC (rev 3096)
+++ trunk/OpenMPT/build/lhasa.vcxproj 2013-11-06 15:34:12 UTC (rev 3097)
@@ -90,24 +90,24 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\include\bin\Debug\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">lib\x32\Debug\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">obj\lhasa\x32\Debug\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">lhasa</TargetName>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\include\bin\Debug\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">lib\x64\Debug\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">obj\lhasa\x64\Debug\</IntDir>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">lhasa64</TargetName>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\include\bin\Release\</OutDir>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">lhasa</TargetName>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">lib\x32\Release\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">obj\lhasa\x32\Release\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">lhasa</TargetName>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\include\bin\Release\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">lib\x64\Release\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">obj\lhasa\x64\Release\</IntDir>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">lhasa64</TargetName>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">..\include\bin\ReleaseNoLTCG\</OutDir>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">lhasa</TargetName>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">lib\x32\ReleaseNoLTCG\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">obj\lhasa\x32\ReleaseNoLTCG\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">lhasa</TargetName>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">..\include\bin\ReleaseNoLTCG\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">lib\x64\ReleaseNoLTCG\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">obj\lhasa\x64\ReleaseNoLTCG\</IntDir>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">lhasa64</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">lhasa</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -155,12 +155,12 @@
<AdditionalIncludeDirectories>..\include\msinttypes\inttypes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Lib>
- <OutputFile>$(OutDir)lhasa64.lib</OutputFile>
+ <OutputFile>$(OutDir)lhasa.lib</OutputFile>
</Lib>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDataBaseFileName>$(OutDir)lhasa64.pdb</ProgramDataBaseFileName>
+ <ProgramDataBaseFileName>$(OutDir)lhasa.pdb</ProgramDataBaseFileName>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -215,14 +215,14 @@
<AdditionalIncludeDirectories>..\include\msinttypes\inttypes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Lib>
- <OutputFile>$(OutDir)lhasa64.lib</OutputFile>
+ <OutputFile>$(OutDir)lhasa.lib</OutputFile>
</Lib>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
- <ProgramDataBaseFileName>$(OutDir)lhasa64.pdb</ProgramDataBaseFileName>
+ <ProgramDataBaseFileName>$(OutDir)lhasa.pdb</ProgramDataBaseFileName>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">
@@ -277,14 +277,14 @@
<AdditionalIncludeDirectories>..\include\msinttypes\inttypes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Lib>
- <OutputFile>$(OutDir)lhasa64.lib</OutputFile>
+ <OutputFile>$(OutDir)lhasa.lib</OutputFile>
</Lib>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
- <ProgramDataBaseFileName>$(OutDir)lhasa64.pdb</ProgramDataBaseFileName>
+ <ProgramDataBaseFileName>$(OutDir)lhasa.pdb</ProgramDataBaseFileName>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
Modified: trunk/OpenMPT/build/lhasa.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/lhasa.vcxproj.filters 2013-11-06 12:59:58 UTC (rev 3096)
+++ trunk/OpenMPT/build/lhasa.vcxproj.filters 2013-11-06 15:34:12 UTC (rev 3097)
@@ -2,16 +2,16 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="include">
- <UniqueIdentifier>{19494FDD-2706-8347-962A-7DAEA0E8CC3B}</UniqueIdentifier>
+ <UniqueIdentifier>{5C28B7BC-E688-F04C-AA7A-4C818FF0B931}</UniqueIdentifier>
</Filter>
<Filter Include="include\lhasa">
- <UniqueIdentifier>{1A2C2CCD-C268-3946-97B3-AF6438E24160}</UniqueIdentifier>
+ <UniqueIdentifier>{E594F94D-4264-C845-85EE-136F04FDC899}</UniqueIdentifier>
</Filter>
<Filter Include="include\lhasa\lib">
- <UniqueIdentifier>{28F6BA1F-75E0-5C40-AD75-5160411D3127}</UniqueIdentifier>
+ <UniqueIdentifier>{D40C9477-3313-964A-979A-69394903E541}</UniqueIdentifier>
</Filter>
<Filter Include="include\lhasa\lib\public">
- <UniqueIdentifier>{44CA7BAC-69A4-4B49-81F6-FC57357E1B06}</UniqueIdentifier>
+ <UniqueIdentifier>{8DFECA0F-7BAD-204D-913B-C35F91525497}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
Modified: trunk/OpenMPT/build/miniz.vcproj
===================================================================
--- trunk/OpenMPT/build/miniz.vcproj 2013-11-06 12:59:58 UTC (rev 3096)
+++ trunk/OpenMPT/build/miniz.vcproj 2013-11-06 15:34:12 UTC (rev 3097)
@@ -20,7 +20,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\include\bin\Debug"
+ OutputDirectory="lib\x32\Debug"
IntermediateDirectory="obj\miniz\x32\Debug"
ConfigurationType="4"
CharacterSet="2"
@@ -95,7 +95,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
- OutputDirectory="..\include\bin\Debug"
+ OutputDirectory="lib\x64\Debug"
IntermediateDirectory="obj\miniz\x64\Debug"
ConfigurationType="4"
CharacterSet="2"
@@ -126,7 +126,7 @@
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
- ProgramDataBaseFileName="$(OutDir)\miniz64.pdb"
+ ProgramDataBaseFileName="$(OutDir)\miniz.pdb"
DebugInformationFormat="3"
CompileAs="1"
/>
@@ -142,7 +142,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)\miniz64.lib"
+ OutputFile="$(OutDir)\miniz.lib"
/>
<Tool
Name="VCALinkTool"
@@ -171,7 +171,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\include\bin\Release"
+ OutputDirectory="lib\x32\Release"
IntermediateDirectory="obj\miniz\x32\Release"
ConfigurationType="4"
CharacterSet="2"
@@ -247,7 +247,7 @@
</Configuration>
<Configuration
Name="Release|x64"
- OutputDirectory="..\include\bin\Release"
+ OutputDirectory="lib\x64\Release"
IntermediateDirectory="obj\miniz\x64\Release"
ConfigurationType="4"
CharacterSet="2"
@@ -279,7 +279,7 @@
FloatingPointModel="2"
UsePrecompiledHeader="0"
WarningLevel="3"
- ProgramDataBaseFileName="$(OutDir)\miniz64.pdb"
+ ProgramDataBaseFileName="$(OutDir)\miniz.pdb"
DebugInformationFormat="3"
CompileAs="1"
/>
@@ -295,7 +295,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)\miniz64.lib"
+ OutputFile="$(OutDir)\miniz.lib"
/>
<Tool
Name="VCALinkTool"
@@ -324,7 +324,7 @@
</Configuration>
<Configuration
Name="ReleaseNoLTCG|Win32"
- OutputDirectory="..\include\bin\ReleaseNoLTCG"
+ OutputDirectory="lib\x32\ReleaseNoLTCG"
IntermediateDirectory="obj\miniz\x32\ReleaseNoLTCG"
ConfigurationType="4"
CharacterSet="2"
@@ -400,7 +400,7 @@
</Configuration>
<Configuration
Name="ReleaseNoLTCG|x64"
- OutputDirectory="..\include\bin\ReleaseNoLTCG"
+ OutputDirectory="lib\x64\ReleaseNoLTCG"
IntermediateDirectory="obj\miniz\x64\ReleaseNoLTCG"
ConfigurationType="4"
CharacterSet="2"
@@ -432,7 +432,7 @@
FloatingPointModel="2"
UsePrecompiledHeader="0"
WarningLevel="3"
- ProgramDataBaseFileName="$(OutDir)\miniz64.pdb"
+ ProgramDataBaseFileName="$(OutDir)\miniz.pdb"
DebugInformationFormat="3"
CompileAs="1"
/>
@@ -448,7 +448,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)\miniz64.lib"
+ OutputFile="$(OutDir)\miniz.lib"
/>
<Tool
Name="VCALinkTool"
Modified: trunk/OpenMPT/build/miniz.vcxproj
===================================================================
--- trunk/OpenMPT/build/miniz.vcxproj 2013-11-06 12:59:58 UTC (rev 3096)
+++ trunk/OpenMPT/build/miniz.vcxproj 2013-11-06 15:34:12 UTC (rev 3097)
@@ -90,24 +90,24 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\include\bin\Debug\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">lib\x32\Debug\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">obj\miniz\x32\Debug\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">miniz</TargetName>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\include\bin\Debug\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">lib\x64\Debug\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">obj\miniz\x64\Debug\</IntDir>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">miniz64</TargetName>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\include\bin\Release\</OutDir>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">miniz</TargetName>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">lib\x32\Release\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">obj\miniz\x32\Release\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">miniz</TargetName>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\include\bin\Release\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">lib\x64\Release\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">obj\miniz\x64\Release\</IntDir>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">miniz64</TargetName>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">..\include\bin\ReleaseNoLTCG\</OutDir>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">miniz</TargetName>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">lib\x32\ReleaseNoLTCG\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">obj\miniz\x32\ReleaseNoLTCG\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">miniz</TargetName>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">..\include\bin\ReleaseNoLTCG\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">lib\x64\ReleaseNoLTCG\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">obj\miniz\x64\ReleaseNoLTCG\</IntDir>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">miniz64</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">miniz</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -151,12 +151,12 @@
<PreprocessorDefinitions>DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Lib>
- <OutputFile>$(OutDir)miniz64.lib</OutputFile>
+ <OutputFile>$(OutDir)miniz.lib</OutputFile>
</Lib>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDataBaseFileName>$(OutDir)miniz64.pdb</ProgramDataBaseFileName>
+ <ProgramDataBaseFileName>$(OutDir)miniz.pdb</ProgramDataBaseFileName>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -207,14 +207,14 @@
<PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Lib>
- <OutputFile>$(OutDir)miniz64.lib</OutputFile>
+ <OutputFile>$(OutDir)miniz.lib</OutputFile>
</Lib>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
- <ProgramDataBaseFileName>$(OutDir)miniz64.pdb</ProgramDataBaseFileName>
+ <ProgramDataBaseFileName>$(OutDir)miniz.pdb</ProgramDataBaseFileName>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">
@@ -265,14 +265,14 @@
<PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Lib>
- <OutputFile>$(OutDir)miniz64.lib</OutputFile>
+ <OutputFile>$(OutDir)miniz.lib</OutputFile>
</Lib>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
- <ProgramDataBaseFileName>$(OutDir)miniz64.pdb</ProgramDataBaseFileName>
+ <ProgramDataBaseFileName>$(OutDir)miniz.pdb</ProgramDataBaseFileName>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
Modified: trunk/OpenMPT/build/miniz.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/miniz.vcxproj.filters 2013-11-06 12:59:58 UTC (rev 3096)
+++ trunk/OpenMPT/build/miniz.vcxproj.filters 2013-11-06 15:34:12 UTC (rev 3097)
@@ -2,10 +2,10 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="include">
- <UniqueIdentifier>{6B048AFC-489B-C74E-9268-5E73B3846663}</UniqueIdentifier>
+ <UniqueIdentifier>{97148828-3006-8947-A52E-EC3FF6B45E77}</UniqueIdentifier>
</Filter>
<Filter Include="include\miniz">
- <UniqueIdentifier>{65774DFA-D430-984F-B926-8C0C5A58077A}</UniqueIdentifier>
+ <UniqueIdentifier>{6643FDE6-C22E-B042-81AF-FE904E9F7D76}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
Modified: trunk/OpenMPT/build/minizip.vcproj
===================================================================
--- trunk/OpenMPT/build/minizip.vcproj 2013-11-06 12:59:58 UTC (rev 3096)
+++ trunk/OpenMPT/build/minizip.vcproj 2013-11-06 15:34:12 UTC (rev 3097)
@@ -20,7 +20,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\include\bin\Debug"
+ OutputDirectory="lib\x32\Debug"
IntermediateDirectory="obj\minizip\x32\Debug"
ConfigurationType="4"
CharacterSet="2"
@@ -97,7 +97,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
- OutputDirectory="..\include\bin\Debug"
+ OutputDirectory="lib\x64\Debug"
IntermediateDirectory="obj\minizip\x64\Debug"
ConfigurationType="4"
CharacterSet="2"
@@ -129,7 +129,7 @@
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
- ProgramDataBaseFileName="$(OutDir)\minizip64.pdb"
+ ProgramDataBaseFileName="$(OutDir)\minizip.pdb"
DebugInformationFormat="3"
CompileAs="1"
/>
@@ -146,7 +146,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)\minizip64.lib"
+ OutputFile="$(OutDir)\minizip.lib"
/>
<Tool
Name="VCALinkTool"
@@ -175,7 +175,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\include\bin\Release"
+ OutputDirectory="lib\x32\Release"
IntermediateDirectory="obj\minizip\x32\Release"
ConfigurationType="4"
CharacterSet="2"
@@ -253,7 +253,7 @@
</Configuration>
<Configuration
Name="Release|x64"
- OutputDirectory="..\include\bin\Release"
+ OutputDirectory="lib\x64\Release"
IntermediateDirectory="obj\minizip\x64\Release"
ConfigurationType="4"
CharacterSet="2"
@@ -286,7 +286,7 @@
FloatingPointModel="2"
UsePrecompiledHeader="0"
WarningLevel="3"
- ProgramDataBaseFileName="$(OutDir)\minizip64.pdb"
+ ProgramDataBaseFileName="$(OutDir)\minizip.pdb"
DebugInformationFormat="3"
CompileAs="1"
/>
@@ -303,7 +303,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)\minizip64.lib"
+ OutputFile="$(OutDir)\minizip.lib"
/>
<Tool
Name="VCALinkTool"
@@ -332,7 +332,7 @@
</Configuration>
<Configuration
Name="ReleaseNoLTCG|Win32"
- OutputDirectory="..\include\bin\ReleaseNoLTCG"
+ OutputDirectory="lib\x32\ReleaseNoLTCG"
IntermediateDirectory="obj\minizip\x32\ReleaseNoLTCG"
ConfigurationType="4"
CharacterSet="2"
@@ -410,7 +410,7 @@
</Configuration>
<Configuration
Name="ReleaseNoLTCG|x64"
- OutputDirectory="..\include\bin\ReleaseNoLTCG"
+ OutputDirectory="lib\x64\ReleaseNoLTCG"
IntermediateDirectory="obj\minizip\x64\ReleaseNoLTCG"
ConfigurationType="4"
CharacterSet="2"
@@ -443,7 +443,7 @@
FloatingPointModel="2"
UsePrecompiledHeader="0"
WarningLevel="3"
- ProgramDataBaseFileName="$(OutDir)\minizip64.pdb"
+ ProgramDataBaseFileName="$(OutDir)\minizip.pdb"
DebugInformationFormat="3"
CompileAs="1"
/>
@@ -460,7 +460,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)\minizip64.lib"
+ OutputFile="$(OutDir)\minizip.lib"
/>
<Tool
Name="VCALinkTool"
Modified: trunk/OpenMPT/build/minizip.vcxproj
===================================================================
--- trunk/OpenMPT/build/minizip.vcxproj 2013-11-06 12:59:58 UTC (rev 3096)
+++ trunk/OpenMPT/build/minizip.vcxproj 2013-11-06 15:34:12 UTC (rev 3097)
@@ -90,24 +90,24 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\include\bin\Debug\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">lib\x32\Debug\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">obj\minizip\x32\Debug\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">minizip</TargetName>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\include\bin\Debug\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">lib\x64\Debug\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">obj\minizip\x64\Debug\</IntDir>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">minizip64</TargetName>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\include\bin\Release\</OutDir>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">minizip</TargetName>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">lib\x32\Release\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">obj\minizip\x32\Release\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">minizip</TargetName>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\include\bin\Release\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">lib\x64\Release\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">obj\minizip\x64\Release\</IntDir>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">minizip64</TargetName>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">..\include\bin\ReleaseNoLTCG\</OutDir>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">minizip</TargetName>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">lib\x32\ReleaseNoLTCG\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">obj\minizip\x32\ReleaseNoLTCG\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">minizip</TargetName>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">..\include\bin\ReleaseNoLTCG\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">lib\x64\ReleaseNoLTCG\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">obj\minizip\x64\ReleaseNoLTCG\</IntDir>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">minizip64</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">minizip</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -155,12 +155,12 @@
<AdditionalIncludeDirectories>..\include\zlib;..\include\zlib\contrib\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Lib>
- <OutputFile>$(OutDir)minizip64.lib</OutputFile>
+ <OutputFile>$(OutDir)minizip.lib</OutputFile>
</Lib>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDataBaseFileName>$(OutDir)minizip64.pdb</ProgramDataBaseFileName>
+ <ProgramDataBaseFileName>$(OutDir)minizip.pdb</ProgramDataBaseFileName>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -215,14 +215,14 @@
<AdditionalIncludeDirectories>..\include\zlib;..\include\zlib\contrib\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Lib>
- <OutputFile>$(OutDir)minizip64.lib</OutputFile>
+ <OutputFile>$(OutDir)minizip.lib</OutputFile>
</Lib>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
- <ProgramDataBaseFileName>$(OutDir)minizip64.pdb</ProgramDataBaseFileName>
+ <ProgramDataBaseFileName>$(OutDir)minizip.pdb</ProgramDataBaseFileName>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">
@@ -277,14 +277,14 @@
<AdditionalIncludeDirectories>..\include\zlib;..\include\zlib\contrib\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Lib>
- <OutputFile>$(OutDir)minizip64.lib</OutputFile>
+ <OutputFile>$(OutDir)minizip.lib</OutputFile>
</Lib>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
- <ProgramDataBaseFileName>$(OutDir)minizip64.pdb</ProgramDataBaseFileName>
+ <ProgramDataBaseFileName>$(OutDir)minizip.pdb</ProgramDataBaseFileName>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
Modified: trunk/OpenMPT/build/minizip.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/minizip.vcxproj.filters 2013-11-06 12:59:58 UTC (rev 3096)
+++ trunk/OpenMPT/build/minizip.vcxproj.filters 2013-11-06 15:34:12 UTC (rev 3097)
@@ -2,16 +2,16 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="include">
- <UniqueIdentifier>{E915CF12-4BFB-AF44-85BF-7D6CAEEF50F5}</UniqueIdentifier>
+ <UniqueIdentifier>{68E4E657-7DF1-0C4B-8987-D76FD8397852}</UniqueIdentifier>
</Filter>
<Filter Include="include\zlib">
- <UniqueIdentifier>{B8A0A8EE-3677-A744-B03D-3F426C7B8AE7}</UniqueIdentifier>
+ <UniqueIdentifier>{15B45470-842E-9B43-B697-6023C422B24E}</UniqueIdentifier>
</Filter>
<Filter Include="include\zlib\contrib">
- <UniqueIdentifier>{992492FE-4C62-D34A-B088-B2E247004530}</UniqueIdentifier>
+ <UniqueIdentifier>{63B7D41F-8A1F-C241-A874-442FA1EAA018}</UniqueIdentifier>
</Filter>
<Filter Include="include\zlib\contrib\minizip">
- <UniqueIdentifier>{30FA0556-9AC8-8A4E-BE11-5436EF8E34E7}</UniqueIdentifier>
+ <UniqueIdentifier>{EF7621CA-D165-674C-803F-38D7C80333B9}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
Modified: trunk/OpenMPT/build/portaudio.vcproj
===================================================================
--- trunk/OpenMPT/build/portaudio.vcproj 2013-11-06 12:59:58 UTC (rev 3096)
+++ trunk/OpenMPT/build/portaudio.vcproj 2013-11-06 15:34:12 UTC (rev 3097)
@@ -20,7 +20,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\include\bin\Debug"
+ OutputDirectory="lib\x32\Debug"
IntermediateDirectory="obj\portaudio\x32\Debug"
ConfigurationType="4"
CharacterSet="2"
@@ -98,7 +98,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
- OutputDirectory="..\include\bin\Debug"
+ OutputDirectory="lib\x64\Debug"
IntermediateDirectory="obj\portaudio\x64\Debug"
ConfigurationType="4"
CharacterSet="2"
@@ -131,7 +131,7 @@
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
- ProgramDataBaseFileName="$(OutDir)\portaudio64.pdb"
+ ProgramDataBaseFileName="$(OutDir)\portaudio.pdb"
DebugInformationFormat="3"
CompileAs="1"
/>
@@ -148,7 +148,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)\portaudio64.lib"
+ OutputFile="$(OutDir)\portaudio.lib"
/>
<Tool
Name="VCALinkTool"
@@ -177,7 +177,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\include\bin\Release"
+ OutputDirectory="lib\x32\Release"
IntermediateDirectory="obj\portaudio\x32\Release"
ConfigurationType="4"
CharacterSet="2"
@@ -255,7 +255,7 @@
</Configuration>
<Configuration
Name="Release|x64"
- OutputDirectory="..\include\bin\Release"
+ OutputDirectory="lib\x64\Release"
IntermediateDirectory="obj\portaudio\x64\Release"
ConfigurationType="4"
CharacterSet="2"
@@ -288,7 +288,7 @@
FloatingPointModel="2"
UsePrecompiledHeader="0"
WarningLevel="3"
- ProgramDataBaseFileName="$(OutDir)\portaudio64.pdb"
+ ProgramDataBaseFileName="$(OutDir)\portaudio.pdb"
DebugInformationFormat="3"
CompileAs="1"
/>
@@ -305,7 +305,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)\portaudio64.lib"
+ OutputFile="$(OutDir)\portaudio.lib"
/>
<Tool
Name="VCALinkTool"
@@ -334,7 +334,7 @@
</Configuration>
<Configuration
Name="ReleaseNoLTCG|Win32"
- OutputDirectory="..\include\bin\ReleaseNoLTCG"
+ OutputDirectory="lib\x32\ReleaseNoLTCG"
IntermediateDirectory="obj\portaudio\x32\ReleaseNoLTCG"
ConfigurationType="4"
CharacterSet="2"
@@ -412,7 +412,7 @@
</Configuration>
<Configuration
Name="ReleaseNoLTCG|x64"
- OutputDirectory="..\include\bin\ReleaseNoLTCG"
+ OutputDirectory="lib\x64\ReleaseNoLTCG"
IntermediateDirectory="obj\portaudio\x64\ReleaseNoLTCG"
ConfigurationType="4"
CharacterSet="2"
@@ -445,7 +445,7 @@
FloatingPointModel="2"
UsePrecompiledHeader="0"
WarningLevel="3"
- ProgramDataBaseFileName="$(OutDir)\portaudio64.pdb"
+ ProgramDataBaseFileName="$(OutDir)\portaudio.pdb"
DebugInformationFormat="3"
CompileAs="1"
/>
@@ -462,7 +462,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)\portaudio64.lib"
+ OutputFile="$(OutDir)\portaudio.lib"
/>
<Tool
Name="VCALinkTool"
Modified: trunk/OpenMPT/build/portaudio.vcxproj
===================================================================
--- trunk/OpenMPT/build/portaudio.vcxproj 2013-11-06 12:59:58 UTC (rev 3096)
+++ trunk/OpenMPT/build/portaudio.vcxproj 2013-11-06 15:34:12 UTC (rev 3097)
@@ -90,24 +90,24 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\include\bin\Debug\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">lib\x32\Debug\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">obj\portaudio\x32\Debug\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">portaudio</TargetName>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\include\bin\Debug\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">lib\x64\Debug\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">obj\portaudio\x64\Debug\</IntDir>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">portaudio64</TargetName>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\include\bin\Release\</OutDir>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">portaudio</TargetName>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">lib\x32\Release\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">obj\portaudio\x32\Release\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">portaudio</TargetName>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\include\bin\Release\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">lib\x64\Release\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">obj\portaudio\x64\Release\</IntDir>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">portaudio64</TargetName>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">..\include\bin\ReleaseNoLTCG\</OutDir>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">portaudio</TargetName>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">lib\x32\ReleaseNoLTCG\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">obj\portaudio\x32\ReleaseNoLTCG\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">portaudio</TargetName>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">..\include\bin\ReleaseNoLTCG\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">lib\x64\ReleaseNoLTCG\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">obj\portaudio\x64\ReleaseNoLTCG\</IntDir>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">portaudio64</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">portaudio</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -157,12 +157,12 @@
<AdditionalIncludeDirectories>..\include\portaudio\include;..\include\portaudio\src\common;..\include\portaudio\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Lib>
- <OutputFile>$(OutDir)portaudio64.lib</OutputFile>
+ <OutputFile>$(OutDir)portaudio.lib</OutputFile>
</Lib>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDataBaseFileName>$(OutDir)portaudio64.pdb</ProgramDataBaseFil...
[truncated message content] |
