Mercurial Mercurial > hedgewars-draft / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
share/CMakeLists.txt
author dag10
Mon, 14 Jan 2013 11:19:59 +0100
changeset 8377 869f80966a77
parent 8317 ec9f94ab2737
child 8330 aaefa587e277
child 8649 e3a9339ce1fd
permissions -rw-r--r--
GCI2012: Improve Game Configuration Widget - Refactored mapmodel+datamanager to have two separate map models for static and mission maps, and then three static MapInfos in MapModel for the three special maps (random, maze, drawn). - Created theme selector dialog. - Created seed view/edit dialog. - Enlarged start icon on pagemultiplayer and pagenetgame, and added Start.png. - Moved "Settings" button on pagemultiplayer and pagenetgame from middle of page to page footer. - Added "load drawing" button to mapcontainer widget. - Map preview is no longer the randomize button; The randomize functionality is now in a button of its own. - Map preview no longer grays out (isn't disabled) when in slave mode. - Seed is now viewable and copyable when in slave mode -- but not editable. - You should now use the property master (isMaster() and setMaster()) on gamecfgwidget and mapcontainer instead of the enabled property. This is because some widgets (e.g. "view/edit seed" button and map preview) shouldn't be disabled, when all other widgets should be. - Added mission map descriptions w/ locale support in INI format in mapname/desc.txt if applicable. Use '|' for line break.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 98
diff changeset 
     1
 
add_subdirectory(hedgewars)
2641
b08cafb86797 some tweaks in the mac compilation system
koda
parents: 2393
diff changeset 
     2
 







8317






ec9f94ab2737
remove the CROSSAPPLE option until a better solution is found



koda


parents: 
8283

diff
changeset




     3


if(APPLE)








8093






2286a39140da
moar cmake cleanup, use message(WARNING ...) where appropriate



koda


parents: 
8090

diff
changeset




     4


    #needed for CFBundleVersion and CFBundleShortVersionString













2286a39140da
moar cmake cleanup, use message(WARNING ...) where appropriate



koda


parents: 
8090

diff
changeset




     5


        #should reuse the variables set in main CMakeLists.txt








8146






1fba650c2aa4
GCI2012: Lowercase CMake functions (main files only)



m4tx


parents: 
8093

diff
changeset




     6


    if(HGCOMMAND AND (EXISTS ${CMAKE_SOURCE_DIR}/.hg))








8093






2286a39140da
moar cmake cleanup, use message(WARNING ...) where appropriate



koda


parents: 
8090

diff
changeset




     7


        set(HEDGEWARS_REVISION ${revision_number})








8146






1fba650c2aa4
GCI2012: Lowercase CMake functions (main files only)



m4tx


parents: 
8093

diff
changeset




     8


    else()








8093






2286a39140da
moar cmake cleanup, use message(WARNING ...) where appropriate



koda


parents: 
8090

diff
changeset




     9


        set(HEDGEWARS_REVISION ${HEDGEWARS_VERSION})








8146






1fba650c2aa4
GCI2012: Lowercase CMake functions (main files only)



m4tx


parents: 
8093

diff
changeset




    10


    endif()








4336






006133b13b32
update build files for compliance with Mac AppStore



koda


parents: 
2641

diff
changeset




    11









8279






c03d64969112
less linking needed, raise minimum_osx_version when videorec is enabled



koda


parents: 
8146

diff
changeset




    12


    #silly libav that always brings in VideoDecoderAcceleration, avaible only from 10.6.3













c03d64969112
less linking needed, raise minimum_osx_version when videorec is enabled



koda


parents: 
8146

diff
changeset




    13


    if(NOT NOVIDEOREC)








8283






af97cdbb7713
cmake verbosity/documentation/cleanup/formatting



koda


parents: 
8279

diff
changeset




    14


        set(FFMPEG_FIND_QUIETLY true)













af97cdbb7713
cmake verbosity/documentation/cleanup/formatting



koda


parents: 
8279

diff
changeset




    15


        find_package(FFMPEG)








8279






c03d64969112
less linking needed, raise minimum_osx_version when videorec is enabled



koda


parents: 
8146

diff
changeset




    16


        if(${FFMPEG_FOUND} AND ${minimum_macosx_version} VERSION_EQUAL "10.6")













c03d64969112
less linking needed, raise minimum_osx_version when videorec is enabled



koda


parents: 
8146

diff
changeset




    17


            set(minimum_macosx_version "10.6.3")













c03d64969112
less linking needed, raise minimum_osx_version when videorec is enabled



koda


parents: 
8146

diff
changeset




    18


        endif()













c03d64969112
less linking needed, raise minimum_osx_version when videorec is enabled



koda


parents: 
8146

diff
changeset




    19


    endif()













c03d64969112
less linking needed, raise minimum_osx_version when videorec is enabled



koda


parents: 
8146

diff
changeset




    20









8093






2286a39140da
moar cmake cleanup, use message(WARNING ...) where appropriate



koda


parents: 
8090

diff
changeset




    21


    configure_file(${hedgewars_SOURCE_DIR}/share/Info.plist.in













2286a39140da
moar cmake cleanup, use message(WARNING ...) where appropriate



koda


parents: 
8090

diff
changeset




    22


                   ${CMAKE_CURRENT_BINARY_DIR}/Info.plist)













2286a39140da
moar cmake cleanup, use message(WARNING ...) where appropriate



koda


parents: 
8090

diff
changeset




    23


    #path here should be Hedgewars.app/Contents/MacOS













2286a39140da
moar cmake cleanup, use message(WARNING ...) where appropriate



koda


parents: 
8090

diff
changeset




    24


    install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/Info.plist"













2286a39140da
moar cmake cleanup, use message(WARNING ...) where appropriate



koda


parents: 
8090

diff
changeset




    25


            DESTINATION ../)













2286a39140da
moar cmake cleanup, use message(WARNING ...) where appropriate



koda


parents: 
8090

diff
changeset




    26


    install(PROGRAMS "${hedgewars_SOURCE_DIR}/share/Icon.icns"













2286a39140da
moar cmake cleanup, use message(WARNING ...) where appropriate



koda


parents: 
8090

diff
changeset




    27


            DESTINATION ../Resources/)













2286a39140da
moar cmake cleanup, use message(WARNING ...) where appropriate



koda


parents: 
8090

diff
changeset




    28


    install(PROGRAMS "${hedgewars_SOURCE_DIR}/share/hwico.icns"













2286a39140da
moar cmake cleanup, use message(WARNING ...) where appropriate



koda


parents: 
8090

diff
changeset




    29


            DESTINATION ../Resources/)













2286a39140da
moar cmake cleanup, use message(WARNING ...) where appropriate



koda


parents: 
8090

diff
changeset




    30


    install(PROGRAMS "${hedgewars_SOURCE_DIR}/share/dsa_pub.pem"













2286a39140da
moar cmake cleanup, use message(WARNING ...) where appropriate



koda


parents: 
8090

diff
changeset




    31


            DESTINATION ../Resources/)








8317






ec9f94ab2737
remove the CROSSAPPLE option until a better solution is found



koda


parents: 
8283

diff
changeset




    32


endif(APPLE)















hedgewars-draft