Mercurial Mercurial > sheepy-clone / 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.
because betas are baaaad (also really fix compiling everywhere) 0.9.16
authorkoda
Wed, 12 Oct 2011 04:14:38 +0200
branch0.9.16
changeset 5997 a9495e0bd418
parent 5995 647d52370ce9
child 5999 dad168522e3b
because betas are baaaad (also really fix compiling everywhere)
QTfrontend/CMakeLists.txt file | annotate | diff | comparison | revisions
QTfrontend/pagesingleplayer.cpp file | annotate | diff | comparison | revisions
hedgewars/CMakeLists.txt file | annotate | diff | comparison | revisions
share/hedgewars/Data/Locale/hedgewars_en.ts file | annotate | diff | comparison | revisions 
--- a/QTfrontend/CMakeLists.txt	Sun Sep 25 10:48:18 2011 -0400
+++ b/QTfrontend/CMakeLists.txt	Wed Oct 12 04:14:38 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/QTfrontend/pagesingleplayer.cpp	Sun Sep 25 10:48:18 2011 -0400
+++ b/QTfrontend/pagesingleplayer.cpp	Wed Oct 12 04:14:38 2011 +0200
@@ -45,11 +45,11 @@
 
 
     BtnCampaignPage = addButton(":/res/Campaign.png", middleLine, 0, true);
-    BtnCampaignPage->setToolTip(tr("Campaign Mode (...). IN DEVELOPMENT"));
+    BtnCampaignPage->setToolTip(tr("Campaign Mode (...)"));
     BtnCampaignPage->setVisible(false);
 
     BtnTrainPage = addButton(":/res/Trainings.png", middleLine, 1, true);
-    BtnTrainPage->setToolTip(tr("Training Mode (Practice your skills in a range of training missions). IN DEVELOPMENT"));
+    BtnTrainPage->setToolTip(tr("Training Mode (Practice your skills in a range of training missions)"));
 
     BtnBack = addButton(":/res/Exit.png", bottomLine, 0, true);
     bottomLine->addStretch();
--- a/hedgewars/CMakeLists.txt	Sun Sep 25 10:48:18 2011 -0400
+++ b/hedgewars/CMakeLists.txt	Wed Oct 12 04:14:38 2011 +0200
@@ -183,8 +183,10 @@
 
 
 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)
+IF(NOT APPLE)
+    add_custom_target(ENGINECLEAN COMMAND ${CMAKE_BUILD_TOOL} "clean" "${PROJECT_BINARY_DIR}" "${hedgewars_SOURCE_DIR}/hedgewars")
+    add_dependencies(${engine_output_name} ENGINECLEAN)
+ENDIF()
 
 install(PROGRAMS "${EXECUTABLE_OUTPUT_PATH}/${engine_output_name}${CMAKE_EXECUTABLE_SUFFIX}" DESTINATION ${target_dir})
 
--- a/share/hedgewars/Data/Locale/hedgewars_en.ts	Sun Sep 25 10:48:18 2011 -0400
+++ b/share/hedgewars/Data/Locale/hedgewars_en.ts	Wed Oct 12 04:14:38 2011 +0200
@@ -1170,8 +1170,8 @@
         <translation>Multiplayer (play a hotseat game against your friends, or AI teams)</translation>
     </message>
     <message>
-        <source>Training Mode (Practice your skills in a range of training missions). IN DEVELOPMENT</source>
-        <translation>Training Mode (Practice your skills in a range of training missions). IN DEVELOPMENT</translation>
+        <source>Training Mode (Practice your skills in a range of training missions)</source>
+        <translation>Training Mode (Practice your skills in a range of training missions)</translation>
     </message>
     <message>
         <source>Demos (Watch recorded demos)</source>
sheepy-clone