mirror of https://github.com/odrling/Aegisub
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.
This commit is contained in:
parent
5286ae1eb3
commit
8e8f45c715
|
@ -44,8 +44,15 @@
|
||||||
#include "text_file_reader.h"
|
#include "text_file_reader.h"
|
||||||
#include "options.h"
|
#include "options.h"
|
||||||
#include "vfr.h"
|
#include "vfr.h"
|
||||||
|
|
||||||
|
#ifdef __WINDOWS__
|
||||||
#include "../lua51/src/lualib.h"
|
#include "../lua51/src/lualib.h"
|
||||||
#include "../lua51/src/lauxlib.h"
|
#include "../lua51/src/lauxlib.h"
|
||||||
|
#else
|
||||||
|
#include "lualib.h"
|
||||||
|
#include "lauxlib.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <wx/msgdlg.h>
|
#include <wx/msgdlg.h>
|
||||||
#include <wx/filename.h>
|
#include <wx/filename.h>
|
||||||
#include <wx/filefn.h>
|
#include <wx/filefn.h>
|
||||||
|
|
|
@ -41,8 +41,14 @@
|
||||||
#include "auto4_base.h"
|
#include "auto4_base.h"
|
||||||
#include <wx/thread.h>
|
#include <wx/thread.h>
|
||||||
#include <wx/event.h>
|
#include <wx/event.h>
|
||||||
|
|
||||||
|
#ifdef __WINDOWS__
|
||||||
#include "../lua51/src/lua.h"
|
#include "../lua51/src/lua.h"
|
||||||
#include "../lua51/src/lauxlib.h"
|
#include "../lua51/src/lauxlib.h"
|
||||||
|
#else
|
||||||
|
#include "lua.h"
|
||||||
|
#include "lauxlib.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
class wxWindow;
|
class wxWindow;
|
||||||
|
|
||||||
|
|
|
@ -40,8 +40,15 @@
|
||||||
#include "ass_style.h"
|
#include "ass_style.h"
|
||||||
#include "ass_file.h"
|
#include "ass_file.h"
|
||||||
#include "ass_override.h"
|
#include "ass_override.h"
|
||||||
|
|
||||||
|
#ifdef __WINDOWS__
|
||||||
#include "../lua51/src/lualib.h"
|
#include "../lua51/src/lualib.h"
|
||||||
#include "../lua51/src/lauxlib.h"
|
#include "../lua51/src/lauxlib.h"
|
||||||
|
#else
|
||||||
|
#include "lualib.h"
|
||||||
|
#include "lauxlib.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
|
||||||
|
|
|
@ -37,8 +37,15 @@
|
||||||
#ifdef WITH_AUTO4_LUA
|
#ifdef WITH_AUTO4_LUA
|
||||||
|
|
||||||
#include "auto4_lua.h"
|
#include "auto4_lua.h"
|
||||||
|
|
||||||
|
#ifdef __WINDOWS__
|
||||||
#include "../lua51/src/lualib.h"
|
#include "../lua51/src/lualib.h"
|
||||||
#include "../lua51/src/lauxlib.h"
|
#include "../lua51/src/lauxlib.h"
|
||||||
|
#else
|
||||||
|
#include "lualib.h"
|
||||||
|
#include "lauxlib.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "string_codec.h"
|
#include "string_codec.h"
|
||||||
#include "utils.h"
|
#include "utils.h"
|
||||||
#include <wx/window.h>
|
#include <wx/window.h>
|
||||||
|
|
|
@ -36,7 +36,11 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <wx/wxprec.h>
|
#include <wx/wxprec.h>
|
||||||
|
#ifdef __WINDOWS__
|
||||||
#include "../lua51/src/lua.h"
|
#include "../lua51/src/lua.h"
|
||||||
|
#else
|
||||||
|
#include "lua.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
namespace Automation4 {
|
namespace Automation4 {
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue