summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorJapa2010-07-20 02:48:30 +0000
committerJapa2010-07-20 02:48:30 +0000
commit62080517fd970cd5ae8e8b99961a96d671ca7277 (patch)
tree02603018e7b7feb1140555726d1479d3fa1c6d60 /CMakeLists.txt
parent09d966b4e12c49682dd2e972c9061232d0b2c9e0 (diff)
downloadstonesense-62080517fd970cd5ae8e8b99961a96d671ca7277.tar.gz
stonesense-62080517fd970cd5ae8e8b99961a96d671ca7277.tar.bz2
stonesense-62080517fd970cd5ae8e8b99961a96d671ca7277.tar.xz
Fixed the Cmake file. MinGW now works properly again, and linux should be easier to get running
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt7
1 files changed, 5 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc087a1..2f3994d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,6 +22,7 @@ include_directories (
${CMAKE_SOURCE_DIR}/dfhack/include/
${CMAKE_SOURCE_DIR}/dfhack/depends/md5/
${CMAKE_SOURCE_DIR}/dfhack/depends/tinyxml/
+ ${CMAKE_SOURCE_DIR}/dfhack/
${CMAKE_SOURCE_DIR}/allegro/lib/
${CMAKE_SOURCE_DIR}
)
@@ -50,6 +51,7 @@ SET(PROJECT_SRCS
MapLoading.cpp
SpriteColors.cpp
SpriteMaps.cpp
+ SpriteObjects.cpp
UserInput.cpp
WorldSegment.cpp
VegetationConfiguration.cpp
@@ -93,7 +95,7 @@ IF(UNIX)
# INCLUDE_DIRECTORIES(${ALLEGRO_INCLUDE_DIR})
# SET(PROJECT_LIBS ${ALLEGRO5_LIBRARIES} ${PROJECT_LIBS})
- SET(PROJECT_LIBS allegro allegro_primitives allegro_color allegro_dialog allegro_font allegro_image allegro_main allegro_ttf dfhack-debug ${PROJECT_LIBS})
+ SET(PROJECT_LIBS allegro allegro_primitives allegro_color allegro_dialog allegro_font allegro_image allegro_main allegro_ttf dfhack ${PROJECT_LIBS})
ADD_EXECUTABLE(stonesense ${PROJECT_SRCS} ${PLATFORM_SRC})
TARGET_LINK_LIBRARIES(stonesense ${PROJECT_LIBS})
@@ -108,13 +110,14 @@ ELSE(UNIX)
IF(MINGW)
add_definitions()
- SET(PROJECT_LIBS liballegro.a liballegro_primitives.a liballegro_image.a liballegro_font.a liballegro_dialog.a liballegro_ttf.dll.a libpng.dll.a libglu32.a libglaux.a dfhack.a psapi mingw32)
+ SET(PROJECT_LIBS liballegro.a liballegro_primitives.a liballegro_image.a liballegro_font.a liballegro_dialog.a liballegro_ttf.dll.a libpng.dll.a libglu32.a libglaux.a libdfhack.dll.a psapi mingw32)
include_directories (
${include_directories}
${CMAKE_SOURCE_DIR}/allegro
)
LINK_DIRECTORIES(
${LINK_DIRECTORIES}
+ ${CMAKE_SOURCE_DIR}/dfhack
${CMAKE_SOURCE_DIR}/allegro/lib
)