iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix auto3 support. 

Originally committed to SVN as r1911.
This commit is contained in:
Amar Takhar 2008-03-05 21:03:05 +00:00
parent 22a0dca696
commit 454b0101d7
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
auto3/auto3.h
View File

@ -37,9 +37,17 @@
#include <stdlib.h> #include <stdlib.h>
#ifdef AUTO3LIB #ifdef AUTO3LIB
#ifdef __WINDOWS__
#include "lua/include/lua.h" #include "lua/include/lua.h"
#include "lua/include/lualib.h" #include "lua/include/lualib.h"
#include "lua/include/lauxlib.h" #include "lua/include/lauxlib.h"
#else
#include "lua.h"
#include "lualib.h"
#include "lauxlib.h"
#endif
#endif #endif

6
configure.in
View File

@ -435,12 +435,12 @@ AC_ARG_WITH(lua50-include,
if ! test -z "$lua50_lib_dir" && ! test -z "$lua50_include_dir"; then if ! test -z "$lua50_lib_dir" && ! test -z "$lua50_include_dir"; then
aegisub_save_LDFLAGS="$LDFLAGS" aegisub_save_LDFLAGS="$LDFLAGS"
LDFLAGS="-L$lua50_lib_dir" LDFLAGS="$lua50_lib_dir -llua"
AC_CHECK_LIB([lua], [lua_call],[LUA50_LDFLAGS="$lua50_lib_dir -llua"; lua50_lib="yes"], [lua50_lib="no"]) AC_CHECK_LIB([lualib], [luaopen_base], [LUA50_LDFLAGS="$lua50_lib_dir -llua -llualib"; lua50_lib="yes"], [lua50_lib="no"])
LDFLAGS="$aegisub_save_LDFLAGS" LDFLAGS="$aegisub_save_LDFLAGS"
aegisub_save_CPPFLAGS="$CPPFLAGS" aegisub_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="-I$lua50_include_dir" CPPFLAGS="$lua50_include_dir"
AC_CHECK_HEADER([lua.h],[LUA50_CPPFLAGS="$lua50_include_dir"; lua50_include="yes"],[lua50_include="no"]) AC_CHECK_HEADER([lua.h],[LUA50_CPPFLAGS="$lua50_include_dir"; lua50_include="yes"],[lua50_include="no"])
CPPFLAGS="$aegisub_save_CPPFLAGS" CPPFLAGS="$aegisub_save_CPPFLAGS"
fi fi