From 9025066a2ba254aad8905b91deb9ea4b920ea03f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sat, 16 Jul 2011 10:32:18 +0200 Subject: [PATCH] Added SDLreal.dll on windows. --- library/CMakeLists.txt | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index 62f47b821..6e4fb586c 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -145,7 +145,7 @@ COMMAND ${CMAKE_COMMAND} -E make_directory ${DFHACK_PLUGIN_OUTPUT_DIR} COMMAND ${CMAKE_COMMAND} -E copy ${dfhack_SOURCE_DIR}/Memory.xml ${DFHACK_OUTPUT_DIR}) ADD_DEPENDENCIES(dfhack prepare) -# Copy our version of the df launch script which sets LD_PRELOAD +# On linux, copy our version of the df launch script which sets LD_PRELOAD IF(UNIX) ADD_CUSTOM_TARGET( prepare_UNIX DEPENDS ${dfhack_SOURCE_DIR}/package/linux/dfhack @@ -153,8 +153,16 @@ IF(UNIX) COMMAND ${CMAKE_COMMAND} -E copy ${dfhack_SOURCE_DIR}/package/linux/dfhack ${DFHACK_OUTPUT_DIR}) ADD_DEPENDENCIES(dfhack prepare_UNIX) install(PROGRAMS ${dfhack_SOURCE_DIR}/package/linux/dfhack - DESTINATION ${DFHACK_LIBRARY_DESTINATION}) #linux: share/dfhack - + DESTINATION ${DFHACK_LIBRARY_DESTINATION}) +ELSE() +# On windows, copy the renamed SDL so DF can still run. + ADD_CUSTOM_TARGET( prepare_WINDOWS + DEPENDS ${dfhack_SOURCE_DIR}/package/windows/SDLreal.dll + COMMAND ${CMAKE_COMMAND} -E make_directory ${DFHACK_OUTPUT_DIR} + COMMAND ${CMAKE_COMMAND} -E copy ${dfhack_SOURCE_DIR}/package/windows/SDLreal.dll ${DFHACK_OUTPUT_DIR}) + ADD_DEPENDENCIES(dfhack prepare_WINDOWS) + install(PROGRAMS ${dfhack_SOURCE_DIR}/package/windows/SDLreal.dll + DESTINATION ${DFHACK_LIBRARY_DESTINATION}) ENDIF() install(TARGETS dfhack