mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Move standard windows libraries from setup.cpp to the project. Updates #949.

Browse source 
Originally committed to SVN as r5927.
This commit is contained in:
Thomas Goyne 2011-11-28 22:45:27 +00:00
parent 7e1ef51b8e
commit 371bda4f2b
4 changed files with 17 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
aegisub/build/aegisub_vs2008/compiler_options.vsprops
View file

@ -20,6 +20,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="Vfw32.lib comctl32.lib rpcrt4.lib winmm.lib advapi32.lib wsock32.lib opengl32.lib"
LinkIncremental="1" LinkIncremental="1"
GenerateManifest="true" GenerateManifest="true"
GenerateDebugInformation="true" GenerateDebugInformation="true"

14
aegisub/build/msbuild/Aegisub/standard-libraries.props Normal file
View 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>

3
aegisub/build/msbuild/aegisub.props
View file

@ -20,6 +20,7 @@
<ImportGroup Label="PropertySheets"> <ImportGroup Label="PropertySheets">
<Import Project="$(MSBuildThisFileDirectory)userconfig\*.props" /> <Import Project="$(MSBuildThisFileDirectory)userconfig\*.props" />
<Import Project="$(MSBuildThisFileDirectory)paths.props" /> <Import Project="$(MSBuildThisFileDirectory)paths.props" />
<Import Project="$(MSBuildThisFileDirectory)Aegisub\standard-libraries.props" />
<Import Project="$(MSBuildThisFileDirectory)standard-settings.props" /> <Import Project="$(MSBuildThisFileDirectory)standard-settings.props" />
<Import Project="$(MSBuildThisFileDirectory)standard-outdirs.props" /> <Import Project="$(MSBuildThisFileDirectory)standard-outdirs.props" />
<Import Project="$(MSBuildThisFileDirectory)wx.props" Condition="'$(AegisubUseWxWidgets)' == 'true'" /> <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 --> <!-- The standard targets need to go last for all paths to be proper -->
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</Project> </Project>

22
aegisub/src/setup.cpp
View file

@ -34,28 +34,8 @@
/// @ingroup main /// @ingroup main
/// ///
///////////
// Headers
#include "config.h" #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 // FFMpegSource
#ifdef WITH_FFMPEGSOURCE #ifdef WITH_FFMPEGSOURCE
@ -99,5 +79,3 @@
#ifdef WITH_LIBASS #ifdef WITH_LIBASS
#pragma comment(lib, "libass.lib") #pragma comment(lib, "libass.lib")
#endif #endif
#endif // VisualC