summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPriit Laes2012-02-23 13:49:07 +0200
committerPriit Laes2012-02-23 13:49:07 +0200
commit1299b0d4c635181cf82d65f83e06c4f8fca41568 (patch)
tree406936241c98c17d0b8f1b3c2bea615ddcc58d19
parent6696e7983825c07d530b7f7a53028140a4ef1a1e (diff)
downloaddfhack-1299b0d4c635181cf82d65f83e06c4f8fca41568.tar.gz
dfhack-1299b0d4c635181cf82d65f83e06c4f8fca41568.tar.bz2
dfhack-1299b0d4c635181cf82d65f83e06c4f8fca41568.tar.xz
Don't compile Lua on UNIX
-rw-r--r--CMakeLists.txt8
-rw-r--r--library/Core.cpp1
2 files changed, 5 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a5bf2d12..7ba939ac 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 4b58cf49..295e89fb 100644
--- a/library/Core.cpp
+++ b/library/Core.cpp
@@ -62,7 +62,6 @@ using namespace DFHack;
#include <stdlib.h>
#include <fstream>
#include "tinythread.h"
-#include <llex.h>
using namespace tthread;
using namespace df::enums;