Move standard windows libraries from setup.cpp to the project. Updates #949.
Originally committed to SVN as r5927.
This commit is contained in:
parent
7e1ef51b8e
commit
371bda4f2b
4 changed files with 17 additions and 23 deletions
|
@ -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"
|
||||
|
|
14
aegisub/build/msbuild/Aegisub/standard-libraries.props
Normal file
14
aegisub/build/msbuild/Aegisub/standard-libraries.props
Normal file
|
@ -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>
|
|
@ -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>
|
||||
</Project>
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue