Fixed windows project.

Originally committed to SVN as r2766.
This commit is contained in:
Rodrigo Braz Monteiro 2009-03-14 20:52:01 +00:00
parent 01d522b344
commit 6106546f74
11 changed files with 22 additions and 22 deletions

View file

@ -46,7 +46,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="0"
AdditionalIncludeDirectories="../../../contrib/hunspell/src;../../src/msvc"
AdditionalIncludeDirectories="../../../contrib/hunspell/src;../../../aegisub/src/msvc"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
MinimalRebuild="true"
BasicRuntimeChecks="3"

View file

@ -51,8 +51,8 @@
#include "video_context.h"
#ifdef __WINDOWS__
#include "../lua51/src/lualib.h"
#include "../lua51/src/lauxlib.h"
#include "../../contrib/lua51/src/lualib.h"
#include "../../contrib/lua51/src/lauxlib.h"
#else
#include "lualib.h"
#include "lauxlib.h"

View file

@ -43,8 +43,8 @@
#include <wx/event.h>
#ifdef __WINDOWS__
#include "../lua51/src/lua.h"
#include "../lua51/src/lauxlib.h"
#include "../../contrib/lua51/src/lua.h"
#include "../../contrib/lua51/src/lauxlib.h"
#else
#include "lua.hpp"
#endif

View file

@ -44,8 +44,8 @@
#include "ass_override.h"
#ifdef __WINDOWS__
#include "../lua51/src/lualib.h"
#include "../lua51/src/lauxlib.h"
#include "../../contrib/lua51/src/lualib.h"
#include "../../contrib/lua51/src/lauxlib.h"
#else
#include "lualib.h"
#include "lauxlib.h"

View file

@ -41,8 +41,8 @@
#include "auto4_lua.h"
#ifdef __WINDOWS__
#include "../lua51/src/lualib.h"
#include "../lua51/src/lauxlib.h"
#include "../../contrib/lua51/src/lualib.h"
#include "../../contrib/lua51/src/lauxlib.h"
#else
#include "lualib.h"
#include "lauxlib.h"

View file

@ -37,7 +37,7 @@
#include <wx/wxprec.h>
#ifdef __WINDOWS__
#include "../lua51/src/lua.h"
#include "../../contrib/lua51/src/lua.h"
#else
#include "lua.hpp"
#endif

View file

@ -67,7 +67,7 @@
// Enable DirectSound audio player
// Requires: DirectX SDK
//#define WITH_DIRECTSOUND
#define WITH_DIRECTSOUND
// Enable Avisynth
@ -81,9 +81,9 @@
// Enable FreeType2 font lister for the fonts collector
// If you're on Visual Studio, also uncomment the library names and make sure they match the files that you have
// Requires: FreeType2
//#define WITH_FREETYPE2
//#define FT2_LIB_RELEASE "freetype235.lib"
//#define FT2_LIB_DEBUG "freetype235_D.lib"
#define WITH_FREETYPE2
#define FT2_LIB_RELEASE "freetype235.lib"
#define FT2_LIB_DEBUG "freetype235_D.lib"
// Enable CSRI, required for styles previews in the style editor and some video providers
@ -93,14 +93,14 @@
// Enable universal charset detector, so Aegisub can automatically detect the encoding of non-unicode subtitles
// Requires: universalcharset (in repository)
//#define WITH_UNIVCHARDET
#define WITH_UNIVCHARDET
// Enable Hunspell-based spellchecker
// Requires: hunspell (in repository for Win32)
// If you have an old version of Hunspell (that uses Hunspell::put_word() instead of Hunspell::add()),
// uncomment the second line as well.
//#define WITH_HUNSPELL
#define WITH_HUNSPELL
//#define WITH_OLD_HUNSPELL

View file

@ -46,7 +46,7 @@
#endif
#ifdef __WINDOWS__
#include "../csri/include/csri/csri.h"
#include "../../contrib/csri/include/csri/csri.h"
#else
#include "csri/csri.h"
#endif

View file

@ -44,7 +44,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="lib;lib/win32;include;../aegisub/msvc"
AdditionalIncludeDirectories="lib;lib/win32;include;../../aegisub/src/msvc"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@ -177,7 +177,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="lib;lib/win32;include;../aegisub/msvc"
AdditionalIncludeDirectories="lib;lib/win32;include;../../aegisub/src/msvc"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
RuntimeLibrary="2"
UsePrecompiledHeader="0"

View file

@ -37,7 +37,7 @@
#include <fstream>
#include <iostream>
#include "utils.h"
#include "../../aegisub/md5.h"
#include "../../../aegisub/src/md5.h"
bool AreFilesIdentical(std::string file1, std::string file2)

View file

@ -210,11 +210,11 @@
Name="Utils"
>
<File
RelativePath="..\aegisub\md5.c"
RelativePath="..\..\aegisub\src\md5.c"
>
</File>
<File
RelativePath="..\aegisub\md5.h"
RelativePath="..\..\aegisub\src\md5.h"
>
</File>
<File