From 371bda4f2bf458497b1a2e10163bdcf80f74c017 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Mon, 28 Nov 2011 22:45:27 +0000
Subject: [PATCH] Move standard windows libraries from setup.cpp to the
 project. Updates #949.

Originally committed to SVN as r5927.
---
 .../aegisub_vs2008/compiler_options.vsprops   |  1 +
 .../msbuild/Aegisub/standard-libraries.props  | 14 ++++++++++++
 aegisub/build/msbuild/aegisub.props           |  3 ++-
 aegisub/src/setup.cpp                         | 22 -------------------
 4 files changed, 17 insertions(+), 23 deletions(-)
 create mode 100644 aegisub/build/msbuild/Aegisub/standard-libraries.props

diff --git a/aegisub/build/aegisub_vs2008/compiler_options.vsprops b/aegisub/build/aegisub_vs2008/compiler_options.vsprops
index 54e00f515..e990d79a5 100644
--- a/aegisub/build/aegisub_vs2008/compiler_options.vsprops
+++ b/aegisub/build/aegisub_vs2008/compiler_options.vsprops
@@ -20,6 +20,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
+		AdditionalDependencies="Vfw32.lib comctl32.lib rpcrt4.lib winmm.lib advapi32.lib wsock32.lib opengl32.lib"
 		LinkIncremental="1"
 		GenerateManifest="true"
 		GenerateDebugInformation="true"
diff --git a/aegisub/build/msbuild/Aegisub/standard-libraries.props b/aegisub/build/msbuild/Aegisub/standard-libraries.props
new file mode 100644
index 000000000..475d22c47
--- /dev/null
+++ b/aegisub/build/msbuild/Aegisub/standard-libraries.props
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_PropertySheetDisplayName>Standard Libraries</_PropertySheetDisplayName>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <Link>
+      <AdditionalDependencies>Vfw32.lib;comctl32.lib;rpcrt4.lib;winmm.lib;advapi32.lib;wsock32.lib;opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>
\ No newline at end of file
diff --git a/aegisub/build/msbuild/aegisub.props b/aegisub/build/msbuild/aegisub.props
index ef9d2ffb5..bfd104628 100644
--- a/aegisub/build/msbuild/aegisub.props
+++ b/aegisub/build/msbuild/aegisub.props
@@ -20,6 +20,7 @@
 	<ImportGroup Label="PropertySheets">
 		<Import Project="$(MSBuildThisFileDirectory)userconfig\*.props" />
 		<Import Project="$(MSBuildThisFileDirectory)paths.props" />
+		<Import Project="$(MSBuildThisFileDirectory)Aegisub\standard-libraries.props" />
 		<Import Project="$(MSBuildThisFileDirectory)standard-settings.props" />
 		<Import Project="$(MSBuildThisFileDirectory)standard-outdirs.props" />
 		<Import Project="$(MSBuildThisFileDirectory)wx.props" Condition="'$(AegisubUseWxWidgets)' == 'true'" />
@@ -27,4 +28,4 @@
 
 	<!-- The standard targets need to go last for all paths to be proper -->
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/aegisub/src/setup.cpp b/aegisub/src/setup.cpp
index d44bfba95..1a9285545 100644
--- a/aegisub/src/setup.cpp
+++ b/aegisub/src/setup.cpp
@@ -34,28 +34,8 @@
 /// @ingroup main
 ///
 
-
-///////////
-// Headers
 #include "config.h"
 
-
-//////////////////////////////////
-///////// MSVC Libraries /////////
-//////////////////////////////////
-#if __VISUALC__ >= 1200
-
-////////////////////////////
-// Standard Win32 Libraries
-#pragma comment(lib, "Vfw32.lib")
-#pragma comment(lib, "comctl32.lib")
-#pragma comment(lib, "rpcrt4.lib")
-#pragma comment(lib, "winmm.lib")
-#pragma comment(lib, "advapi32.lib")
-#pragma comment(lib, "wsock32.lib")
-#pragma comment(lib, "opengl32.lib")
-
-
 ////////////////
 // FFMpegSource
 #ifdef WITH_FFMPEGSOURCE
@@ -99,5 +79,3 @@
 #ifdef WITH_LIBASS
 #pragma comment(lib, "libass.lib")
 #endif
-
-#endif // VisualC