Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[3329] trunk/OpenMPT
|
From: <man...@us...> - 2013-11-29 02:02:46
|
Revision: 3329
http://sourceforge.net/p/modplug/code/3329
Author: manxorist
Date: 2013-11-29 02:02:31 +0000 (Fri, 29 Nov 2013)
Log Message:
-----------
[Ref] libopenmpt: Move binaries of MSVC project files to bin/ directory.
Modified Paths:
--------------
trunk/OpenMPT/build/auto/package_openmpt-plugins.cmd
trunk/OpenMPT/build/auto/package_openmpt123.cmd
trunk/OpenMPT/build/auto/test_openmpt123-64.cmd
trunk/OpenMPT/build/auto/test_openmpt123.cmd
trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj
trunk/OpenMPT/libopenmpt/libopenmpt_foobar2000.vcxproj
trunk/OpenMPT/libopenmpt/libopenmpt_settings.vcxproj
trunk/OpenMPT/openmpt123/openmpt123.vcxproj
Removed Paths:
-------------
trunk/OpenMPT/libopenmpt/bin/
Modified: trunk/OpenMPT/build/auto/package_openmpt-plugins.cmd
===================================================================
--- trunk/OpenMPT/build/auto/package_openmpt-plugins.cmd 2013-11-29 01:39:10 UTC (rev 3328)
+++ trunk/OpenMPT/build/auto/package_openmpt-plugins.cmd 2013-11-29 02:02:31 UTC (rev 3329)
@@ -5,7 +5,7 @@
-cd libopenmpt\bin || goto error
+cd bin\Win32 || goto error
del /f /q openmpt-plugins.tar
del /f /q openmpt-plugins-r%GOT_REVISION%.7z
"C:\Program Files\7-Zip\7z.exe" a -t7z -mx=9 openmpt-plugins-r%GOT_REVISION%.7z in_openmpt.dll xmp-openmpt.dll foo_openmpt.dll libopenmpt_settings.dll || goto error
Modified: trunk/OpenMPT/build/auto/package_openmpt123.cmd
===================================================================
--- trunk/OpenMPT/build/auto/package_openmpt123.cmd 2013-11-29 01:39:10 UTC (rev 3328)
+++ trunk/OpenMPT/build/auto/package_openmpt123.cmd 2013-11-29 02:02:31 UTC (rev 3329)
@@ -5,7 +5,7 @@
-cd openmpt123\bin || goto error
+cd bin\Win32 || goto error
del /f /q openmpt123.tar
del /f /q openmpt123-r%GOT_REVISION%.7z
"C:\Program Files\7-Zip\7z.exe" a -t7z -mx=9 openmpt123-r%GOT_REVISION%.7z openmpt123.exe || goto error
Modified: trunk/OpenMPT/build/auto/test_openmpt123-64.cmd
===================================================================
--- trunk/OpenMPT/build/auto/test_openmpt123-64.cmd 2013-11-29 01:39:10 UTC (rev 3328)
+++ trunk/OpenMPT/build/auto/test_openmpt123-64.cmd 2013-11-29 02:02:31 UTC (rev 3329)
@@ -5,8 +5,8 @@
-cd libopenmpt || goto error
-bin\libopenmpt64-test.exe || goto error
+cd bin || goto error
+x64\libopenmpt-test.exe || goto error
cd .. || goto error
Modified: trunk/OpenMPT/build/auto/test_openmpt123.cmd
===================================================================
--- trunk/OpenMPT/build/auto/test_openmpt123.cmd 2013-11-29 01:39:10 UTC (rev 3328)
+++ trunk/OpenMPT/build/auto/test_openmpt123.cmd 2013-11-29 02:02:31 UTC (rev 3329)
@@ -5,8 +5,8 @@
-cd libopenmpt || goto error
-bin\libopenmpt-test.exe || goto error
+cd bin || goto error
+Win32\libopenmpt-test.exe || goto error
cd .. || goto error
Modified: trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj 2013-11-29 01:39:10 UTC (rev 3328)
+++ trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj 2013-11-29 02:02:31 UTC (rev 3329)
@@ -138,22 +138,59 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <OutDir>bin\</OutDir>
+ <OutDir>..\bin\$(Platform)\</OutDir>
+ <IntDir>..\build\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">
- <OutDir>bin\</OutDir>
+ <OutDir>..\bin\$(Platform)\</OutDir>
<TargetName>$(ProjectName)-test</TargetName>
+ <IntDir>..\build\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <OutDir>bin\</OutDir>
- <TargetName>$(ProjectName)64</TargetName>
+ <OutDir>..\bin\$(Platform)\</OutDir>
+ <IntDir>..\build\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|x64'">
- <OutDir>bin\</OutDir>
- <TargetName>$(ProjectName)64-test</TargetName>
+ <OutDir>..\bin\$(Platform)\</OutDir>
+ <TargetName>$(ProjectName)-test</TargetName>
+ <IntDir>..\build\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <OutDir>..\bin\$(Platform)-Debug\</OutDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <OutDir>..\bin\$(Platform)-Debug\</OutDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <IntDir>..\build\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <IntDir>..\build\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugStatic|Win32'">
+ <OutDir>..\build\lib\$(Platform)\$(Configuration)\</OutDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugStatic|Win32'">
+ <IntDir>..\build\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugStatic|x64'">
+ <OutDir>..\build\lib\$(Platform)\$(Configuration)\</OutDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugStatic|x64'">
+ <IntDir>..\build\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">
+ <OutDir>..\build\lib\$(Platform)\$(Configuration)\</OutDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">
+ <IntDir>..\build\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'">
+ <OutDir>..\build\lib\$(Platform)\$(Configuration)\</OutDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'">
+ <IntDir>..\build\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
+ </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
@@ -259,9 +296,9 @@
<Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\libopenmpt\svn_version\svn_version.h || del ..\libopenmpt\svn_version\svn_version.h || true</Command>
</PreBuildEvent>
<PostBuildEvent>
- <Command>copy /y bin\libopenmpt.dll bin\in_openmpt.dll
-copy /y bin\libopenmpt.dll bin\xmp-openmpt.dll
-copy /y bin\libopenmpt.dll bin\libmodplug.dll
+ <Command>copy /y ..\bin\$(Platform)\libopenmpt.dll ..\bin\$(Platform)\in_openmpt.dll
+copy /y ..\bin\$(Platform)\libopenmpt.dll ..\bin\$(Platform)\xmp-openmpt.dll
+copy /y ..\bin\$(Platform)\libopenmpt.dll ..\bin\$(Platform)\libmodplug.dll
</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
@@ -321,7 +358,7 @@
<Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\libopenmpt\svn_version\svn_version.h || del ..\libopenmpt\svn_version\svn_version.h || true</Command>
</PreBuildEvent>
<PostBuildEvent>
- <Command>copy /y bin\libopenmpt64.dll bin\libmodplug64.dll
+ <Command>copy /y ..\bin\$(Platform)\libopenmpt.dll ..\bin\$(Platform)\libmodplug.dll
</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
Modified: trunk/OpenMPT/libopenmpt/libopenmpt_foobar2000.vcxproj
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt_foobar2000.vcxproj 2013-11-29 01:39:10 UTC (rev 3328)
+++ trunk/OpenMPT/libopenmpt/libopenmpt_foobar2000.vcxproj 2013-11-29 02:02:31 UTC (rev 3329)
@@ -38,10 +38,13 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<TargetName>foo_openmpt</TargetName>
+ <OutDir>..\bin\$(Platform)-Debug\</OutDir>
+ <IntDir>..\build\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<TargetName>foo_openmpt</TargetName>
- <OutDir>bin\</OutDir>
+ <OutDir>..\bin\$(Platform)\</OutDir>
+ <IntDir>..\build\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
Modified: trunk/OpenMPT/libopenmpt/libopenmpt_settings.vcxproj
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt_settings.vcxproj 2013-11-29 01:39:10 UTC (rev 3328)
+++ trunk/OpenMPT/libopenmpt/libopenmpt_settings.vcxproj 2013-11-29 02:02:31 UTC (rev 3329)
@@ -36,11 +36,12 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <IntDir>$(ProjectName)-$(Configuration)\</IntDir>
+ <IntDir>..\build\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
+ <OutDir>..\bin\$(Platform)-Debug\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <IntDir>$(ProjectName)-$(Configuration)\</IntDir>
- <OutDir>bin\</OutDir>
+ <IntDir>..\build\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
+ <OutDir>..\bin\$(Platform)\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
Modified: trunk/OpenMPT/openmpt123/openmpt123.vcxproj
===================================================================
--- trunk/OpenMPT/openmpt123/openmpt123.vcxproj 2013-11-29 01:39:10 UTC (rev 3328)
+++ trunk/OpenMPT/openmpt123/openmpt123.vcxproj 2013-11-29 02:02:31 UTC (rev 3329)
@@ -62,12 +62,25 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <OutDir>bin\</OutDir>
+ <OutDir>..\bin\$(Platform)\</OutDir>
+ <IntDir>..\build\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <OutDir>bin\</OutDir>
- <TargetName>$(ProjectName)64</TargetName>
+ <OutDir>..\bin\$(Platform)\</OutDir>
+ <IntDir>..\build\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <OutDir>..\bin\$(Platform)-Debug\</OutDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <IntDir>..\build\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <OutDir>..\bin\$(Platform)-Debug\</OutDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <IntDir>..\build\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
+ </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
