From 1299b0d4c635181cf82d65f83e06c4f8fca41568 Mon Sep 17 00:00:00 2001 From: Priit Laes Date: Thu, 23 Feb 2012 13:49:07 +0200 Subject: [PATCH] Don't compile Lua on UNIX --- CMakeLists.txt | 8 +++++--- library/Core.cpp | 1 - 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a5bf2d129..7ba939ac8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -79,9 +79,11 @@ ENDIF() #add depends to include path INCLUDE_DIRECTORIES ( library/depends ) -# build the static lua for dfusion -INCLUDE_DIRECTORIES ( lua/include ) -add_subdirectory (lua) +IF(!UNIX) + # build the static lua for dfusion, win32 only + INCLUDE_DIRECTORIES ( lua/include ) + add_subdirectory (lua) +ENDIF() # build the lib itself IF(BUILD_LIBRARY) diff --git a/library/Core.cpp b/library/Core.cpp index 4b58cf49a..295e89fb0 100644 --- a/library/Core.cpp +++ b/library/Core.cpp @@ -62,7 +62,6 @@ using namespace DFHack; #include #include #include "tinythread.h" -#include using namespace tthread; using namespace df::enums;