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

Unconditionally enable Lua and Hunspell

Browse source
This commit is contained in:
Thomas Goyne 2012-11-01 08:20:11 -07:00
parent 71af4127ce
commit b2a5fe406c
3 changed files with 3 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -37,7 +37,6 @@
<PropertyGroup> <PropertyGroup>
<AegisubUseConfigWindowsH Condition="'$(AegisubUseConfigWindowsH)'==''">true</AegisubUseConfigWindowsH> <AegisubUseConfigWindowsH Condition="'$(AegisubUseConfigWindowsH)'==''">true</AegisubUseConfigWindowsH>
<AegisubUseAutomationLua Condition="'$(AegisubUseAutomationLua)'==''">true</AegisubUseAutomationLua>
<AegisubUseDSound Condition="'$(AegisubUseDSound)'==''">true</AegisubUseDSound> <AegisubUseDSound Condition="'$(AegisubUseDSound)'==''">true</AegisubUseDSound>
<DirectXSDKPath Condition="'$(DirectXSDKPath)'==''">$(DXSDK_DIR)</DirectXSDKPath> <DirectXSDKPath Condition="'$(DirectXSDKPath)'==''">$(DXSDK_DIR)</DirectXSDKPath>
<AegisubUseAvisynth Condition="'$(AegisubUseAvisynth)|$(Platform)'=='|Win32'">true</AegisubUseAvisynth> <AegisubUseAvisynth Condition="'$(AegisubUseAvisynth)|$(Platform)'=='|Win32'">true</AegisubUseAvisynth>
@ -47,7 +46,6 @@
<FFmpegSourceLibraryPath Condition="'$(FFmpegSourceLibraryPath)'==''">$(AegisubSourceBase)libffms\lib\</FFmpegSourceLibraryPath> <FFmpegSourceLibraryPath Condition="'$(FFmpegSourceLibraryPath)'==''">$(AegisubSourceBase)libffms\lib\</FFmpegSourceLibraryPath>
<FFmpegSourceLibraryName Condition="'$(FFmpegSourceLibraryName)'==''">ffms2.lib</FFmpegSourceLibraryName> <FFmpegSourceLibraryName Condition="'$(FFmpegSourceLibraryName)'==''">ffms2.lib</FFmpegSourceLibraryName>
<AegisubUseFt2 Condition="'$(AegisubUseFt2)'==''">true</AegisubUseFt2> <AegisubUseFt2 Condition="'$(AegisubUseFt2)'==''">true</AegisubUseFt2>
<AegisubUseHunspell Condition="'$(AegisubUseHunspell)'==''">true</AegisubUseHunspell>
<AegisubUseFftw Condition="'$(AegisubUseFftw)'==''">false</AegisubUseFftw> <AegisubUseFftw Condition="'$(AegisubUseFftw)'==''">false</AegisubUseFftw>
<AegisubUseLibass Condition="'$(AegisubUseLibass)'==''">false</AegisubUseLibass> <AegisubUseLibass Condition="'$(AegisubUseLibass)'==''">false</AegisubUseLibass>
<AegisubUseCsri Condition="'$(AegisubUseCsri)'==''">HelperLibrary</AegisubUseCsri> <AegisubUseCsri Condition="'$(AegisubUseCsri)'==''">HelperLibrary</AegisubUseCsri>
@ -55,4 +53,4 @@
<AegisubSpecialBuild Condition="'$(AegisubSpecialBuild)'==''">false</AegisubSpecialBuild> <AegisubSpecialBuild Condition="'$(AegisubSpecialBuild)'==''">false</AegisubSpecialBuild>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

4
aegisub/build/Aegisub/Aegisub.targets
View file

@ -132,7 +132,7 @@
</ItemGroup> </ItemGroup>
<!-- Automation Lua support --> <!-- Automation Lua support -->
<ItemDefinitionGroup Condition="'$(AegisubUseAutomationLua)'=='true'"> <ItemDefinitionGroup>
<ClCompile> <ClCompile>
<PreprocessorDefinitions Condition="'$(AegisubUseConfigWindowsH)'=='false'">WITH_AUTO4_LUA;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="'$(AegisubUseConfigWindowsH)'=='false'">WITH_AUTO4_LUA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(AegisubContribBase)lua51\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(AegisubContribBase)lua51\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@ -140,7 +140,7 @@
</ItemDefinitionGroup> </ItemDefinitionGroup>
<!-- Hunspell support --> <!-- Hunspell support -->
<ItemDefinitionGroup Condition="'$(AegisubUseHunspell)'=='true'"> <ItemDefinitionGroup>
<ClCompile> <ClCompile>
<PreprocessorDefinitions Condition="'$(AegisubUseConfigWindowsH)'=='false'">WITH_HUNSPELL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="'$(AegisubUseConfigWindowsH)'=='false'">WITH_HUNSPELL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(AegisubContribBase)hunspell\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(AegisubContribBase)hunspell\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

@ -54,13 +54,6 @@
Description="Specify whether to use config_windows.h or the configuration on this page to control features. The settings on this page still control automatic compiler and link settings for the features." Description="Specify whether to use config_windows.h or the configuration on this page to control features. The settings on this page still control automatic compiler and link settings for the features."
/> />
<BoolProperty
Name="AegisubUseAutomationLua"
Category="Features"
DisplayName="Use Automation 4 Lua"
Description="Specify whether to include Automation 4 support and the Lua engine. This is included and requires no configuration."
/>
<BoolProperty <BoolProperty
Name="AegisubUseDSound" Name="AegisubUseDSound"
Category="Features" Category="Features"
@ -154,13 +147,6 @@
</StringProperty.DataSource> </StringProperty.DataSource>
</StringProperty> </StringProperty>
<BoolProperty
Name="AegisubUseHunspell"
Category="Features"
DisplayName="Use Hunspell"
Description="Specify whether to use the Hunspell spell checker library. This is included and requires no configuration."
/>
<BoolProperty <BoolProperty
Name="AegisubUseFftw" Name="AegisubUseFftw"
Category="Features" Category="Features"