From b80ff4be9bdbaa6c0c61621aa5aed30715b9109e Mon Sep 17 00:00:00 2001 From: Benoit Germain Date: Wed, 23 Apr 2014 11:35:32 +0200 Subject: Fix build issues with compat.c/h --- CMakeLists.txt | 2 +- src/Makefile | 2 +- src/compat.h | 4 ++++ src/keeper.c | 5 +---- src/lanes.c | 3 --- src/threading.c | 1 - src/tools.c | 4 +--- 7 files changed, 8 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 99686d7..b6ac9e5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,7 +38,7 @@ ENDIF(CYGWIN) # Build INCLUDE_DIRECTORIES(src) -ADD_LIBRARY(lua51-lanes MODULE src/lanes.c src/threading.c src/tools.c src/keeper.c) +ADD_LIBRARY(lua51-lanes MODULE src/lanes.c src/threading.c src/tools.c src/keeper.c src/compat.c) IF(UNIX AND NOT CYGWIN) SET(LIBS pthread) diff --git a/src/Makefile b/src/Makefile index b50c10d..e8f0eab 100644 --- a/src/Makefile +++ b/src/Makefile @@ -7,7 +7,7 @@ MODULE=lanes -SRC=lanes.c threading.c tools.c keeper.c +SRC=lanes.c compat.c threading.c tools.c keeper.c OBJ=$(SRC:.c=.o) diff --git a/src/compat.h b/src/compat.h index a5801c4..496986b 100644 --- a/src/compat.h +++ b/src/compat.h @@ -1,6 +1,10 @@ #if !defined( __COMPAT_H__) #define __COMPAT_H__ 1 +#include "lua.h" +#include "lualib.h" +#include "lauxlib.h" + // code is now using Lua 5.2 API // add Lua 5.2 API when building for Lua 5.1 #if LUA_VERSION_NUM == 501 diff --git a/src/keeper.c b/src/keeper.c index 63ae7ff..8bece77 100644 --- a/src/keeper.c +++ b/src/keeper.c @@ -43,11 +43,8 @@ #include #include -#include "lua.h" -#include "lualib.h" -#include "lauxlib.h" - #include "threading.h" +#include "compat.h" #include "tools.h" #include "keeper.h" diff --git a/src/lanes.c b/src/lanes.c index 5f2f492..61344f5 100644 --- a/src/lanes.c +++ b/src/lanes.c @@ -86,9 +86,6 @@ THE SOFTWARE. #include #include -#include "lua.h" -#include "lauxlib.h" - #include "threading.h" #include "compat.h" #include "tools.h" diff --git a/src/threading.c b/src/threading.c index 3e181ba..7898d1b 100644 --- a/src/threading.c +++ b/src/threading.c @@ -41,7 +41,6 @@ THE SOFTWARE. #include #include "threading.h" -#include "lua.h" #if !defined( PLATFORM_XBOX) && !defined( PLATFORM_WIN32) && !defined( PLATFORM_POCKETPC) # include diff --git a/src/tools.c b/src/tools.c index d2b316b..becf31e 100644 --- a/src/tools.c +++ b/src/tools.c @@ -31,13 +31,11 @@ THE SOFTWARE. =============================================================================== */ +#include "compat.h" #include "tools.h" #include "keeper.h" #include "lanes.h" -#include "lualib.h" -#include "lauxlib.h" - #include #include #include -- cgit v1.2.3-55-g6feb