mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Add wx paths to the config properties

Browse source
This commit is contained in:
Thomas Goyne 2012-11-01 14:35:35 -07:00
parent 83597e1a68
commit 735d687ec5
3 changed files with 70 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
aegisub/build/Aegisub/Aegisub.DefaultConfiguration.props
View file

@ -53,6 +53,10 @@
<AegisubUseUpdateChecker>true</AegisubUseUpdateChecker> <AegisubUseUpdateChecker>true</AegisubUseUpdateChecker>
<UpdateCheckerServer>updates.aegisub.org</UpdateCheckerServer> <UpdateCheckerServer>updates.aegisub.org</UpdateCheckerServer>
<UpdateCheckerURL>/trunk</UpdateCheckerURL> <UpdateCheckerURL>/trunk</UpdateCheckerURL>
<WxBasePath>$(AegisubSourceBase)wxlib</WxBasePath>
<WxLibraryPath Condition="'$(Platform)'=='Win32'">$(WxBasePath)\lib32</WxLibraryPath>
<WxLibraryPath Condition="'$(Platform)'=='x64'">$(WxBasePath)\lib64</WxLibraryPath>
<WxIncludePath>$(WxBasePath)\include</WxIncludePath>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

22
aegisub/build/Aegisub/Aegisub.xml
View file

@ -45,6 +45,28 @@
<Category Name="Paths" DisplayName="Library paths" Description="Configure third-party library paths" /> <Category Name="Paths" DisplayName="Library paths" Description="Configure third-party library paths" />
</Rule.Categories> </Rule.Categories>
<StringProperty
Subtype="folder"
Name="WxBasePath"
Category="Paths"
DisplayName="wxWidgets root"
Description="Root directory of the wxWidgets installation to use"
/>
<StringProperty
Subtype="folder"
Name="WxLibraryPath"
Category="Paths"
DisplayName="wxWidgets library path"
Description="Location of compiled wxWidgets library files"
/>
<StringProperty
Subtype="folder"
Name="WxIncludePath"
Category="Paths"
DisplayName="wxWidgets include path"
Description="Location of wxWidgets header files"
/>
<BoolProperty <BoolProperty
Name="AegisubUseDSound" Name="AegisubUseDSound"
Category="Features" Category="Features"

24
aegisub/build/wx.props
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<_PropertySheetDisplayName>wxWidgets support</_PropertySheetDisplayName> <_PropertySheetDisplayName>wxWidgets support</_PropertySheetDisplayName>
@ -10,15 +10,25 @@
<WxLibDbgSuffix Condition="'$(Configuration)'=='Release'"></WxLibDbgSuffix> <WxLibDbgSuffix Condition="'$(Configuration)'=='Release'"></WxLibDbgSuffix>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup>
<!-- Tell the compiler where to search for wx headers and libraries --> <!-- Tell the compiler where to search for wx headers and libraries -->
<PropertyGroup> <ClCompile>
<IncludePath>$(WxLibraryPath)\mswu$(WxLibDbgSuffix)\;$(WxIncludePath);$(IncludePath)</IncludePath> <AdditionalIncludeDirectories>
<LibraryPath>$(WxLibraryPath);$(LibraryPath)</LibraryPath> $(WxLibraryPath)\mswu$(WxLibDbgSuffix);
</PropertyGroup> $(WxIncludePath);
%(AdditionalIncludeDirectories)
</AdditionalIncludeDirectories>
</ClCompile>
<ResourceCompile>
<AdditionalIncludeDirectories>$(WxIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalLibraryDirectories>
$(WxLibraryPath);
%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<!-- Tell the linker to use the appropriate wx libraries --> <!-- Tell the linker to use the appropriate wx libraries -->
<ItemDefinitionGroup>
<Link>
<AdditionalDependencies> <AdditionalDependencies>
wxbase29u$(WxLibDbgSuffix).lib; wxbase29u$(WxLibDbgSuffix).lib;
wxbase29u$(WxLibDbgSuffix)_net.lib; wxbase29u$(WxLibDbgSuffix)_net.lib;