diff --git a/CMakeLists.txt b/CMakeLists.txt index cf7db5cc..552f2aa2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,9 +16,9 @@ endif(NOT DEFINED CMAKE_BUILD_TYPE) # add additional CMake modules MESSAGE(STATUS "CMAKE_SOURCE_DIR = ${CMAKE_SOURCE_DIR}") list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/mk/cmake/Modules) - -MESSAGE(STATUS "Build type for this compile will be: ${CMAKE_BUILD_TYPE}") - +IF(CMAKE_BUILD_TYPE) + MESSAGE(STATUS "Build type for this compile will be: ${CMAKE_BUILD_TYPE}") +ENDIF() IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") SET(CMAKE_COMPILER_IS_GNUCXX "YES") # ADD_DEFINITIONS("-Qunused-arguments -Wno-switch") @@ -31,6 +31,7 @@ OPTION(BUILD_MEGAGLEST_MAP_EDITOR "Build map editor" ON) OPTION(BUILD_MEGAGLEST "Build MegaGlest" ON) OPTION(BUILD_MEGAGLEST_TESTS "Build MegaGlest Unit Tests" OFF) OPTION(WITH_VLC "Use libVLC to play videos" ON) +OPTION(SINGLE_INSTALL_DIRECTORY "Use single install directory for everything. It is useful for example for MacOS cpack bundles." OFF) FIND_PROGRAM(HELP2MAN "help2man") @@ -45,42 +46,38 @@ include(${CMAKE_SOURCE_DIR}/mk/cmake/Modules/SpecialMacros.cmake) SET(PKG_NAME "megaglest") # read version -file(READ ${PROJECT_SOURCE_DIR}/source/glest_game/facilities/game_util.cpp MG_VERSION_H_CONTENTS) -# find the version string -# +FILE(READ ${PROJECT_SOURCE_DIR}/source/glest_game/facilities/game_util.cpp MG_VERSION_H_CONTENTS) MESSAGE(STATUS "Determining version number system type to use:") -string (REGEX MATCH "\"v([0-9]).([0-9]).([0-9].*)[^\";]" _threePartMatch ${MG_VERSION_H_CONTENTS}) -if(NOT _threePartMatch) - MESSAGE(STATUS "** Trying 2 part versioning] ") - string (REGEX MATCH "\"v([0-9]).([0-9].*)[^\";]" _threePartMatch ${MG_VERSION_H_CONTENTS}) - - if (_threePartMatch) - # parse the parts of the version string - STRING(REGEX REPLACE "\"v([0-9])\\.[0-9].*" "\\1" VER_MAJOR "${_threePartMatch}") - STRING(REGEX REPLACE "\"v[0-9]\\.([0-9]).*" "\\1" VER_MINOR "${_threePartMatch}") - - MESSAGE(STATUS "MegaGlest Version is [${VER_MAJOR}.${VER_MINOR}] ") - endif() -# parse the version string -else() - MESSAGE(STATUS "** Trying 3 part versioning] ") - if (_threePartMatch) - # parse the parts of the version string - STRING(REGEX REPLACE "\"v([0-9])\\.[0-9]\\.[0-9].*" "\\1" VER_MAJOR "${_threePartMatch}") - STRING(REGEX REPLACE "\"v[0-9]\\.([0-9])\\.[0-9].*" "\\1" VER_MINOR "${_threePartMatch}") - STRING(REGEX REPLACE "\"v[0-9]\\.[0-9]\\.([0-9]).*" "\\1" VER_RELEASE "${_threePartMatch}") - - #MESSAGE(STATUS "******* TEST3 MegaGlest Version #1 is [${VER_MAJOR}] ") - #MESSAGE(STATUS "******* TEST3 MegaGlest Version #2 is [${VER_MINOR}] ") - #MESSAGE(STATUS "******* TEST3 MegaGlest Version #3 is [${VER_RELEASE}] ") - - MESSAGE(STATUS "MegaGlest Version is [${VER_MAJOR}.${VER_MINOR}.${VER_RELEASE}] ") - endif() -endif() +SET(Begin_otv_string "string glestVersionString") +STRING(REGEX MATCH "${Begin_otv_string}[ \t]*=[ \t]*\"[ \t]*v[ \t]*([0-9][^\\.]*)(\\.)([^\\.]*)(\\.)([^\"\\.;]*)\";" _threePartMatch "${MG_VERSION_H_CONTENTS}") +STRING(REGEX MATCH "${Begin_otv_string}[ \t]*=[ \t]*\"[ \t]*v[ \t]*([0-9][^\\.]*)(\\.)([^\"\\.;]*)\";" _twoPartMatch "${MG_VERSION_H_CONTENTS}") +STRING(REGEX MATCH "${Begin_otv_string}[ \t]*=[ \t]*\"[ \t]*v[ \t]*([0-9][^\"\\.;]*)\";" _onePartMatch "${MG_VERSION_H_CONTENTS}") +IF(_threePartMatch) + MESSAGE(STATUS "** Trying 3 part versioning ") + STRING(REGEX REPLACE "[^=]*=[ \t]*\"[ \t]*v[ \t]*([0-9][^\\.]*)\\.[^\\.]*\\..*" "\\1" VER_MAJOR "${_threePartMatch}") + STRING(REGEX REPLACE "[^=]*=[ \t]*\"[ \t]*v[ \t]*[0-9][^\\.]*\\.([^\\.]*)\\..*" "\\1" VER_MINOR "${_threePartMatch}") + STRING(REGEX REPLACE "[^=]*=[ \t]*\"[ \t]*v[ \t]*[0-9][^\\.]*\\.[^\\.]*\\.([^\"\\.;]*).*" "\\1" VER_PATCH "${_threePartMatch}") + SET(MEGAGLEST_VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}") +ELSEIF(_twoPartMatch) + MESSAGE(STATUS "** Trying 2 part versioning ") + STRING(REGEX REPLACE "[^=]*=[ \t]*\"[ \t]*v[ \t]*([0-9][^\\.]*)\\..*" "\\1" VER_MAJOR "${_twoPartMatch}") + STRING(REGEX REPLACE "[^=]*=[ \t]*\"[ \t]*v[ \t]*[0-9][^\\.]*\\.([^\"\\.;]*).*" "\\1" VER_MINOR "${_twoPartMatch}") + SET(VER_PATCH "0") + SET(MEGAGLEST_VERSION "${VER_MAJOR}.${VER_MINOR}") +ELSEIF(_onePartMatch) + MESSAGE(STATUS "** Trying 1 part versioning ") + STRING(REGEX REPLACE "[^=]*=[ \t]*\"[ \t]*v[ \t]*([0-9][^\"\\.;]*).*" "\\1" VER_MAJOR "${_onePartMatch}") + SET(VER_MINOR "0") + SET(VER_PATCH "0") + SET(MEGAGLEST_VERSION "${VER_MAJOR}") +ENDIF() +FOREACH(ver_var VER_MAJOR;VER_MINOR;VER_PATCH;MEGAGLEST_VERSION) + STRING(REGEX REPLACE "[ \t]" "" "${ver_var}" "${${ver_var}}") +ENDFOREACH() +MESSAGE(STATUS "Detected MegaGlest Version is [v${MEGAGLEST_VERSION}] ") ## Compiler flags, CPACK configuration and other Apple specific code. IF(APPLE) - SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++") include(${PROJECT_SOURCE_DIR}/mk/macosx/CMakeLists.txt) ENDIF(APPLE) @@ -215,17 +212,17 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW) SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -s") ## Strip binary ENDIF() - # Get the git revision info for the binary - SET(HAS_GIT "FALSE") - SET(GIT_LIVE_REV_CMD "") + # Get the git revision info for the binary + SET(HAS_GIT "FALSE") + SET(GIT_LIVE_REV_CMD "") OPTION(WANT_GIT_STAMP "use git revision stamp" ON) IF(WANT_GIT_STAMP) # The stuff below gets GIT Global Revision # but ONLY when calling cmake! # the FindGit.cmake module is part of the standard distribution include(FindGit) - - IF(GIT_FOUND) + + IF(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git/") SET(HAS_GIT "TRUE") MESSAGE(STATUS "Found GIT and using GIT version stamping...") @@ -245,54 +242,81 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW) OUTPUT_STRIP_TRAILING_WHITESPACE ) - SET(GIT_LIVE_REV_CMD "`git rev-list HEAD --count`.`git log -1 --format=%h`") + SET(GIT_LIVE_REV_CMD "`cd '${PROJECT_SOURCE_DIR}' && git rev-list HEAD --count`.`cd '${PROJECT_SOURCE_DIR}' && git log -1 --format=%h`") MESSAGE(STATUS "Using GIT revision stamp: [${GIT_COMMIT_COUNT}.${GIT_SHA1}] CMD [${GIT_LIVE_REV_CMD}]") - - ENDIF() - ENDIF() - IF(CMAKE_GENERATOR STREQUAL Xcode) - SET(GIT_VERSION_CMD "-DGITVERSION='\\\\'${GIT_LIVE_REV_CMD}\\\\''") - ELSE() - SET(GIT_VERSION_CMD "-DGITVERSION='\\\"${GIT_LIVE_REV_CMD}\\\"'") + IF(CMAKE_GENERATOR STREQUAL Xcode) + SET(GIT_VERSION_CMD "-DGITVERSION='\\\\'${GIT_COMMIT_COUNT}.${GIT_SHA1}\\\\''") + ELSE() + SET(GIT_VERSION_CMD "-DGITVERSION='\\\"${GIT_LIVE_REV_CMD}\\\"'") + ENDIF() + ENDIF() ENDIF() IF(CMAKE_INSTALL_PREFIX STREQUAL "") MESSAGE(STATUS "*NOTE: NOT USING a Custom Data Install Path...") ELSE() + IF(SINGLE_INSTALL_DIRECTORY AND NOT MEGAGLEST_SINGLE_DIRECTORY_INSTALL_PATH) + SET(MEGAGLEST_SINGLE_DIRECTORY_INSTALL_PATH "megaglest-game/" CACHE STRING "The single directory installation path for game (this is appended to the CMAKE_INSTALL_PREFIX)") + ENDIF() IF(NOT MEGAGLEST_BIN_INSTALL_PATH) - SET(MEGAGLEST_BIN_INSTALL_PATH "bin/" CACHE STRING "The installation path for binaries (this is appended to the CMAKE_INSTALL_PREFIX)") + IF(NOT SINGLE_INSTALL_DIRECTORY) + SET(MEGAGLEST_BIN_INSTALL_PATH "bin/" CACHE STRING "The installation path for binaries (this is appended to the CMAKE_INSTALL_PREFIX)") + ELSE() + SET(MEGAGLEST_BIN_INSTALL_PATH "${MEGAGLEST_SINGLE_DIRECTORY_INSTALL_PATH}") + ENDIF() ENDIF() IF(NOT MEGAGLEST_DATA_INSTALL_PATH) - SET(MEGAGLEST_DATA_INSTALL_PATH "share/megaglest/" CACHE STRING "The installation path for data files (this is appended to the CMAKE_INSTALL_PREFIX)") + IF(NOT SINGLE_INSTALL_DIRECTORY) + SET(MEGAGLEST_DATA_INSTALL_PATH "share/megaglest/" CACHE STRING "The installation path for data files (this is appended to the CMAKE_INSTALL_PREFIX)") + ELSE() + SET(MEGAGLEST_DATA_INSTALL_PATH "${MEGAGLEST_SINGLE_DIRECTORY_INSTALL_PATH}") + ENDIF() ENDIF() IF(NOT MEGAGLEST_DESKTOP_INSTALL_PATH) - SET(MEGAGLEST_DESKTOP_INSTALL_PATH "share/applications/" CACHE STRING "The installation path for desktop files (this is appended to the CMAKE_INSTALL_PREFIX)") + IF(NOT SINGLE_INSTALL_DIRECTORY) + SET(MEGAGLEST_DESKTOP_INSTALL_PATH "share/applications/" CACHE STRING "The installation path for desktop files (this is appended to the CMAKE_INSTALL_PREFIX)") + ELSE() + SET(MEGAGLEST_DESKTOP_INSTALL_PATH "${MEGAGLEST_SINGLE_DIRECTORY_INSTALL_PATH}") + ENDIF() ENDIF() IF(NOT MEGAGLEST_ICON_INSTALL_PATH) - SET(MEGAGLEST_ICON_INSTALL_PATH "share/pixmaps/" CACHE STRING "The installation path for icon files (this is appended to the CMAKE_INSTALL_PREFIX)") + IF(NOT SINGLE_INSTALL_DIRECTORY) + SET(MEGAGLEST_ICON_INSTALL_PATH "share/pixmaps/" CACHE STRING "The installation path for icon files (this is appended to the CMAKE_INSTALL_PREFIX)") + ELSE() + SET(MEGAGLEST_ICON_INSTALL_PATH "${MEGAGLEST_SINGLE_DIRECTORY_INSTALL_PATH}") + ENDIF() ENDIF() - IF(NOT MEGAGLEST_MANPAGE_INSTALL_PATH) - SET(MEGAGLEST_MANPAGE_INSTALL_PATH "share/man/man6/" CACHE STRING "The installation path for manpage files (this is appended to the CMAKE_INSTALL_PREFIX)") + IF(NOT MEGAGLEST_MANPAGE_INSTALL_PATH AND NOT SINGLE_INSTALL_DIRECTORY) + IF(NOT SINGLE_INSTALL_DIRECTORY) + SET(MEGAGLEST_MANPAGE_INSTALL_PATH "share/man/man6/" CACHE STRING "The installation path for manpage files (this is appended to the CMAKE_INSTALL_PREFIX)") + ELSE() + SET(MEGAGLEST_MANPAGE_INSTALL_PATH "${MEGAGLEST_SINGLE_DIRECTORY_INSTALL_PATH}") + ENDIF() + ENDIF() + IF(NOT CUSTOM_DATA_INSTALL_PATH AND NOT SINGLE_INSTALL_DIRECTORY) + SET(CUSTOM_DATA_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}/${MEGAGLEST_DATA_INSTALL_PATH}" CACHE STRING "The FULL installation path for data files (this is build automatically by combining CMAKE_INSTALL_PREFIX and MEGAGLEST_DATA_INSTALL_PATH)") + SET(CUSTOM_DATA_INSTALL_PATH_VALUE "-DCUSTOM_DATA_INSTALL_PATH=${CUSTOM_DATA_INSTALL_PATH}") ENDIF() - IF(NOT CUSTOM_DATA_INSTALL_PATH) - SET (CUSTOM_DATA_INSTALL_PATH "\"${CMAKE_INSTALL_PREFIX}/${MEGAGLEST_DATA_INSTALL_PATH}\"" CACHE STRING "The FULL installation path for data files (this is build automatically by combining CMAKE_INSTALL_PREFIX and MEGAGLEST_DATA_INSTALL_PATH)") - ENDIF() - SET(CUSTOM_DATA_INSTALL_PATH_VALUE "-DCUSTOM_DATA_INSTALL_PATH=${CUSTOM_DATA_INSTALL_PATH}") - - SET(PKG_DATADIR ${CUSTOM_DATA_INSTALL_PATH_VALUE}) - SET(PKG_BINDIR ${MEGAGLEST_BIN_INSTALL_PATH}) - + SET(PKG_DATADIR ${CUSTOM_DATA_INSTALL_PATH_VALUE}) + SET(PKG_BINDIR ${MEGAGLEST_BIN_INSTALL_PATH}) MESSAGE(STATUS "*NOTE: Custom Data Install Path is [${CUSTOM_DATA_INSTALL_PATH}]") ENDIF() - SET(CMAKE_CXX_FLAGS_NONE "${CMAKE_CXX_FLAGS_NONE} ${GIT_VERSION_CMD} ${CUSTOM_DATA_INSTALL_PATH_VALUE}") - SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${GIT_VERSION_CMD} ${CUSTOM_DATA_INSTALL_PATH_VALUE}") - SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${GIT_VERSION_CMD} ${CUSTOM_DATA_INSTALL_PATH_VALUE}") - SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${GIT_VERSION_CMD} ${CUSTOM_DATA_INSTALL_PATH_VALUE}") - SET(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} ${GIT_VERSION_CMD} ${CUSTOM_DATA_INSTALL_PATH_VALUE}") + IF(HAS_GIT STREQUAL "TRUE") + SET(CMAKE_CXX_FLAGS_NONE "${CMAKE_CXX_FLAGS_NONE} ${GIT_VERSION_CMD}") + SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${GIT_VERSION_CMD}") + SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${GIT_VERSION_CMD}") + SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${GIT_VERSION_CMD}") + SET(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} ${GIT_VERSION_CMD}") + ENDIF() + SET(CMAKE_CXX_FLAGS_NONE "${CMAKE_CXX_FLAGS_NONE} ${CUSTOM_DATA_INSTALL_PATH_VALUE}") + SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${CUSTOM_DATA_INSTALL_PATH_VALUE}") + SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${CUSTOM_DATA_INSTALL_PATH_VALUE}") + SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${CUSTOM_DATA_INSTALL_PATH_VALUE}") + SET(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} ${CUSTOM_DATA_INSTALL_PATH_VALUE}") # We do some funky character escaping to get the right stuff written out to # the final Makefile so we get the GIT Global Revsion # @@ -308,9 +332,9 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW) message("CMAKE_CXX_FLAGS_DEBUG: ${CMAKE_CXX_FLAGS_DEBUG}") ELSEIF( CMAKE_BUILD_TYPE STREQUAL Release ) message("CMAKE_CXX_FLAGS_RELEASE: ${CMAKE_CXX_FLAGS_RELEASE}") - ELSEIF( CMAKE_BUILD_TYPE STREQUAL RELWITHDEBINFO ) + ELSEIF( CMAKE_BUILD_TYPE STREQUAL RelWithDebInfo ) message("CMAKE_CXX_FLAGS_RELWITHDEBINFO: ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}") - ELSEIF( CMAKE_BUILD_TYPE STREQUAL MINSIZEREL ) + ELSEIF( CMAKE_BUILD_TYPE STREQUAL MinSizeRel ) message("CMAKE_CXX_FLAGS_MINSIZEREL: ${CMAKE_CXX_FLAGS_MINSIZEREL}") ENDIF() @@ -388,9 +412,10 @@ SET(CPACK_PACKAGE_VENDOR "megaglest.org") #SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README") #SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING") SET(CPACK_PACKAGE_INSTALL_DIRECTORY "megaglest") -SET(CPACK_PACKAGE_VERSION_MAJOR ${VER_MAJOR}) -SET(CPACK_PACKAGE_VERSION_MINOR ${VER_MINOR}) -SET(CPACK_PACKAGE_VERSION_PATCH ${VER_RELEASE}) +SET(CPACK_PACKAGE_VERSION "${MEGAGLEST_VERSION}") +SET(CPACK_PACKAGE_VERSION_MAJOR "${VER_MAJOR}") +SET(CPACK_PACKAGE_VERSION_MINOR "${VER_MINOR}") +SET(CPACK_PACKAGE_VERSION_PATCH "${VER_PATCH}") # Debian specific generator options @@ -417,6 +442,7 @@ IF(NOT DEFINED CPACK_GENERATOR) libxml2-dev, libz-dev, libfribidi-dev") + # FIXME ^ cpack configuration should be fixed and tested #find_program(DPKG_PROGRAM dpkg DOC "dpkg program of Debian-based systems") #if(DPKG_PROGRAM) @@ -441,12 +467,9 @@ get_directory_property( DirDefs DIRECTORY ${CMAKE_SOURCE_DIR} COMPILE_DEFINITION foreach( d ${DirDefs} ) message( STATUS "=====> Found Define: " ${d} ) endforeach() -message( STATUS "=====> DirDefs: " ${DirDefs} ) +#MESSAGE( STATUS "=====> DirDefs: " ${DirDefs} ) #MESSAGE(STATUS "*** Compiler definitions are [${COMPILE_DEFINITIONS}]") MARK_AS_ADVANCED(SDLMAIN_LIBRARY) MARK_AS_ADVANCED(SDL_INCLUDE_DIR) MARK_AS_ADVANCED(SDL_LIBRARY) - - - diff --git a/data/glest_game b/data/glest_game index 12bb08b1..0d7df6aa 160000 --- a/data/glest_game +++ b/data/glest_game @@ -1 +1 @@ -Subproject commit 12bb08b14d36fb86a327bcf480872884ce9121ec +Subproject commit 0d7df6aa3c71b2c85183dbb50c9dbd426fe073db diff --git a/docs/README.release-management.txt b/docs/README.release-management.txt index 9628b3a1..bce6350f 100644 --- a/docs/README.release-management.txt +++ b/docs/README.release-management.txt @@ -11,30 +11,14 @@ Source and Data Archives: ========================= There are 3 archives that are built for a given release (starting with versions -after 3.6.0). In order to build a release you must have all files checked out -of svn for that specific release (example: trunk) - -To set the current version for release, modify the file mk/linux/mg-version.sh -and change the two variables: - -OLD_MG_VERSION=3.6.0.1 -MG_VERSION=3.6.0.2 - -*Note: Please ensure the MG_VERSION variable matches the version set in the -MegaGlest binary, this can be checked by running: ./megaglest --version -It is possible to have the mg-version.sh script NOT match the binary in cases -where we are releasing binary compatible updates to the archives in which case -we typically use a forth digit in the version # (as seen above) - -After setting the correct verions in mg-version.sh you should call: -./mg-version-synch.sh - -This will update associated installers to use the correct version stamps - -To set the actual binary to the desired version you must manually edit -glest_game/facilities/game_util.cpp -const string glestVersionString = "v3.8-dev"; +after 3.6.0). In order to build a release you must have all git repositories +checked out for that specific release (example, tag: 3.11.0) or downloaded all +source archives/"tarballs" which in their name have same version, equal to tag. +To set the current version for release, modify the file source/version.txt +and change there available variables, then run mk/linux/mg-version-synch.sh script +for updating version number everywhere where it is needed and then you only have +to commit changed files. #1. The source archive: This archive contains source code for binary compilation of the application and diff --git a/mk/cmake/Modules/FindFriBiDi.cmake b/mk/cmake/Modules/FindFriBiDi.cmake index 0d10d616..518f20fb 100644 --- a/mk/cmake/Modules/FindFriBiDi.cmake +++ b/mk/cmake/Modules/FindFriBiDi.cmake @@ -20,9 +20,10 @@ MESSAGE(STATUS "** Searching for library: FriBiDi...") # Set variable in temp var, otherwise FIND_PATH might fail # unset isn't present in the required version of cmake. FIND_PATH(xFRIBIDI_INCLUDE_DIR fribidi.h - /usr/local/include/fribidi - /usr/include/fribidi - ) + /usr/local/include/fribidi + /usr/include/fribidi + /opt/local/include/fribidi + ) set(FRIBIDI_INCLUDE_DIR ${xFRIBIDI_INCLUDE_DIR}) SET(FRIBIDI_NAMES ${FRIBIDI_NAMES} fribidi libfribidi) @@ -35,8 +36,10 @@ ENDIF() MESSAGE(STATUS "** Searching for library names: [${FRIBIDI_NAMES}] ...") FIND_LIBRARY(FRIBIDI_LIBRARY - NAMES ${FRIBIDI_NAMES} - PATHS /usr/lib /usr/local/lib + NAMES ${FRIBIDI_NAMES} + PATHS /usr/lib + /usr/local/lib + /opt/local/lib ) IF (FRIBIDI_LIBRARY AND FRIBIDI_INCLUDE_DIR) diff --git a/mk/cmake/Modules/FindIrcclient.cmake b/mk/cmake/Modules/FindIrcclient.cmake index 4644a7c6..7559e127 100644 --- a/mk/cmake/Modules/FindIrcclient.cmake +++ b/mk/cmake/Modules/FindIrcclient.cmake @@ -46,7 +46,9 @@ OPTION(FORCE_IRCCLIENT_DYNAMIC_LIBS "force the use of dynamic libs for IRCCLIENT MESSAGE(STATUS "Force IRCCLient dynamic: ${FORCE_IRCCLIENT_DYNAMIC_LIBS}") IF(WANT_STATIC_LIBS AND NOT FORCE_IRCCLIENT_DYNAMIC_LIBS) - SET(IRCCLIENT_FIND_LIBRARIES libircclient.a) + SET(IRCCLIENT_FIND_LIBRARIES libircclient.a ircclient.a) +ELSE() + SET(IRCCLIENT_FIND_LIBRARIES libircclient ircclient) ENDIF() FIND_LIBRARY(IRCCLIENT_LIBRARY diff --git a/mk/linux/build-mg.sh b/mk/linux/build-mg.sh index f785c43f..cd85c5c6 100755 --- a/mk/linux/build-mg.sh +++ b/mk/linux/build-mg.sh @@ -140,6 +140,16 @@ echo ' [ '"$distribution"' ] [ '"$release"' ] [ '"$codename"' ] [ '"$architectur case $distribution in + Debian) + case $release in + 6.*|7.*) ;; + *) + echo 'Turning ON dynamic FTGL, LUA, JPEG, PNG, IRCCLIENT ...' + EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DFTGL_STATIC=OFF -DLUA_STATIC=OFF -DJPEG_STATIC=OFF -DPNG_STATIC=OFF -DFORCE_IRCCLIENT_DYNAMIC_LIBS=ON" + ;; + esac + ;; + SuSE|SUSE?LINUX|Opensuse) case $release in *) diff --git a/mk/linux/make-binary-archive.sh b/mk/linux/make-binary-archive.sh index 5c9bb4c9..69a48bc0 100755 --- a/mk/linux/make-binary-archive.sh +++ b/mk/linux/make-binary-archive.sh @@ -59,6 +59,7 @@ cp *.bmp "$RELEASEDIR/" cp *.png "$RELEASEDIR/" cp *.xpm "$RELEASEDIR/" cp {../shared/,}*.ini "$RELEASEDIR/" +if [ -e "$RELEASEDIR/glest-dev.ini" ]; then rm "$RELEASEDIR/glest-dev.ini"; fi cp megaglest "$RELEASEDIR/" cp megaglest_editor "$RELEASEDIR/" cp megaglest_g3dviewer "$RELEASEDIR/" diff --git a/mk/linux/make-data-archive.sh b/mk/linux/make-data-archive.sh index 28a98d63..37595a1f 100755 --- a/mk/linux/make-data-archive.sh +++ b/mk/linux/make-data-archive.sh @@ -7,16 +7,26 @@ # Consider setting this for small packages if there's plenty of RAM and CPU available: #export XZ_OPT="$XZ_OPT -9e" +KERNEL="$(uname -s | tr '[A-Z]' '[a-z]')" +if [ "$KERNEL" = "darwin" ]; then + CURRENTDIR="$(cd "$(dirname "$0")"; pwd)" +else + CURRENTDIR="$(dirname "$(readlink -f "$0")")" +fi +cd "$CURRENTDIR" VERSION=`./mg-version.sh --version` RELEASENAME=megaglest-standalone-data PACKAGE="$RELEASENAME-$VERSION.tar.xz" -CURRENTDIR="$(dirname $(readlink -f $0))" -RELEASEDIR_ROOT="$CURRENTDIR/../../../release/" +RELEASEDIR_ROOT="$CURRENTDIR/../../../release" RELEASEDIR="${RELEASEDIR_ROOT}/${RELEASENAME-$VERSION}" PROJDIR="$CURRENTDIR/../../" REPODIR="$CURRENTDIR/../../" -echo "Creating data package in $RELEASEDIR" +if [ "$KERNEL" != "darwin" ]; then + echo "Creating data package in $RELEASEDIR" +else + echo "Creating data directory $RELEASEDIR" +fi [[ -d "$RELEASEDIR" ]] && rm -rf "$RELEASEDIR" mkdir -p "$RELEASEDIR" @@ -74,11 +84,12 @@ rm -rf "$RELEASEDIR/data/cegui" # END cd "$CURRENTDIR" -echo "creating data archive: $PACKAGE" -[[ -f "${RELEASEDIR_ROOT}/$PACKAGE" ]] && rm "${RELEASEDIR_ROOT}/$PACKAGE" -cd $RELEASEDIR -tar -cf - * | xz > ../$PACKAGE -cd $CURRENTDIR - -ls -la ${RELEASEDIR_ROOT}/$PACKAGE +if [ "$KERNEL" != "darwin" ]; then + echo "creating data archive: $PACKAGE" + [[ -f "${RELEASEDIR_ROOT}/$PACKAGE" ]] && rm "${RELEASEDIR_ROOT}/$PACKAGE" + cd $RELEASEDIR + tar -cf - * | xz > ../$PACKAGE + cd $CURRENTDIR + ls -la ${RELEASEDIR_ROOT}/$PACKAGE +fi diff --git a/mk/linux/mg-version-synch.sh b/mk/linux/mg-version-synch.sh index 75863f8f..604d728a 100755 --- a/mk/linux/mg-version-synch.sh +++ b/mk/linux/mg-version-synch.sh @@ -1,45 +1,106 @@ -#!/bin/bash +#!/bin/sh # Use this script to synchronize other scripts and installers with the version # in mg-version.sh for a Version Release # ---------------------------------------------------------------------------- # Written by Mark Vejvoda -# Copyright (c) 2011 Mark Vejvoda under GNU GPL v3.0+ +# Copyright (c) 2011-2015 Mark Vejvoda under GNU GPL v3.0+ CURRENT_VERSION=`./mg-version.sh --version` OLD_VERSION=`./mg-version.sh --oldversion_binary` - +VERSION_INFO_FILE="$(dirname "$(readlink -f "$0")")/../../source/version.txt" +LastCompatibleSaveGameVersion="$(awk -F '=' '/^LastCompatibleSaveGameVersion =/ {print $2}' "$VERSION_INFO_FILE" | awk -F '"' '{print $2}')" +MapeditorVersion="$CURRENT_VERSION" +G3dviewerVersion="$CURRENT_VERSION" +modifymore="yes" +echo +echo '===== Updating Game ======' +# const string glestVersionString = "v3.12-dev"; +echo 'Game version # before:' +grep -E '^const string glestVersionString = "[^"]*";$' ../../source/glest_game/facilities/game_util.cpp +sed -i 's/^const string glestVersionString = "[^"]*";$/const string glestVersionString = "v'$CURRENT_VERSION'";/' ../../source/glest_game/facilities/game_util.cpp +echo 'Game version # after:' +grep -E '^const string glestVersionString = "[^"]*";$' ../../source/glest_game/facilities/game_util.cpp +echo +if [ "$modifymore" = "yes" ]; then + # const string lastCompatibleSaveGameVersionString = "v3.9.0"; + echo 'Compatible Save Game version # before:' + grep -E '^const string lastCompatibleSaveGameVersionString = "[^"]*";$' ../../source/glest_game/facilities/game_util.cpp + sed -i 's/^const string lastCompatibleSaveGameVersionString = "[^"]*";$/const string lastCompatibleSaveGameVersionString = "v'$LastCompatibleSaveGameVersion'";/' ../../source/glest_game/facilities/game_util.cpp + echo 'Compatible Save Game version # after:' + grep -E '^const string lastCompatibleSaveGameVersionString = "[^"]*";$' ../../source/glest_game/facilities/game_util.cpp + echo +fi +if [ "$modifymore" = "yes" ] && [ "$(git status >/dev/null 2>&1; echo "$?")" -eq "0" ]; then + # const string GIT_RawRev = "$4446.1a8673f$"; + GitCommitForRelease="`git rev-list HEAD --count`.`git log -1 --format=%h`"; + echo 'GitCommitForRelease # before:' + grep -E '^GitCommitForRelease = "[^"]*";$' "$VERSION_INFO_FILE" + grep -E '^const string GIT_RawRev = "\$[^"$]*\$";$' ../../source/glest_game/facilities/game_util.cpp + sed -i 's/^GitCommitForRelease = "[^"]*";$/GitCommitForRelease = "'$GitCommitForRelease'";/' "$VERSION_INFO_FILE" + sed -i 's/^const string GIT_RawRev = "$[^"]*";$/const string GIT_RawRev = "$'$GitCommitForRelease'$";/' ../../source/glest_game/facilities/game_util.cpp + echo 'GitCommitForRelease # after:' + grep -E '^GitCommitForRelease = "[^"]*";$' "$VERSION_INFO_FILE" + grep -E '^const string GIT_RawRev = "\$[^"$]*\$";$' ../../source/glest_game/facilities/game_util.cpp +fi +echo +if [ "$modifymore" = "yes" ]; then + echo '===== Updating Mapeditor ======' + # const string mapeditorVersionString = "v1.6.1"; + echo 'Mapeditor version # before:' + grep -E '^const string mapeditorVersionString = "[^"]*";$' ../../source/glest_map_editor/main.cpp + sed -i 's/^const string mapeditorVersionString = "[^"]*";$/const string mapeditorVersionString = "v'$MapeditorVersion'";/' ../../source/glest_map_editor/main.cpp + echo 'Mapeditor version # after:' + grep -E '^const string mapeditorVersionString = "[^"]*";$' ../../source/glest_map_editor/main.cpp + echo + echo '===== Updating G3dviewer ======' + # const string g3dviewerVersionString= "v1.3.6"; + echo 'G3dviewer version # before:' + grep -E '^const string g3dviewerVersionString= "[^"]*";$' ../../source/g3d_viewer/main.cpp + sed -i 's/^const string g3dviewerVersionString= "[^"]*";$/const string g3dviewerVersionString= "v'$G3dviewerVersion'";/' ../../source/g3d_viewer/main.cpp + echo 'G3dviewer version # after:' + grep -E '^const string g3dviewerVersionString= "[^"]*";$' ../../source/g3d_viewer/main.cpp +fi +echo echo '===== Updating Linux Installer ======' # local GAME_VERSION = "x.x.x"; echo 'Linux Installer version # before:' -grep -E '^local GAME_VERSION = "[^"]*";$' mojosetup/megaglest-installer/scripts/config.lua;sed -i 's/^local GAME_VERSION = "[^"]*";$/local GAME_VERSION = "'$CURRENT_VERSION'";/' mojosetup/megaglest-installer/scripts/config.lua +grep -E '^local GAME_VERSION = "[^"]*";$' mojosetup/megaglest-installer/scripts/config.lua +sed -i 's/^local GAME_VERSION = "[^"]*";$/local GAME_VERSION = "'$CURRENT_VERSION'";/' mojosetup/megaglest-installer/scripts/config.lua echo 'Linux Installer version # after:' grep -E '^local GAME_VERSION = "[^"]*";$' mojosetup/megaglest-installer/scripts/config.lua - +echo echo '===== Updating Windows Installer ======' # !define APVER 3.6.0 echo 'Windows Installer version # before:' -grep -E '^\!define APVER [^"]*$' ../windoze/Installer/MegaGlestInstaller.nsi;sed -i 's/^\!define APVER [^"]*$/\!define APVER '$CURRENT_VERSION'/' ../windoze/Installer/MegaGlestInstaller.nsi +grep -E '^\!define APVER [^"]*$' ../windoze/Installer/MegaGlestInstaller.nsi +sed -i 's/^\!define APVER [^"]*$/\!define APVER '$CURRENT_VERSION'/' ../windoze/Installer/MegaGlestInstaller.nsi echo 'Windows Installer version # after:' grep -E '^\!define APVER [^"]*$' ../windoze/Installer/MegaGlestInstaller.nsi - -echo 'Windows Installer version # before:' -grep -E '^\!define APVER_OLD [^"]*$' ../windoze/Installer/MegaGlestInstaller.nsi;sed -i 's/^\!define APVER_OLD [^"]*$/\!define APVER_OLD '$OLD_VERSION'/' ../windoze/Installer/MegaGlestInstaller.nsi -echo 'Windows Installer version # after:' -grep -E '^\!define APVER_OLD [^"]*$' ../windoze/Installer/MegaGlestInstaller.nsi - -echo '===== Updating Windows Updater ======' -echo 'Windows Updater version # before:' -grep -E '^\!define APVER [^"]*$' ../windoze/Installer/MegaGlestUpdater.nsi;sed -i 's/^\!define APVER [^"]*$/\!define APVER '$CURRENT_VERSION'/' ../windoze/Installer/MegaGlestUpdater.nsi -echo 'Windows Updater version # after:' -grep -E '^\!define APVER [^"]*$' ../windoze/Installer/MegaGlestUpdater.nsi - -echo 'Windows Updater version # before:' -grep -E '^\!define APVER_OLD [^"]*$' ../windoze/Installer/MegaGlestUpdater.nsi;sed -i 's/^\!define APVER_OLD [^"]*$/\!define APVER_OLD '$OLD_VERSION'/' ../windoze/Installer/MegaGlestUpdater.nsi -echo 'Windows Updater version # after:' -grep -E '^\!define APVER_OLD [^"]*$' ../windoze/Installer/MegaGlestUpdater.nsi - -grep -E '^\!define APVER_UPDATE [^"]*$' ../windoze/Installer/MegaGlestUpdater.nsi;sed -i 's/^\!define APVER_UPDATE [^"]*$/\!define APVER_UPDATE '$CURRENT_VERSION'/' ../windoze/Installer/MegaGlestUpdater.nsi -echo 'Windows Updater version # after:' -grep -E '^\!define APVER_UPDATE [^"]*$' ../windoze/Installer/MegaGlestUpdater.nsi - - +echo +if [ "$modifymore" = "yes" ]; then + echo 'Windows Installer version # before:' + grep -E '^\!define APVER_OLD [^"]*$' ../windoze/Installer/MegaGlestInstaller.nsi + sed -i 's/^\!define APVER_OLD [^"]*$/\!define APVER_OLD '$OLD_VERSION'/' ../windoze/Installer/MegaGlestInstaller.nsi + echo 'Windows Installer version # after:' + grep -E '^\!define APVER_OLD [^"]*$' ../windoze/Installer/MegaGlestInstaller.nsi + echo + echo '===== Updating Windows Updater ======' + echo 'Windows Updater version # before:' + grep -E '^\!define APVER [^"]*$' ../windoze/Installer/MegaGlestUpdater.nsi + sed -i 's/^\!define APVER [^"]*$/\!define APVER '$CURRENT_VERSION'/' ../windoze/Installer/MegaGlestUpdater.nsi + echo 'Windows Updater version # after:' + grep -E '^\!define APVER [^"]*$' ../windoze/Installer/MegaGlestUpdater.nsi + echo + echo 'Windows Updater version # before:' + grep -E '^\!define APVER_OLD [^"]*$' ../windoze/Installer/MegaGlestUpdater.nsi + sed -i 's/^\!define APVER_OLD [^"]*$/\!define APVER_OLD '$OLD_VERSION'/' ../windoze/Installer/MegaGlestUpdater.nsi + echo 'Windows Updater version # after:' + grep -E '^\!define APVER_OLD [^"]*$' ../windoze/Installer/MegaGlestUpdater.nsi + echo + echo 'Windows Updater version # before:' + grep -E '^\!define APVER_UPDATE [^"]*$' ../windoze/Installer/MegaGlestUpdater.nsi + sed -i 's/^\!define APVER_UPDATE [^"]*$/\!define APVER_UPDATE '$CURRENT_VERSION'/' ../windoze/Installer/MegaGlestUpdater.nsi + echo 'Windows Updater version # after:' + grep -E '^\!define APVER_UPDATE [^"]*$' ../windoze/Installer/MegaGlestUpdater.nsi + echo +fi diff --git a/mk/linux/mg-version.sh b/mk/linux/mg-version.sh index 1334a9a8..53a0d3e0 100755 --- a/mk/linux/mg-version.sh +++ b/mk/linux/mg-version.sh @@ -1,12 +1,19 @@ -#!/bin/bash +#!/bin/sh # Use this script to idenitfy previous and current Version for a Version Release # ---------------------------------------------------------------------------- # Written by Mark Vejvoda # Copyright (c) 2011 Mark Vejvoda under GNU GPL v3.0+ -OLD_MG_VERSION=3.9.1 -OLD_MG_VERSION_BINARY=3.9.1 -MG_VERSION=3.11.0 +KERNEL="$(uname -s | tr '[A-Z]' '[a-z]')" +if [ "$KERNEL" = "darwin" ]; then + CURRENTDIR="$(cd "$(dirname "$0")"; pwd)" +else + CURRENTDIR="$(dirname "$(readlink -f "$0")")" +fi +VERSION_INFO_FILE="$CURRENTDIR/../../source/version.txt" +OLD_MG_VERSION="$(awk -F '=' '/^OldReleaseGameVersion =/ {print $2}' "$VERSION_INFO_FILE" | awk -F '"' '{print $2}')" +OLD_MG_VERSION_BINARY="$OLD_MG_VERSION" +MG_VERSION="$(awk -F '=' '/^CurrentGameVersion =/ {print $2}' "$VERSION_INFO_FILE" | awk -F '"' '{print $2}')" if [ "$1" = "--oldversion" ]; then echo "$OLD_MG_VERSION" diff --git a/mk/linux/mojosetup/megaglest-installer/make.sh b/mk/linux/mojosetup/megaglest-installer/make.sh index b4aee1f2..e1d9eb85 100755 --- a/mk/linux/mojosetup/megaglest-installer/make.sh +++ b/mk/linux/mojosetup/megaglest-installer/make.sh @@ -183,7 +183,7 @@ if [ $REPACKONLY -eq 0 ]; then cp "$CURRENTDIR/$megaglest_linux_path/start_megaglest" $INSTALLDATADIR cp "$CURRENTDIR/$megaglest_linux_path/megaglest" ${INSTALLDATADIR} cp "$CURRENTDIR/$megaglest_linux_path/glest.ini" $INSTALLDATADIR - cp "$CURRENTDIR/$megaglest_linux_path/megaglest.bmp" $INSTALLDATADIR + cp "$CURRENTDIR/$megaglest_linux_path/megaglest.png" $INSTALLDATADIR cp "$CURRENTDIR/$megaglest_shared_path/glestkeys.ini" $INSTALLDATADIR cp "$CURRENTDIR/$megaglest_linux_path/start_megaglest_mapeditor" $INSTALLDATADIR cp "$CURRENTDIR/$megaglest_linux_path/megaglest_editor" ${INSTALLDATADIR} diff --git a/mk/linux/mojosetup/megaglest-installer/scripts/config.lua b/mk/linux/mojosetup/megaglest-installer/scripts/config.lua index d5508439..04319fac 100644 --- a/mk/linux/mojosetup/megaglest-installer/scripts/config.lua +++ b/mk/linux/mojosetup/megaglest-installer/scripts/config.lua @@ -1,5 +1,5 @@ local GAME_INSTALL_SIZE = 680000000; -local GAME_VERSION = "3.11.0"; +local GAME_VERSION = "3.12-dev"; local _ = MojoSetup.translate @@ -119,7 +119,7 @@ Setup.Package genericname = _("MegaGlest"), tooltip = _("A real time strategy game."), builtin_icon = false, - icon = "megaglest.ico", + icon = "megaglest.png", commandline = "%0/start_megaglest", category = "Game;StrategyGame" }, @@ -131,7 +131,7 @@ Setup.Package genericname = _("MegaGlest"), tooltip = _("A real time strategy game."), builtin_icon = false, - icon = "editor.ico", + icon = "megaglest.png", commandline = "%0/start_megaglest_mapeditor", category = "Game;StrategyGame", --mimetype = {"application/x-gbm", "application/mgm"} @@ -144,7 +144,7 @@ Setup.Package genericname = _("MegaGlest"), tooltip = _("A real time strategy game."), builtin_icon = false, - icon = "g3dviewer.ico", + icon = "megaglest.png", commandline = "%0/start_megaglest_g3dviewer", category = "Game;StrategyGame", --mimetype = {"application/x-g3d"} @@ -157,7 +157,7 @@ Setup.Package genericname = _("MegaGlest"), tooltip = _("A real time strategy game."), builtin_icon = false, - icon = "megaglest-uninstall.ico", + icon = "megaglest-uninstall.ico", commandline = "%0/uninstall-megaglest.sh", category = "Game;StrategyGame" } diff --git a/mk/linux/setupBuildDeps.sh b/mk/linux/setupBuildDeps.sh index 5517f5bb..c30b70d3 100755 --- a/mk/linux/setupBuildDeps.sh +++ b/mk/linux/setupBuildDeps.sh @@ -106,121 +106,117 @@ error_during_installation () { echo 'If you can come up with something which works for you, please report back to us, too. Thanks!' } - - +if [ "$quiet" -eq "1" ]; then + APT_OPTIONS="$APT_OPTIONS -y -q" + URPMI_OPTIONS="$URPMI_OPTIONS -q --auto" +fi case $distribution in Debian) - if [ $quiet = 1 ]; then - APT_OPTIONS="$APT_OPTIONS -y -q" - fi case $release in - 6.0*|unstable) + oldstable|6|6.*) # No libvlc-dev since version (1.1.3) in Debian 6.0/Squeeze is incompatible, no libluajit-5.1-dev because it is not available on Debian 6.0/Squeeze, cf. http://glest.org/glest_board/?topic=8460 - installcommand='apt-get install '"$APT_OPTIONS"' build-essential cmake libsdl1.2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxbase2.8-dev libwxgtk2.8-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew-dev libftgl-dev libfribidi-dev libminiupnpc-dev librtmp-dev libgtk2.0-dev libcppunit-dev' + installcommand="apt-get install $APT_OPTIONS build-essential cmake libsdl1.2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxbase2.8-dev libwxgtk2.8-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew-dev libftgl-dev libfribidi-dev libminiupnpc-dev librtmp-dev libgtk2.0-dev libcppunit-dev" $installcommand - if [ $? != 0 ]; then - error_during_installation; + if [ "$?" -ne "0" ]; then + error_during_installation; echo '' echo 'Be sure to have the squeeze-backports repository installed, it is required for libminiupnpc-dev.' - exit 1; + exit 1; fi ;; + stable|7|7.*) + installcommand="apt-get install $APT_OPTIONS build-essential cmake libsdl1.2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxbase2.8-dev libwxgtk2.8-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew-dev libftgl-dev libfribidi-dev libminiupnpc-dev librtmp-dev libgtk2.0-dev libcppunit-dev" + $installcommand + if [ "$?" -ne "0" ]; then error_during_installation; exit 1; fi + ;; + testing|unstable|8|8.0|9|9.0) + installcommand="apt-get install $APT_OPTIONS build-essential cmake libcurl4-gnutls-dev libsdl1.2-dev libopenal-dev liblua5.2-dev libjpeg-dev libpng12-dev libfreetype6-dev libwxgtk3.0-dev libcppunit-dev libfribidi-dev libftgl-dev libglew-dev libogg-dev libvorbis-dev libminiupnpc-dev libircclient-dev libvlc-dev libxml2-dev libx11-dev libgl1-mesa-dev libglu1-mesa-dev librtmp-dev libkrb5-dev libldap2-dev libidn11-dev libgnutls-dev" + $installcommand + if [ "$?" -ne "0" ]; then error_during_installation; exit 1; fi + ;; *) - installcommand='apt-get install '"$APT_OPTIONS"' build-essential cmake libsdl1.2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxbase2.8-dev libwxgtk2.8-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew-dev libftgl-dev libfribidi-dev libvlc-dev libminiupnpc-dev librtmp-dev libgtk2.0-dev libcppunit-dev' - unsupported_release - exit 1 + installcommand="apt-get install $APT_OPTIONS build-essential cmake libcurl4-gnutls-dev libsdl1.2-dev libopenal-dev liblua5.2-dev libjpeg-dev libpng12-dev libfreetype6-dev libwxgtk3.0-dev libcppunit-dev libfribidi-dev libftgl-dev libglew-dev libogg-dev libvorbis-dev libminiupnpc-dev libircclient-dev libvlc-dev libxml2-dev libx11-dev libgl1-mesa-dev libglu1-mesa-dev librtmp-dev libkrb5-dev libldap2-dev libidn11-dev libgnutls-dev" + unsupported_release; exit 1 ;; esac ;; - Ubuntu) - if [ $quiet = 1 ]; then - APT_OPTIONS="$APT_OPTIONS -y -q" - fi + Ubuntu) case $release in - 8.04) - installcommand='apt-get install '"$APT_OPTIONS"' build-essential cmake libsdl1.2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxbase2.8-dev libwxgtk2.8-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew-dev libftgl-dev libfribidi-dev libcppunit-dev' - $installcommand - if [ $? != 0 ]; then error_during_installation; exit 1; fi - ;; 10.04) - installcommand='apt-get install '"$APT_OPTIONS"' build-essential cmake libsdl1.2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxbase2.8-dev libwxgtk2.8-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew1.5-dev libftgl-dev libfribidi-dev libcppunit-dev' + #LTS + installcommand="apt-get install $APT_OPTIONS build-essential cmake libsdl1.2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxbase2.8-dev libwxgtk2.8-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew1.5-dev libftgl-dev libfribidi-dev libcppunit-dev" $installcommand - if [ $? != 0 ]; then error_during_installation; exit 1; fi + if [ "$?" -ne "0" ]; then error_during_installation; exit 1; fi ;; - 11.10|12.04|12.10|13.04|13.10) - installcommand='apt-get install '"$APT_OPTIONS"' build-essential cmake libsdl1.2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxbase2.8-dev libwxgtk2.8-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew-dev libftgl-dev libfribidi-dev libvlc-dev libcppunit-dev' + 12.04|14.04) + #LTS + installcommand="apt-get install $APT_OPTIONS build-essential cmake libsdl1.2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxbase2.8-dev libwxgtk2.8-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew-dev libftgl-dev libfribidi-dev libvlc-dev libcppunit-dev" $installcommand - if [ $? != 0 ]; then error_during_installation; exit 1; fi + if [ "$?" -ne "0" ]; then error_during_installation; exit 1; fi ;; - 14.04|14.10) - installcommand='apt-get install '"$APT_OPTIONS"' build-essential cmake libsdl1.2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxbase3.0-dev libwxgtk3.0-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew-dev libftgl-dev libfribidi-dev libvlc-dev libcppunit-dev' + 14.10) + installcommand="apt-get install $APT_OPTIONS build-essential cmake libcurl4-gnutls-dev libsdl1.2-dev libopenal-dev liblua5.2-dev libjpeg-dev libpng12-dev libfreetype6-dev libwxgtk3.0-dev libcppunit-dev libfribidi-dev libftgl-dev libglew-dev libogg-dev libvorbis-dev libminiupnpc-dev libircclient-dev libvlc-dev libxml2-dev libx11-dev libgl1-mesa-dev libglu1-mesa-dev librtmp-dev libkrb5-dev libldap2-dev libidn11-dev libgnutls-dev" $installcommand - if [ $? != 0 ]; then error_during_installation; exit 1; fi + if [ "$?" -ne "0" ]; then error_during_installation; exit 1; fi ;; - *) - installcommand='apt-get install '"$APT_OPTIONS"' build-essential cmake libsdl1.2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxbase2.8-dev libwxgtk2.8-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew-dev libftgl-dev libfribidi-dev libvlc-dev libcppunit-dev' + installcommand="apt-get install $APT_OPTIONS build-essential cmake libcurl4-gnutls-dev libsdl1.2-dev libopenal-dev liblua5.2-dev libjpeg-dev libpng12-dev libfreetype6-dev libwxgtk3.0-dev libcppunit-dev libfribidi-dev libftgl-dev libglew-dev libogg-dev libvorbis-dev libminiupnpc-dev libircclient-dev libvlc-dev libxml2-dev libx11-dev libgl1-mesa-dev libglu1-mesa-dev librtmp-dev libkrb5-dev libldap2-dev libidn11-dev libgnutls-dev" unsupported_release exit 1 ;; esac ;; - LinuxMint) - if [ $quiet = 1 ]; then - APT_OPTIONS="$APT_OPTIONS -y -q" - fi + LinuxMint) case $release in - - 13|14|15|16) - installcommand='apt-get install '"$APT_OPTIONS"' build-essential cmake libsdl1.2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxbase2.8-dev libwxgtk2.8-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew-dev libftgl-dev libfribidi-dev libvlc-dev libcppunit-dev' + 13) + #LTS + installcommand="apt-get install $APT_OPTIONS build-essential cmake libsdl1.2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxbase2.8-dev libwxgtk2.8-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew-dev libftgl-dev libfribidi-dev libvlc-dev libcppunit-dev" $installcommand - if [ $? != 0 ]; then error_during_installation; exit 1; fi + if [ "$?" -ne "0" ]; then error_during_installation; exit 1; fi ;; *) - installcommand='apt-get install '"$APT_OPTIONS"' build-essential cmake libsdl1.2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxbase2.8-dev libwxgtk2.8-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew-dev libftgl-dev libfribidi-dev libvlc-dev libcppunit-dev' + installcommand="apt-get install $APT_OPTIONS build-essential cmake libcurl4-gnutls-dev libsdl1.2-dev libopenal-dev liblua5.2-dev libjpeg-dev libpng12-dev libfreetype6-dev libwxgtk3.0-dev libcppunit-dev libfribidi-dev libftgl-dev libglew-dev libogg-dev libvorbis-dev libminiupnpc-dev libircclient-dev libvlc-dev libxml2-dev libx11-dev libgl1-mesa-dev libglu1-mesa-dev librtmp-dev libkrb5-dev libldap2-dev libidn11-dev libgnutls-dev" unsupported_release exit 1 ;; esac ;; - SuSE|SUSE?LINUX|Opensuse*|openSUSE*) + SuSE|SUSE?LINUX|Opensuse*|openSUSE*) case $release in - 11.2|11.3|11.4|12.1) - installcommand='zypper install gcc gcc-c++ cmake libSDL-devel MesaGLw-devel freeglut-devel libvorbis-devel wxGTK-devel lua-devel libjpeg-devel libpng14-devel libcurl-devel openal-soft-devel xorg-x11-libX11-devel libxml2-devel libircclient-devel glew-devel ftgl-devel fribidi-devel cppunit-devel' + 11.4) + #LTS + installcommand="zypper install gcc gcc-c++ cmake libSDL-devel MesaGLw-devel freeglut-devel libvorbis-devel wxGTK-devel lua-devel libjpeg-devel libpng14-devel libcurl-devel openal-soft-devel xorg-x11-libX11-devel libxml2-devel libircclient-devel glew-devel ftgl-devel fribidi-devel cppunit-devel" $installcommand - if [ $? != 0 ]; then error_during_installation; exit 1; fi - ;; - 12.2) - installcommand='zypper install gcc gcc-c++ cmake libSDL-devel Mesa-libGL-devel freeglut-devel libvorbis-devel wxGTK-devel lua-devel libjpeg-devel libpng14-devel libcurl-devel openal-soft-devel xorg-x11-libX11-devel libxml2-devel libircclient-devel glew-devel ftgl-devel fribidi-devel cppunit-devel' - $installcommand - if [ $? != 0 ]; then error_during_installation; exit 1; fi + if [ "$?" -ne "0" ]; then error_during_installation; exit 1; fi ;; 13.1) - installcommand='zypper install gcc gcc-c++ cmake libSDL-devel Mesa-libGL-devel freeglut-devel libvorbis-devel wxGTK-devel lua-devel libjpeg-devel libpng-devel libcurl-devel openal-soft-devel xorg-x11-libX11-devel libxml2-devel libircclient-devel glew-devel ftgl-devel fribidi-devel cppunit-devel' + #LTS + installcommand="zypper install gcc gcc-c++ cmake libSDL-devel Mesa-libGL-devel freeglut-devel libvorbis-devel wxGTK-devel lua-devel libjpeg-devel libpng-devel libcurl-devel openal-soft-devel xorg-x11-libX11-devel libxml2-devel libircclient-devel glew-devel ftgl-devel fribidi-devel cppunit-devel" $installcommand - if [ $? != 0 ]; then error_during_installation; exit 1; fi + if [ "$?" -ne "0" ]; then error_during_installation; exit 1; fi ;; *) - installcommand='zypper install gcc gcc-c++ cmake libSDL-devel Mesa-libGL-devel freeglut-devel libvorbis-devel wxGTK-devel lua-devel libjpeg-devel libpng14-devel libcurl-devel openal-soft-devel xorg-x11-libX11-devel libxml2-devel libircclient-devel glew-devel ftgl-devel fribidi-devel cppunit-devel' + installcommand="zypper install gcc gcc-c++ cmake libSDL-devel Mesa-libGL-devel freeglut-devel libvorbis-devel wxGTK-devel lua-devel libjpeg-devel libpng14-devel libcurl-devel openal-soft-devel xorg-x11-libX11-devel libxml2-devel libircclient-devel glew-devel ftgl-devel fribidi-devel cppunit-devel" unsupported_release exit 1 ;; esac ;; - Fedora) + Fedora) case $release in - 13|14|15|16|17|18) - installcommand='yum groupinstall development-tools' - $installcommand - if [ $? != 0 ]; then error_during_installation; exit 1; fi + #18) + # installcommand='yum groupinstall development-tools' + # $installcommand + # if [ "$?" -ne "0" ]; then error_during_installation; exit 1; fi - installcommand='yum install cmake SDL-devel mesa-libGL-devel mesa-libGLU-devel libvorbis-devel wxBase wxGTK-devel lua-devel libjpeg-devel libpng-devel libcurl-devel openal-soft-devel libX11-devel libxml2-devel libircclient-devel glew-devel ftgl-devel fribidi-devel cppunit-devel' - $installcommand - ;; + # installcommand='yum install cmake SDL-devel mesa-libGL-devel mesa-libGLU-devel libvorbis-devel wxBase wxGTK-devel lua-devel libjpeg-devel libpng-devel libcurl-devel openal-soft-devel libX11-devel libxml2-devel libircclient-devel glew-devel ftgl-devel fribidi-devel cppunit-devel' + # $installcommand + # if [ "$?" -ne "0" ]; then error_during_installation; exit 1; fi + # ;; *) installcommand='yum groupinstall "Development Tools"; yum install cmake SDL-devel mesa-libGL-devel mesa-libGLU-devel libvorbis-devel wxBase wxGTK-devel lua-devel libjpeg-devel libpng-devel libcurl-devel openal-soft-devel libX11-devel libxml2-devel libircclient-devel glew-devel ftgl-devel fribidi-devel cppunit-devel' unsupported_release @@ -229,6 +225,18 @@ case $distribution in esac ;; + Mageia) + if [ "$architecture" = "x86_64" ]; then lib="lib64"; else lib="lib"; fi + case $release in + *) + installcommand="urpmi $URPMI_OPTIONS gcc gcc-c++ cmake make ${lib}curl-devel ${lib}SDL-devel ${lib}openal-devel ${lib}lua-devel ${lib}jpeg-devel ${lib}png-devel ${lib}freetype6-devel ${lib}wxgtku2.9-devel ${lib}cppunit-devel ${lib}fribidi-devel ${lib}ftgl-devel ${lib}glew-devel ${lib}ogg-devel ${lib}vorbis-devel ${lib}miniupnpc-devel ${lib}ircclient-static-devel ${lib}vlc-devel ${lib}xml2-devel ${lib}x11-devel ${lib}mesagl1-devel ${lib}mesaglu1-devel" + # mageia uses link patches + unsupported_release + exit 1 + ;; + esac + ;; + archlinux) case $release in rolling) diff --git a/mk/linux/start_megaglest_gameserver b/mk/linux/start_megaglest_gameserver index 7e614865..fb04d6f5 100755 --- a/mk/linux/start_megaglest_gameserver +++ b/mk/linux/start_megaglest_gameserver @@ -23,9 +23,14 @@ # # Please read http://wiki.megaglest.org/Dedicated_Server for more information # +# ---------------------------------------------------------------------------- +# Written by Tom Reynolds +# Copyright (c) 2013 Tom Reynolds, The Megaglest Team, under GNU GPL v3.0+ +# ---------------------------------------------------------------------------- +LANG=C # Install location -DIR_GAME=~/megaglest +DIR_GAME="$(dirname "$(readlink -f "$0")")" # Log file location (beware, this can grow large) #LOG_SERVER=/dev/null @@ -42,7 +47,7 @@ while true; do if [ -f "core" ]; then mv -f "core" "core.1"; fi date > "$LOG_SERVER" echo 'Starting server...' | tee -a "$LOG_SERVER" - ./start_megaglest --ini-path=./ --data-path=./ --headless-server-mode=vps,exit >> "$LOG_SERVER" 2>&1 + ./start_megaglest --headless-server-mode=vps,exit >> "$LOG_SERVER" 2>&1 if [ $? -ne 0 ]; then echo 'ERROR: Server has quit unexpectedly.' >> "$LOG_SERVER" diff --git a/mk/macosx/.gitignore b/mk/macosx/.gitignore new file mode 100644 index 00000000..2fc9fa28 --- /dev/null +++ b/mk/macosx/.gitignore @@ -0,0 +1,13 @@ +/megaglest +/megaglest.6 +/megaglest_* +/[Mm]ega[Gg]lest*.dmg + +core +core.bak + +/p7zip/ +/build/ +/[Rr]elease/ +/[Dd]ebug/ +/mydata/ diff --git a/mk/macosx/CMakeLists.txt b/mk/macosx/CMakeLists.txt index cecf5f9b..c8d763b6 100644 --- a/mk/macosx/CMakeLists.txt +++ b/mk/macosx/CMakeLists.txt @@ -1,72 +1,64 @@ -# Set defaults for Universal Binaries. We want 32-bit Intel/PPC on 10.4 -# and 32/64-bit Intel/PPC on >= 10.5. Anything <= 10.3 doesn't support. -# These are just defaults/recommendations, but how we want to build -# out of the box. But the user needs to be able to change these options. +# Anything <= 10.3 isn't supported. We want 32-bit Intel/PPC on 10.4, 10.5. +# On 10.6 32/64-bit Intel. On >= 10.7 unset architecture mean default 64-bit Intel. +# Using oldest available sdk with current Xcode is recommended. +# User needs to be able to change these options. # So we must only set the values the first time CMake is run, or we # will overwrite any changes the user sets. # FORCE is used because the options are not reflected in the UI otherwise. # Seems like a good place to add version specific compiler flags too. + IF(NOT CONFIG_HAS_BEEN_RUN_BEFORE) - IF(EXISTS /Developer/SDKs/MacOSX10.6.sdk) - SET(CMAKE_OSX_ARCHITECTURES "i386" CACHE STRING "Build architectures for OSX" FORCE) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.6 -ftree-vectorize -fvisibility-inlines-hidden" CACHE STRING "Flags used by the compiler during all build types." FORCE) - - ELSEIF(EXISTS /Developer/SDKs/MacOSX10.5.sdk) - # 64-bit compiles are not supported with Carbon. We should enable - # 64-bit compilation by default once osgviewer has been - # rewritten with Cocoa. - #SET(CMAKE_OSX_ARCHITECTURES "ppc;i386;ppc64;x86_64" CACHE STRING "Build architectures for OSX" FORCE) - SET(CMAKE_OSX_ARCHITECTURES "i386" CACHE STRING "Build architectures for OSX" FORCE) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.5 -ftree-vectorize -fvisibility-inlines-hidden" CACHE STRING "Flags used by the compiler during all build types." FORCE) - ELSE() - # No Universal Binary support - # Should break down further to set the -mmacosx-version-min, - # but the SDK detection is too unreliable here. + IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++") + #SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") ENDIF() + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftree-vectorize" CACHE STRING "Flags used by the compiler during all build types." FORCE) ENDIF(NOT CONFIG_HAS_BEEN_RUN_BEFORE) +# don't try to be too much "modern" +ADD_DEFINITIONS(-Wno-deprecated -Wno-deprecated-declarations) + # Include extra paths to search for includes; this is the default system wide macports path. INCLUDE_DIRECTORIES(/opt/local/include) LINK_DIRECTORIES(/opt/local/lib) ##install part +# This file is in git CRLF but that causes the cpack run to fail +#CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/docs/COPYRIGHT.source_code.txt" +# "${CMAKE_CURRENT_BINARY_DIR}/docs/COPYRIGHT.source_code.txt" NEWLINE_STYLE UNIX) +#SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_BINARY_DIR}/docs/COPYRIGHT.source_code.txt") + # This changes Info.plist from something with variables and CMakeisms to # something that can be installed on disk. -CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/mk/macosx/Info.plist" - "${CMAKE_CURRENT_BINARY_DIR}/Info.plist") +CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/mk/macosx/bundle_resources/Info.plist.in" + "${CMAKE_CURRENT_BINARY_DIR}/mk/macosx/bundle_resources/Info.plist") +SET(CPACK_BUNDLE_PLIST "${CMAKE_CURRENT_BINARY_DIR}/mk/macosx/bundle_resources/Info.plist") include (InstallRequiredSystemLibraries) # Use bundle generator (OSX has 3 other options if you feel adventurous) -set (CPACK_GENERATOR "Bundle") - -# The following CPACK_* options are all required -set (CPACK_PACKAGE_FILE_NAME MegaGlest-${VER_MAJOR}.${VER_MINOR}.${VER_RELEASE}) -set (CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/mk/macosx/MegaGlest.icns") - -set (CPACK_RESOURCE_FILE_LICENSE - "${CMAKE_CURRENT_SOURCE_DIR}/docs/COPYRIGHT.source_code.txt") -set (CPACK_BUNDLE_NAME "MegaGlest") -set (CPACK_BUNDLE_STARTUP_COMMAND "${PROJECT_SOURCE_DIR}/data/glest_game/megaglest") -set (CPACK_BUNDLE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/mk/macosx/MegaGlest.icns") -set (CPACK_BUNDLE_PLIST "${CMAKE_CURRENT_BINARY_DIR}/Info.plist") +SET(CPACK_GENERATOR "Bundle") +SET(CPACK_BUNDLE_NAME "MegaGlest") +SET(CPACK_PACKAGE_FILE_NAME "MegaGlest-game-macos-${MEGAGLEST_VERSION}") +SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/mk/macosx/bundle_resources/MegaGlest.icns") +SET(CPACK_BUNDLE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/mk/macosx/bundle_resources/MegaGlest.icns") +SET(CPACK_BUNDLE_STARTUP_COMMAND "${PROJECT_SOURCE_DIR}/mk/macosx/bundle_resources/MegaGlest.sh") # Install files in to the package (FIXME: how? we sure?) -INSTALL(FILES +INSTALL(FILES ${LUA_LIBRARIES} - DESTINATION ../Frameworks + DESTINATION ../Frameworks ) #the SDL_LIBRARY is seen as a framework thus we need to remove the suffix... STRING(REGEX REPLACE ";.*" "" SDL_LIBRARY_DIR "${SDL_LIBRARY}") -#INSTALL(DIRECTORY +#INSTALL(DIRECTORY # ${OGG_LIBRARY} # ${XERCESC_LIBRARY} # ${VORBIS_LIBRARY} # ${SDL_LIBRARY_DIR} # ${PNG_LIBRARY} - # DESTINATION ../Frameworks - # ) - +# DESTINATION ../Frameworks +# ) diff --git a/mk/macosx/PkgInfo b/mk/macosx/PkgInfo deleted file mode 100644 index 7839fa54..00000000 --- a/mk/macosx/PkgInfo +++ /dev/null @@ -1,2 +0,0 @@ -APPL???? -APPL???? \ No newline at end of file diff --git a/mk/macosx/build-mg.sh b/mk/macosx/build-mg.sh new file mode 100755 index 00000000..f83b2e0b --- /dev/null +++ b/mk/macosx/build-mg.sh @@ -0,0 +1,214 @@ +#!/bin/sh +# Use this script to build MegaGlest using cmake +# ---------------------------------------------------------------------------- +# 2011 Written by Mark Vejvoda +# 2015 Rewritten by filux +# Copyright (c) 2011-2015 under GNU GPL v3.0+ +# ---------------------------------------------------------------------------- +# Default to English language output so we can understand your bug reports +export LANG=C + +SCRIPTDIR="$(cd "$(dirname "$0")"; pwd)" +BUILD_BUNDLE=0 +CPU_COUNT=-1 +CMAKE_ONLY=0 +MAKE_ONLY=0 +USE_XCODE=0 +CLANG_FORCED=0 +WANT_STATIC_LIBS="-DWANT_STATIC_LIBS=ON" +LUA_FORCED_VERSION=0 + +while getopts "c:dfhl:mnxb" option; do + case "${option}" in + c) CPU_COUNT=${OPTARG};; + d) WANT_STATIC_LIBS="-DWANT_STATIC_LIBS=OFF";; + f) CLANG_FORCED=1;; + h) echo "Usage: $0