Fix lua. It had bad linkage with the c++ wrapper.

develop
Petr Mrázek 2011-08-14 00:09:59 +02:00
parent 9ecbaecc13
commit 42e06c6330
2 changed files with 20 additions and 20 deletions

@ -16,34 +16,34 @@ ENDIF()
# Build Libraries # Build Libraries
SET (SRC_LIBLUA SET (SRC_LIBLUA
src/lapi.c src/lapi.c
src/lauxlib.c
src/lbaselib.c
src/lcode.c src/lcode.c
src/ldblib.c
src/ldebug.c src/ldebug.c
src/ldo.c src/ldo.c
src/ldump.c src/ldump.c
src/lfunc.c src/lfunc.c
src/lgc.c src/lgc.c
src/linit.c
src/liolib.c
src/llex.c src/llex.c
src/lmathlib.c
src/lmem.c src/lmem.c
src/loadlib.c
src/lobject.c src/lobject.c
src/lopcodes.c src/lopcodes.c
src/loslib.c
src/lparser.c src/lparser.c
src/lstate.c src/lstate.c
src/lstring.c src/lstring.c
src/lstrlib.c
src/ltable.c src/ltable.c
src/ltablib.c
src/ltm.c src/ltm.c
src/lundump.c src/lundump.c
src/lvm.c src/lvm.c
src/lzio.c src/lzio.c
src/lauxlib.c
src/lbaselib.c
src/ldblib.c
src/liolib.c
src/lmathlib.c
src/loslib.c
src/ltablib.c
src/lstrlib.c
src/loadlib.c
src/linit.c
) )
ADD_LIBRARY ( lua ${SRC_LIBLUA} ) ADD_LIBRARY ( lua ${SRC_LIBLUA} )

@ -152,17 +152,17 @@
** LUA_BUILD_AS_DLL to get it). ** LUA_BUILD_AS_DLL to get it).
*/ */
#if defined(LUA_BUILD_AS_DLL) #if defined(LUA_BUILD_AS_DLL)
#if defined(LUA_CORE) || defined(LUA_LIB)
#if defined(LUA_CORE) || defined(LUA_LIB) #define LUA_API __declspec(dllexport)
#define LUA_API __declspec(dllexport) #else
#else #define LUA_API __declspec(dllimport)
#define LUA_API __declspec(dllimport) #endif
#endif
#else #else
#ifdef __cplusplus
#define LUA_API extern #define LUA_API extern "C"
#else
#define LUA_API extern
#endif
#endif #endif
/* more often than not the libs go together with the core */ /* more often than not the libs go together with the core */