Skip to content
Extraits de code Groupes Projets
Valider 454b0101 rédigé par Amar Takhar's avatar Amar Takhar
Parcourir les fichiers

Fix auto3 support.

Originally committed to SVN as r1911.
parent 22a0dca6
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -37,9 +37,17 @@ ...@@ -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
......
...@@ -435,12 +435,12 @@ AC_ARG_WITH(lua50-include, ...@@ -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
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter