From 8e8f45c7156a497b8cbf9e94feda58df14011128 Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Wed, 5 Mar 2008 04:10:20 +0000 Subject: [PATCH] Wrap LUA includes with __WINDOWS__, the Windows build uses rolled package that has support for unicode pathnames, UNIX does not require this support so system installs are used. Originally committed to SVN as r1900. --- aegisub/auto4_lua.cpp | 7 +++++++ aegisub/auto4_lua.h | 6 ++++++ aegisub/auto4_lua_assfile.cpp | 7 +++++++ aegisub/auto4_lua_dialog.cpp | 7 +++++++ aegisub/auto4_lua_scriptreader.h | 4 ++++ 5 files changed, 31 insertions(+) diff --git a/aegisub/auto4_lua.cpp b/aegisub/auto4_lua.cpp index 8a4b29e42..9111723c4 100644 --- a/aegisub/auto4_lua.cpp +++ b/aegisub/auto4_lua.cpp @@ -44,8 +44,15 @@ #include "text_file_reader.h" #include "options.h" #include "vfr.h" + +#ifdef __WINDOWS__ #include "../lua51/src/lualib.h" #include "../lua51/src/lauxlib.h" +#else +#include "lualib.h" +#include "lauxlib.h" +#endif + #include #include #include diff --git a/aegisub/auto4_lua.h b/aegisub/auto4_lua.h index d3da43f04..81b2b7b4b 100644 --- a/aegisub/auto4_lua.h +++ b/aegisub/auto4_lua.h @@ -41,8 +41,14 @@ #include "auto4_base.h" #include #include + +#ifdef __WINDOWS__ #include "../lua51/src/lua.h" #include "../lua51/src/lauxlib.h" +#else +#include "lua.h" +#include "lauxlib.h" +#endif class wxWindow; diff --git a/aegisub/auto4_lua_assfile.cpp b/aegisub/auto4_lua_assfile.cpp index 6702d499e..45ed8566c 100644 --- a/aegisub/auto4_lua_assfile.cpp +++ b/aegisub/auto4_lua_assfile.cpp @@ -40,8 +40,15 @@ #include "ass_style.h" #include "ass_file.h" #include "ass_override.h" + +#ifdef __WINDOWS__ #include "../lua51/src/lualib.h" #include "../lua51/src/lauxlib.h" +#else +#include "lualib.h" +#include "lauxlib.h" +#endif + #include #include diff --git a/aegisub/auto4_lua_dialog.cpp b/aegisub/auto4_lua_dialog.cpp index 2dece80dd..b9f395343 100644 --- a/aegisub/auto4_lua_dialog.cpp +++ b/aegisub/auto4_lua_dialog.cpp @@ -37,8 +37,15 @@ #ifdef WITH_AUTO4_LUA #include "auto4_lua.h" + +#ifdef __WINDOWS__ #include "../lua51/src/lualib.h" #include "../lua51/src/lauxlib.h" +#else +#include "lualib.h" +#include "lauxlib.h" +#endif + #include "string_codec.h" #include "utils.h" #include diff --git a/aegisub/auto4_lua_scriptreader.h b/aegisub/auto4_lua_scriptreader.h index 273f434bc..f798e1e19 100644 --- a/aegisub/auto4_lua_scriptreader.h +++ b/aegisub/auto4_lua_scriptreader.h @@ -36,7 +36,11 @@ #pragma once #include +#ifdef __WINDOWS__ #include "../lua51/src/lua.h" +#else +#include "lua.h" +#endif namespace Automation4 {