diff options
| author | Kris Parker | 2009-11-20 15:14:53 +0000 |
|---|---|---|
| committer | Kris Parker | 2009-11-20 15:14:53 +0000 |
| commit | 9d667123a26e50ed2f9637bbc22c720115f78a85 (patch) | |
| tree | 5713244f5e54006fa5741ebe9a43c08bc96af6eb /CMakeLists.txt | |
| parent | 901a83a6b1ac111b973254571f18d1f32c187c12 (diff) | |
| download | stonesense-9d667123a26e50ed2f9637bbc22c720115f78a85.tar.gz stonesense-9d667123a26e50ed2f9637bbc22c720115f78a85.tar.bz2 stonesense-9d667123a26e50ed2f9637bbc22c720115f78a85.tar.xz | |
hopefully CMakeLists will work for linux too now
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 474867e..3eda3ab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,8 +36,6 @@ SET(PROJECT_SRCS dfhack/library/DFHackAPI.cpp dfhack/library/DFMemInfo.cpp dfhack/library/DFMemInfoManager.cpp - dfhack/library/DFProcess-windows.cpp - dfhack/library/DFProcessEnumerator-windows.cpp dfhack/library/DFTileTypes.cpp dfhack/library/md5/md5.cpp dfhack/library/md5/md5wrapper.cpp @@ -69,12 +67,20 @@ IF(UNIX) LINK_DIRECTORIES(${LINK_DIRECTORIES}) add_definitions(-DLINUX_BUILD) add_definitions(-DBUILD_DFHACK_LIB) - SET(PROJECT_LIBS alleg-4.2.2 png ${PROJECT_LIBS}) + SET (PLATFORM_SRC + dfhack/library/DFProcess-linux.cpp + dfhack/library/DFProcessEnumerator-linux.cpp + ) + SET(PROJECT_LIBS alleg-4.2.2 png ${PROJECT_LIBS} ${PLATFORM_SRC}) ADD_EXECUTABLE(stonesense ${PROJECT_SRCS}) TARGET_LINK_LIBRARIES(stonesense ${PROJECT_LIBS}) # windows ELSE(UNIX) add_definitions(-DBUILD_DFHACK_LIB) + SET (PLATFORM_SRC + dfhack/library/DFProcess-windows.cpp + dfhack/library/DFProcessEnumerator-windows.cpp + ) # use local allegro # MinGW is broken. doesn't link properly for some reason. IF(MINGW) @@ -104,7 +110,7 @@ ELSE(UNIX) ${CMAKE_SOURCE_DIR}/loadpng/libpng/lib/ ) ENDIF(MINGW) - ADD_EXECUTABLE(stonesense WIN32 ${PROJECT_SRCS}) + ADD_EXECUTABLE(stonesense WIN32 ${PROJECT_SRCS} ${PLATFORM_SRC}) TARGET_LINK_LIBRARIES(stonesense ${PROJECT_LIBS}) ENDIF(UNIX)
\ No newline at end of file |
