summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorJonas Ask2009-10-27 15:55:28 +0000
committerJonas Ask2009-10-27 15:55:28 +0000
commit3f69d59282b93bcac0d4244f7ba8a344dc8fe4ed (patch)
tree1e0b1120665120ca91a124e4a4eaf0dfcb40ac5a /CMakeLists.txt
parent88874e9accf452265120fb6fda2e843ccc8954d1 (diff)
downloadstonesense-3f69d59282b93bcac0d4244f7ba8a344dc8fe4ed.tar.gz
stonesense-3f69d59282b93bcac0d4244f7ba8a344dc8fe4ed.tar.bz2
stonesense-3f69d59282b93bcac0d4244f7ba8a344dc8fe4ed.tar.xz
Applied Jim Hester's patch to CMakeLists.txt.
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 54ed9d2..6b99c61 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,6 +18,7 @@ ENDIF(NOT DEFINED CMAKE_BUILD_TYPE)
SET( EXECUTABLE_OUTPUT_PATH ${stonesense_SOURCE_DIR} CACHE PATH "Output directory for stonesense, default is root" )
include_directories (
+ ${include_directories}
${CMAKE_SOURCE_DIR}/dfhack/library/
${CMAKE_SOURCE_DIR}/dfhack/library/md5/
${CMAKE_SOURCE_DIR}/dfhack/library/tinyxml
@@ -64,9 +65,10 @@ SET(PROJECT_SRCS
)
#linux
IF(UNIX)
+ LINK_DIRECTORIES(${LINK_DIRECTORIES})
add_definitions(-DLINUX_BUILD)
add_definitions(-DBUILD_DFHACK_LIB)
- SET(PROJECT_LIBS alleg-4.2.2 png)
+ SET(PROJECT_LIBS alleg-4.2.2 png ${PROJECT_LIBS})
ADD_EXECUTABLE(stonesense ${PROJECT_SRCS})
TARGET_LINK_LIBRARIES(stonesense ${PROJECT_LIBS})
# windows