Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
also merge 0.9.16 in to make koda happy
authorsheepluva
Mon, 19 Sep 2011 23:49:20 +0200
changeset 5966 a0f38ad66163
parent 5965 e529b28d10e9 (current diff)
parent 5963 c24fdd9a0458 (diff)
child 5967 500e7a1cf9a3
also merge 0.9.16 in to make koda happy
--- a/.hgtags	Mon Sep 19 23:25:13 2011 +0200
+++ b/.hgtags	Mon Sep 19 23:49:20 2011 +0200
@@ -44,3 +44,4 @@
 0000000000000000000000000000000000000000 0.9.9.1
 718f98a9df122d73f3ba9add4d1654865199de31 Hedgewars-iOS-1.3
 cba92708277b6d0aeabfff2b878845b7d848bdcd Hedgewars-iOS-1.3.1
+74bc72746bec68806344f4ba7be0d1bc6e05d380 0.9.16-release
--- a/QTfrontend/CMakeLists.txt	Mon Sep 19 23:25:13 2011 +0200
+++ b/QTfrontend/CMakeLists.txt	Mon Sep 19 23:49:20 2011 +0200
@@ -1,5 +1,6 @@
 # Configure for Qt4
 set(QT_MIN_VERSION "4.5.0")
+include(CheckLibraryExists)
 
 set(QT_USE_QTCORE TRUE)
 set(QT_USE_QTGUI TRUE)
--- a/hedgewars/CMakeLists.txt	Mon Sep 19 23:25:13 2011 +0200
+++ b/hedgewars/CMakeLists.txt	Mon Sep 19 23:49:20 2011 +0200
@@ -152,6 +152,9 @@
         MAIN_DEPENDENCY ${hwengine_project}
         DEPENDS ${engine_sources}
         )
+
+    add_custom_target(ENGINECLEAN COMMAND ${CMAKE_BUILD_TOOL} "clean" "${PROJECT_BINARY_DIR}" "${hedgewars_SOURCE_DIR}/hedgewars")
+    add_dependencies(${engine_output_name} ENGINECLEAN)
 ELSE()
     #let's build sdlmain, which is absent from the framework
     find_package(SDL REQUIRED)
@@ -183,8 +186,6 @@
 
 
 add_custom_target(${engine_output_name} ALL DEPENDS "${EXECUTABLE_OUTPUT_PATH}/${engine_output_name}${CMAKE_EXECUTABLE_SUFFIX}")
-add_custom_target(ENGINECLEAN COMMAND ${CMAKE_BUILD_TOOL} "clean" "${PROJECT_BINARY_DIR}" "${hedgewars_SOURCE_DIR}/hedgewars")
-add_dependencies(${engine_output_name} ENGINECLEAN)
 
 install(PROGRAMS "${EXECUTABLE_OUTPUT_PATH}/${engine_output_name}${CMAKE_EXECUTABLE_SUFFIX}" DESTINATION ${target_dir})
hedgewars