summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorPetr Mrázek2011-08-06 22:49:48 +0000
committerPetr Mrázek2011-08-06 22:49:48 +0000
commitd841ba0fee6e1f98e414c52dd07b44b981bc05fe (patch)
treea1b55757266b42cbab74c5166e7240fde2fb60b8 /CMakeLists.txt
parent4f8e62eef15fd23e984af3716cba37afe2134d5c (diff)
downloadstonesense-d841ba0fee6e1f98e414c52dd07b44b981bc05fe.tar.gz
stonesense-d841ba0fee6e1f98e414c52dd07b44b981bc05fe.tar.bz2
stonesense-d841ba0fee6e1f98e414c52dd07b44b981bc05fe.tar.xz
some derp changes, mostly to make things compile
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt7
1 files changed, 3 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index aed9d37..aca59b6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,6 @@ include_directories (
${CMAKE_SOURCE_DIR}/dfhack/depends/md5/
${CMAKE_SOURCE_DIR}/dfhack/depends/tinyxml/
${CMAKE_SOURCE_DIR}/dfhack/
- ${CMAKE_SOURCE_DIR}/allegro/lib/
${CMAKE_SOURCE_DIR}
)
else(WIN32)
@@ -59,14 +58,14 @@ IF(UNIX)
${PROJECT_LIBS})
# windows
ELSE(UNIX)
- SET(PROJECT_LIBS kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib allegro.lib allegro_primitives.lib allegro_font.lib allegro_ttf.lib allegro_image.lib allegro_dialog.lib libpng.lib zdll.lib winmm.lib psapi.lib opengl32.lib glu32.lib $(NOINHERIT))
+ SET(PROJECT_LIBS kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib allegro-5.0.3-monolith-md.lib winmm.lib psapi.lib opengl32.lib glu32.lib $(NOINHERIT))
include_directories (
${include_directories}
- ${stonesense_SOURCE_DIR}/allegro
+ ${stonesense_SOURCE_DIR}/allegro5/include
)
LINK_DIRECTORIES(
${LINK_DIRECTORIES}
- ${stonesense_SOURCE_DIR}/allegro/lib
+ ${stonesense_SOURCE_DIR}/allegro5/lib
)
ENDIF(UNIX)
DFHACK_PLUGIN(stonesense ${PROJECT_SRCS} LINK_LIBRARIES ${PROJECT_LIBS}) \ No newline at end of file