# HG changeset patch # User koda # Date 1318385678 -7200 # Node ID a9495e0bd4187c0fc86c0efd9da97b2c9f078ce8 # Parent 647d52370ce95f13b93c062c598eb142d1c8b468 because betas are baaaad (also really fix compiling everywhere) diff -r 647d52370ce9 -r a9495e0bd418 QTfrontend/CMakeLists.txt --- 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) diff -r 647d52370ce9 -r a9495e0bd418 QTfrontend/pagesingleplayer.cpp --- 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(); diff -r 647d52370ce9 -r a9495e0bd418 hedgewars/CMakeLists.txt --- 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}) diff -r 647d52370ce9 -r a9495e0bd418 share/hedgewars/Data/Locale/hedgewars_en.ts --- 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 @@ Multiplayer (play a hotseat game against your friends, or AI teams) - Training Mode (Practice your skills in a range of training missions). IN DEVELOPMENT - Training Mode (Practice your skills in a range of training missions). IN DEVELOPMENT + Training Mode (Practice your skills in a range of training missions) + Training Mode (Practice your skills in a range of training missions) Demos (Watch recorded demos)