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

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

Revision: 4253
          http://sourceforge.net/p/modplug/code/4253
Author:   manxorist
Date:     2014-09-07 09:04:11 +0000 (Sun, 07 Sep 2014)
Log Message:
-----------
Merged revision(s) 4137 from branches/manx/msvc-linking:
[Ref] Move selection of external MSVC/Windows libraries from the individual per-configuration project settings for VS2008 and VS2010 into a single MPTrackLink.cpp file by using linker pragmas in order to avoid unnecessary duplication of information and in order to make conditional selection of external libraries easier.
........

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/mptrack_08.vcproj
    trunk/OpenMPT/mptrack/mptrack_10.vcxproj
    trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters

Added Paths:
-----------
    trunk/OpenMPT/mptrack/MPTrackLink.cpp

Property Changed:
----------------
    trunk/OpenMPT/

Index: trunk/OpenMPT
===================================================================
--- trunk/OpenMPT	2014-09-07 09:02:21 UTC (rev 4252)
+++ trunk/OpenMPT	2014-09-07 09:04:11 UTC (rev 4253)

Property changes on: trunk/OpenMPT
___________________________________________________________________
Modified: svn:mergeinfo
## -6,6 +6,7 ##
 /branches/manx/lossy-export:2653-2654,2660,2664,2678,2681
 /branches/manx/lossy-export-xiph:2663,2677,2680
 /branches/manx/mptstring-stdstring-support:2204,2208,2212,2214,2217,2220,2224,2259,2261-2262,2264,2267
+/branches/manx/msvc-linking:4137
 /branches/manx/nonglobal-mixer:1715-1841
 /branches/manx/portaudio:2694-2705
 /branches/manx/premake:2606,2609-2610,2614,2616,2621,2624,2641
\ No newline at end of property
Copied: trunk/OpenMPT/mptrack/MPTrackLink.cpp (from rev 4137, branches/manx/msvc-linking/mptrack/MPTrackLink.cpp)
===================================================================
--- trunk/OpenMPT/mptrack/MPTrackLink.cpp	                        (rev 0)
+++ trunk/OpenMPT/mptrack/MPTrackLink.cpp	2014-09-07 09:04:11 UTC (rev 4253)
@@ -0,0 +1,44 @@
+/*
+ * MPTrackLink.cpp
+ * ---------------
+ * Purpose: Consolidated linking against MSVC/Windows libraries.
+ * Notes  : (currently none)
+ * Authors: OpenMPT Devs
+ * The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
+ */
+
+#include "stdafx.h"
+
+
+OPENMPT_NAMESPACE_BEGIN
+
+
+#if MPT_COMPILER_MSVC
+
+#pragma comment(lib, "delayimp.lib")
+#pragma comment(lib, "version.lib")
+#pragma comment(lib, "rpcrt4.lib")
+#pragma comment(lib, "wininet.lib")
+#pragma comment(lib, "htmlhelp.lib")
+
+#pragma comment(lib, "dmoguids.lib")
+#pragma comment(lib, "strmiids.lib")
+
+#ifndef NO_DSOUND
+#pragma comment(lib, "dsound.lib")
+#endif
+#pragma comment(lib, "winmm.lib")
+
+#pragma comment(lib, "ksuser.lib")
+#if MPT_MSVC_BEFORE(2010,0) && defined(_M_X64)
+// VS2008 x64 SDK has no ksguid.lib. Work-around in include\portaudio\src\os\win\pa_win_wdmks_utils.c .
+#else
+#pragma comment(lib, "ksguid.lib")
+#endif
+
+#pragma comment(lib, "msacm32.lib")
+
+#endif // MPT_COMPILER_MSVC
+
+
+OPENMPT_NAMESPACE_END

Modified: trunk/OpenMPT/mptrack/mptrack_08.vcproj
===================================================================
--- trunk/OpenMPT/mptrack/mptrack_08.vcproj	2014-09-07 09:02:21 UTC (rev 4252)
+++ trunk/OpenMPT/mptrack/mptrack_08.vcproj	2014-09-07 09:04:11 UTC (rev 4253)
@@ -82,7 +82,6 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="winmm.lib strmiids.lib dmoguids.lib version.lib Rpcrt4.lib delayimp.lib dsound.lib msacm32.lib ksguid.lib ksuser.lib htmlhelp.lib"
 				Version="5.0"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -181,7 +180,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib strmiids.lib dmoguids.lib version.lib Rpcrt4.lib delayimp.lib dsound.lib msacm32.lib ksguid.lib ksuser.lib htmlhelp.lib"
 				Version="5.0"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -282,7 +280,6 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="winmm.lib strmiids.lib dmoguids.lib version.lib Rpcrt4.lib delayimp.lib wininet.lib dsound.lib msacm32.lib ksguid.lib ksuser.lib htmlhelp.lib"
 				Version="5.0"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -381,7 +378,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib strmiids.lib dmoguids.lib version.lib Rpcrt4.lib delayimp.lib wininet.lib dsound.lib msacm32.lib ksuser.lib htmlhelp.lib"
 				Version="5.0"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -680,6 +676,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\MPTrackLink.cpp"
+				>
+			</File>
+			<File
 				RelativePath=".\MPTrackUtil.cpp"
 				>
 			</File>

Modified: trunk/OpenMPT/mptrack/mptrack_10.vcxproj
===================================================================
--- trunk/OpenMPT/mptrack/mptrack_10.vcxproj	2014-09-07 09:02:21 UTC (rev 4252)
+++ trunk/OpenMPT/mptrack/mptrack_10.vcxproj	2014-09-07 09:04:11 UTC (rev 4253)
@@ -145,7 +145,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>winmm.lib;strmiids.lib;dmoguids.lib;version.lib;Rpcrt4.lib;delayimp.lib;dsound.lib;msacm32.lib;htmlhelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <Version>5.0</Version>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -196,7 +196,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>winmm.lib;strmiids.lib;dmoguids.lib;version.lib;Rpcrt4.lib;delayimp.lib;dsound.lib;msacm32.lib;htmlhelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <Version>5.0</Version>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -251,7 +251,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>winmm.lib;strmiids.lib;dmoguids.lib;version.lib;Rpcrt4.lib;delayimp.lib;wininet.lib;dsound.lib;msacm32.lib;htmlhelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <Version>5.0</Version>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -307,7 +307,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>winmm.lib;strmiids.lib;dmoguids.lib;version.lib;Rpcrt4.lib;delayimp.lib;wininet.lib;dsound.lib;msacm32.lib;htmlhelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <Version>5.0</Version>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -364,7 +364,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>winmm.lib;strmiids.lib;dmoguids.lib;version.lib;Rpcrt4.lib;delayimp.lib;wininet.lib;dsound.lib;msacm32.lib;htmlhelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <Version>5.0</Version>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -420,7 +420,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>winmm.lib;strmiids.lib;dmoguids.lib;version.lib;Rpcrt4.lib;delayimp.lib;wininet.lib;dsound.lib;msacm32.lib;htmlhelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <Version>5.0</Version>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -559,6 +559,7 @@
     <ClCompile Include="Mpdlgs.cpp" />
     <ClCompile Include="MPTHacks.cpp" />
     <ClCompile Include="Mptrack.cpp" />
+    <ClCompile Include="MPTrackLink.cpp" />
     <ClCompile Include="MPTrackUtil.cpp" />
     <ClCompile Include="Mpt_midi.cpp" />
     <ClCompile Include="PatternClipboard.cpp" />

Modified: trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters
===================================================================
--- trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters	2014-09-07 09:02:21 UTC (rev 4252)
+++ trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters	2014-09-07 09:04:11 UTC (rev 4253)
@@ -520,6 +520,9 @@
     <ClCompile Include="AppendModule.cpp">
       <Filter>Source Files\mptrack</Filter>
     </ClCompile>
+    <ClCompile Include="MPTrackLink.cpp">
+      <Filter>Source Files\mptrack</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\soundlib\Loaders.h">

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