Fixed config for MSVC
Originally committed to SVN as r2622.
This commit is contained in:
parent
0763541848
commit
7b552282ff
4 changed files with 21 additions and 33 deletions
|
@ -1,4 +1,4 @@
|
||||||
#ifdef __WINDOWS__
|
#ifdef _WIN32
|
||||||
|
|
||||||
// Windows specific settings
|
// Windows specific settings
|
||||||
#include "config/config_windows.h"
|
#include "config/config_windows.h"
|
||||||
|
|
|
@ -52,17 +52,17 @@
|
||||||
|
|
||||||
// Enable Automation
|
// Enable Automation
|
||||||
// Requires: Nothing
|
// Requires: Nothing
|
||||||
//#define WITH_AUTOMATION
|
#define WITH_AUTOMATION
|
||||||
|
|
||||||
|
|
||||||
// Enable Automation 4 Lua
|
// Enable Automation 4 Lua
|
||||||
// Requires: Lua 5.1 (in repository)
|
// Requires: Lua 5.1 (in repository)
|
||||||
//#define WITH_AUTO4_LUA
|
#define WITH_AUTO4_LUA
|
||||||
|
|
||||||
|
|
||||||
// Enable Automation 3
|
// Enable Automation 3
|
||||||
// Requires: auto3 dll (in repository), Lua (in repository)
|
// Requires: auto3 dll (in repository), Lua (in repository)
|
||||||
//#define WITH_AUTO3
|
#define WITH_AUTO3
|
||||||
|
|
||||||
|
|
||||||
// Enable DirectSound audio player
|
// Enable DirectSound audio player
|
||||||
|
@ -72,7 +72,7 @@
|
||||||
|
|
||||||
// Enable Avisynth
|
// Enable Avisynth
|
||||||
// Requires: nothing (just the avisynth dlls)
|
// Requires: nothing (just the avisynth dlls)
|
||||||
//#define WITH_AVISYNTH
|
#define WITH_AVISYNTH
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -88,7 +88,7 @@
|
||||||
|
|
||||||
// Enable CSRI, required for styles previews in the style editor and some video providers
|
// Enable CSRI, required for styles previews in the style editor and some video providers
|
||||||
// Requires: csri (in repository)
|
// Requires: csri (in repository)
|
||||||
//#define WITH_CSRI
|
#define WITH_CSRI
|
||||||
|
|
||||||
|
|
||||||
// Enable universal charset detector, so Aegisub can automatically detect the encoding of non-unicode subtitles
|
// Enable universal charset detector, so Aegisub can automatically detect the encoding of non-unicode subtitles
|
||||||
|
@ -144,7 +144,7 @@
|
||||||
|
|
||||||
// Enable ffmpegsource video and audio providers
|
// Enable ffmpegsource video and audio providers
|
||||||
// Requires: ffmpegsource version 2
|
// Requires: ffmpegsource version 2
|
||||||
#define WITH_FFMPEGSOURCE
|
//#define WITH_FFMPEGSOURCE
|
||||||
|
|
||||||
|
|
||||||
// Enable Ruby support for Automation
|
// Enable Ruby support for Automation
|
||||||
|
|
|
@ -1939,31 +1939,19 @@
|
||||||
<Filter
|
<Filter
|
||||||
Name="Config"
|
Name="Config"
|
||||||
>
|
>
|
||||||
<Filter
|
|
||||||
Name="win32"
|
|
||||||
>
|
|
||||||
<File
|
<File
|
||||||
RelativePath="..\..\aegisub\win32\config.h"
|
RelativePath="..\..\aegisub\config\config_unix.h"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\..\aegisub\win32\config0.h"
|
RelativePath="..\..\aegisub\config\config_windows.h"
|
||||||
>
|
|
||||||
</File>
|
|
||||||
</Filter>
|
|
||||||
<Filter
|
|
||||||
Name="win64"
|
|
||||||
>
|
|
||||||
<File
|
|
||||||
RelativePath="..\..\aegisub\win64\config.h"
|
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\..\aegisub\win64\config0.h"
|
RelativePath="..\..\aegisub\config\config_windows0.h"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
</Filter>
|
</Filter>
|
||||||
</Filter>
|
|
||||||
<Filter
|
<Filter
|
||||||
Name="Include"
|
Name="Include"
|
||||||
>
|
>
|
||||||
|
|
|
@ -44,14 +44,14 @@
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCCLCompilerTool"
|
Name="VCCLCompilerTool"
|
||||||
Optimization="0"
|
Optimization="0"
|
||||||
AdditionalIncludeDirectories="lib;lib/win32;include;../aegisub/win32"
|
AdditionalIncludeDirectories="lib;lib/win32;include;../aegisub/msvc"
|
||||||
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
|
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
|
||||||
MinimalRebuild="true"
|
MinimalRebuild="true"
|
||||||
BasicRuntimeChecks="3"
|
BasicRuntimeChecks="3"
|
||||||
RuntimeLibrary="3"
|
RuntimeLibrary="3"
|
||||||
UsePrecompiledHeader="0"
|
UsePrecompiledHeader="0"
|
||||||
WarningLevel="3"
|
WarningLevel="3"
|
||||||
Detect64BitPortabilityProblems="true"
|
Detect64BitPortabilityProblems="false"
|
||||||
DebugInformationFormat="4"
|
DebugInformationFormat="4"
|
||||||
CompileAs="1"
|
CompileAs="1"
|
||||||
DisableSpecificWarnings="4996"
|
DisableSpecificWarnings="4996"
|
||||||
|
@ -177,12 +177,12 @@
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCCLCompilerTool"
|
Name="VCCLCompilerTool"
|
||||||
AdditionalIncludeDirectories="lib;lib/win32;include;../aegisub/win32"
|
AdditionalIncludeDirectories="lib;lib/win32;include;../aegisub/msvc"
|
||||||
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
|
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
|
||||||
RuntimeLibrary="2"
|
RuntimeLibrary="2"
|
||||||
UsePrecompiledHeader="0"
|
UsePrecompiledHeader="0"
|
||||||
WarningLevel="3"
|
WarningLevel="3"
|
||||||
Detect64BitPortabilityProblems="true"
|
Detect64BitPortabilityProblems="false"
|
||||||
DebugInformationFormat="3"
|
DebugInformationFormat="3"
|
||||||
DisableSpecificWarnings="4996"
|
DisableSpecificWarnings="4996"
|
||||||
/>
|
/>
|
||||||
|
|
Loading…
Reference in a new issue