# HG changeset patch # User koda # Date 1296635022 -3600 # Node ID 663aa9552bfc58b75e9f3f3fe5016989a85eecfa # Parent 69f8431a5d2018be8529b1b4c9b6f3df393c2fb9 add NOAUTOUPDATE symbol and hedgewars-server.cabal diff -r 69f8431a5d20 -r 663aa9552bfc QTfrontend/CMakeLists.txt --- a/QTfrontend/CMakeLists.txt Tue Feb 01 00:12:19 2011 +0100 +++ b/QTfrontend/CMakeLists.txt Wed Feb 02 09:23:42 2011 +0100 @@ -171,11 +171,13 @@ set(hwfr_src ${hwfr_src} InstallController.cpp CocoaInitializer.mm M3Panel.mm M3InstallController.m NSWorkspace_RBAdditions.m) set(HW_LINK_LIBS IOKit) - find_package(Sparkle) - if(SPARKLE_FOUND) - add_definitions(-DSPARKLE_ENABLED) - set(hwfr_src ${hwfr_src} AutoUpdater.cpp SparkleAutoUpdater.mm) - set(HW_LINK_LIBS ${SPARKLE_LIBRARY} ${HW_LINK_LIBS}) + if(NOT NOAUTOUPDATE) + find_package(Sparkle) + if(SPARKLE_FOUND) + add_definitions(-DSPARKLE_ENABLED) + set(hwfr_src ${hwfr_src} AutoUpdater.cpp SparkleAutoUpdater.mm) + set(HW_LINK_LIBS ${SPARKLE_LIBRARY} ${HW_LINK_LIBS}) + endif() endif() endif() diff -r 69f8431a5d20 -r 663aa9552bfc gameServer/hedgewars-server.cabal --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gameServer/hedgewars-server.cabal Wed Feb 02 09:23:42 2011 +0100 @@ -0,0 +1,33 @@ +Name: hedgewars-server +Version: 0.1 +Synopsis: hedgewars server +Description: hedgewars server +Homepage: http://www.hedgewars.org/ +License: GPL-2 +Author: unC0Rr +Maintainer: unC0Rr@hedgewars.org +Category: Game +Build-type: Simple +Cabal-version: >=1.2 + + +Executable hedgewars-server + main-is: hedgewars-server.hs + + Build-depends: + base >= 4, + unix, + containers, + array, + bytestring, + network-bytestring, + network, + time, + stm, + mtl, + dataenc, + hslogger, + process, + utf8-string + + ghc-options: -O2 \ No newline at end of file diff -r 69f8431a5d20 -r 663aa9552bfc tools/CMakeLists.txt --- a/tools/CMakeLists.txt Tue Feb 01 00:12:19 2011 +0100 +++ b/tools/CMakeLists.txt Wed Feb 02 09:23:42 2011 +0100 @@ -16,7 +16,14 @@ find_package(SDL_ttf REQUIRED) find_package(SDL_mixer REQUIRED) find_package(OGGVORBIS REQUIRED) - find_package(SPARKLE) + if(NOT NOAUTOUPDATE) + find_package(SPARKLE) + if(SPARKLE_FOUND) + set(SPARKLE_FOUND 1) + else() + set(SPARKLE_FOUND 0) + endif() + endif() #use the associated tool from the libraries we've selected string(REGEX REPLACE "(.*)/include.*" "\\1" qt_base_dir "${QT_INCLUDE_DIR}") @@ -35,12 +42,6 @@ string(REGEX REPLACE "(.*);-.*" "\\1" sdl_dir "${SDL_LIBRARY}") - if(SPARKLE_FOUND) - set(SPARKLE_FOUND 1) - else() - set(SPARKLE_FOUND 0) - endif() - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/CreateMacBundle.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/CreateMacBundle.cmake) endif(APPLE AND BUNDLE)