From 6106546f74e4a7fd34c845a25d025817a81ffc3d Mon Sep 17 00:00:00 2001 From: Rodrigo Braz Monteiro Date: Sat, 14 Mar 2009 20:52:01 +0000 Subject: [PATCH] Fixed windows project. Originally committed to SVN as r2766. --- aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj | 2 +- aegisub/src/auto4_lua.cpp | 4 ++-- aegisub/src/auto4_lua.h | 4 ++-- aegisub/src/auto4_lua_assfile.cpp | 4 ++-- aegisub/src/auto4_lua_dialog.cpp | 4 ++-- aegisub/src/auto4_lua_scriptreader.h | 2 +- aegisub/src/config/config_windows0.h | 12 ++++++------ aegisub/src/subtitles_provider_csri.h | 2 +- contrib/csri/csri_2008.vcproj | 4 ++-- devel/unit_test/src/utils.cpp | 2 +- devel/unit_test/unit_test.vcproj | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj b/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj index 5ccee3d70..4ee6b7298 100644 --- a/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj +++ b/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj @@ -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" diff --git a/aegisub/src/auto4_lua.cpp b/aegisub/src/auto4_lua.cpp index 367bb799f..67519aad1 100644 --- a/aegisub/src/auto4_lua.cpp +++ b/aegisub/src/auto4_lua.cpp @@ -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" diff --git a/aegisub/src/auto4_lua.h b/aegisub/src/auto4_lua.h index 3c0dadc62..742f13606 100644 --- a/aegisub/src/auto4_lua.h +++ b/aegisub/src/auto4_lua.h @@ -43,8 +43,8 @@ #include #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 diff --git a/aegisub/src/auto4_lua_assfile.cpp b/aegisub/src/auto4_lua_assfile.cpp index 22c56fc50..0afdbba3c 100644 --- a/aegisub/src/auto4_lua_assfile.cpp +++ b/aegisub/src/auto4_lua_assfile.cpp @@ -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" diff --git a/aegisub/src/auto4_lua_dialog.cpp b/aegisub/src/auto4_lua_dialog.cpp index 18c4bf0aa..f974e7f9e 100644 --- a/aegisub/src/auto4_lua_dialog.cpp +++ b/aegisub/src/auto4_lua_dialog.cpp @@ -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" diff --git a/aegisub/src/auto4_lua_scriptreader.h b/aegisub/src/auto4_lua_scriptreader.h index fbb0c0382..cd3e7259a 100644 --- a/aegisub/src/auto4_lua_scriptreader.h +++ b/aegisub/src/auto4_lua_scriptreader.h @@ -37,7 +37,7 @@ #include #ifdef __WINDOWS__ -#include "../lua51/src/lua.h" +#include "../../contrib/lua51/src/lua.h" #else #include "lua.hpp" #endif diff --git a/aegisub/src/config/config_windows0.h b/aegisub/src/config/config_windows0.h index df9830f04..fb740df39 100644 --- a/aegisub/src/config/config_windows0.h +++ b/aegisub/src/config/config_windows0.h @@ -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 diff --git a/aegisub/src/subtitles_provider_csri.h b/aegisub/src/subtitles_provider_csri.h index a0b899f20..ce0f87b72 100644 --- a/aegisub/src/subtitles_provider_csri.h +++ b/aegisub/src/subtitles_provider_csri.h @@ -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 diff --git a/contrib/csri/csri_2008.vcproj b/contrib/csri/csri_2008.vcproj index 5faeffc0a..09c649f20 100644 --- a/contrib/csri/csri_2008.vcproj +++ b/contrib/csri/csri_2008.vcproj @@ -44,7 +44,7 @@ #include #include "utils.h" -#include "../../aegisub/md5.h" +#include "../../../aegisub/src/md5.h" bool AreFilesIdentical(std::string file1, std::string file2) diff --git a/devel/unit_test/unit_test.vcproj b/devel/unit_test/unit_test.vcproj index 5cfd0ab7a..17f7a6194 100644 --- a/devel/unit_test/unit_test.vcproj +++ b/devel/unit_test/unit_test.vcproj @@ -210,11 +210,11 @@ Name="Utils" >