summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorKris Parker2009-10-30 01:19:21 +0000
committerKris Parker2009-10-30 01:19:21 +0000
commitc823b4882c6463223e2c8860066ab49846dcf7e4 (patch)
treebef199124dee8e4671d4bd19b4e8414d767f9870 /CMakeLists.txt
parentbb692211669184b94433dd8b70f0282f02190241 (diff)
downloadstonesense-c823b4882c6463223e2c8860066ab49846dcf7e4.tar.gz
stonesense-c823b4882c6463223e2c8860066ab49846dcf7e4.tar.bz2
stonesense-c823b4882c6463223e2c8860066ab49846dcf7e4.tar.xz
Configuration tweaked to make MinGW build easier. Should not affect other users
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt30
1 files changed, 20 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8b5e608..df7b9ea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,23 +76,33 @@ IF(UNIX)
ELSE(UNIX)
add_definitions(-DBUILD_DFHACK_LIB)
# use local allegro
- include_directories (
- ${include_directories}
- ${CMAKE_SOURCE_DIR}/allegro
- )
- LINK_DIRECTORIES(
- ${LINK_DIRECTORIES}
- ${CMAKE_SOURCE_DIR}/allegro/lib_msvs8
- ${CMAKE_SOURCE_DIR}/loadpng/libpng/lib/
- )
# MinGW is broken. doesn't link properly for some reason.
IF(MINGW)
add_definitions(-DALLEGRO_MINGW32)
- SET(PROJECT_LIBS alleg psapi mingw32 libpng)
+ SET(PROJECT_LIBS alleg42 psapi mingw32 libpng)
+ include_directories (
+ ${include_directories}
+ ${CMAKE_SOURCE_DIR}/allegro-mingw-4.2.2/include
+ )
+ LINK_DIRECTORIES(
+ ${LINK_DIRECTORIES}
+ ${CMAKE_SOURCE_DIR}/allegro-mingw-4.2.2/lib
+ ${CMAKE_SOURCE_DIR}/allegro-mingw-4.2.2/bin
+ ${CMAKE_SOURCE_DIR}/loadpng/libpng/lib/
+ )
# MSVC
ELSE(MINGW)
add_definitions(-DALLEGRO_MSVC)
SET(PROJECT_LIBS alleg psapi libpng)
+ include_directories (
+ ${include_directories}
+ ${CMAKE_SOURCE_DIR}/allegro
+ )
+ LINK_DIRECTORIES(
+ ${LINK_DIRECTORIES}
+ ${CMAKE_SOURCE_DIR}/allegro/lib_msvs8
+ ${CMAKE_SOURCE_DIR}/loadpng/libpng/lib/
+ )
ENDIF(MINGW)
ADD_EXECUTABLE(stonesense WIN32 ${PROJECT_SRCS})
TARGET_LINK_LIBRARIES(stonesense ${PROJECT_LIBS})