since latest release macos is not 'X' anymore
This commit is contained in:
filux
parent
6c7cafea08
commit
661b512a8a
18
.travis.yml
18
.travis.yml
|
|
@ -24,23 +24,11 @@ matrix:
|
|||
env: Tr_Compiler_Version="default"
|
||||
dist: trusty # broken compiler on 12.04
|
||||
- os: osx
|
||||
osx_image: xcode6.4
|
||||
#env: Tr_Xcode_Version="default"
|
||||
env: Tr_Xcode_Version="6.4"
|
||||
# https://docs.travis-ci.com/user/osx-ci-environment/#OS-X-Version
|
||||
# https://github.com/Homebrew/brew/blob/master/docs/Installation.md#requirements
|
||||
- os: osx
|
||||
#osx_image: xcode6.4
|
||||
#osx_image: xcode6.4 # seems broken and has lower priority in queue than default one
|
||||
env: Tr_Xcode_Version="default"
|
||||
#env: Tr_Xcode_Version="6.4"
|
||||
# https://docs.travis-ci.com/user/osx-ci-environment/#OS-X-Version
|
||||
# https://github.com/Homebrew/brew/blob/master/docs/Installation.md#requirements
|
||||
- os: osx
|
||||
#osx_image: xcode6.4
|
||||
#env: Tr_Xcode_Version="default"
|
||||
env: Tr_Xcode_Version="6.4"
|
||||
# https://docs.travis-ci.com/user/osx-ci-environment/#OS-X-Version
|
||||
# https://github.com/Homebrew/brew/blob/master/docs/Installation.md#requirements
|
||||
fast_finish: true
|
||||
allow_failures:
|
||||
#- os: osx
|
||||
|
|
@ -60,7 +48,7 @@ before_install:
|
|||
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew outdated cmake || brew upgrade cmake; brew outdated pkgconfig || brew upgrade pkgconfig; fi
|
||||
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew link --force gettext; fi
|
||||
# ^ odd linking problems related with brew which is not creating links
|
||||
- if [ "$TRAVIS_OS_NAME" = "osx" ] && [ "$Tr_Xcode_Version" = "6.4" ]; then brew update; brew cleanup; brew cask cleanup; brew uninstall --force brew-cask; brew update; brew install Caskroom/cask/xquartz; fi
|
||||
- if [ "$TRAVIS_OS_NAME" = "osx" ] && [ "$Tr_Xcode_Version" = "6.4" ]; then brew install Caskroom/cask/xquartz; fi
|
||||
- if [ "$Tr_Compiler_Version" != "" ] && [ "$Tr_Compiler_Version" != "default" ] && [ "$CC" = "gcc" ]; then export CXX="g++-${Tr_Compiler_Version}" CC="gcc-${Tr_Compiler_Version}"; fi
|
||||
- if [ "$Tr_Compiler_Version" != "" ] && [ "$Tr_Compiler_Version" != "default" ] && [ "$CC" == "clang" ]; then export CXX="clang++-${Tr_Compiler_Version}" CC="clang-${Tr_Compiler_Version}"; fi
|
||||
- $CC --version
|
||||
|
|
@ -70,7 +58,7 @@ before_install:
|
|||
script:
|
||||
# ALL THE BUILD COMMANDS HERE
|
||||
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then mk/linux/build-mg.sh -c 4; fi
|
||||
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then mk/macosx/build-mg.sh -c 4; fi
|
||||
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then mk/macos/build-mg.sh -c 4; fi
|
||||
|
||||
# https://docs.travis-ci.com/user/notifications/#IRC-notification
|
||||
notifications:
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ ENDIF()
|
|||
|
||||
## Compiler flags, CPACK configuration and other Apple specific code.
|
||||
IF(APPLE)
|
||||
include(${PROJECT_SOURCE_DIR}/mk/macosx/CMakeLists.txt)
|
||||
include(${PROJECT_SOURCE_DIR}/mk/macos/CMakeLists.txt)
|
||||
ENDIF(APPLE)
|
||||
|
||||
IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW)
|
||||
|
|
@ -339,7 +339,7 @@ OPTION(WANT_DEV_OUTPATH "Use developer friendly output paths." OFF)
|
|||
IF(UNIX AND "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
|
||||
SET(MEGAGLEST_FRIENDLY_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/mk/linux/")
|
||||
ELSEIF(UNIX AND APPLE)
|
||||
SET(MEGAGLEST_FRIENDLY_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/mk/macosx/")
|
||||
SET(MEGAGLEST_FRIENDLY_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/mk/macos/")
|
||||
ELSEIF(UNIX AND NOT APPLE)
|
||||
SET(MEGAGLEST_FRIENDLY_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/mk/other_unix/")
|
||||
ELSE()
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 8cbf260eca0d37cb569b4421b3d4594d5cbba967
|
||||
Subproject commit fa2a0cac9e6fe0fc3434edc2cad728ecb4b8e6b1
|
||||
|
|
@ -25,7 +25,7 @@ ELSE()
|
|||
FIND_LIBRARY(VORBIS_LIBRARY NAMES vorbis)
|
||||
ENDIF()
|
||||
|
||||
#on macosx the vorbisfile library is part of the vorbisone...
|
||||
#on macos the vorbisfile library is part of the vorbisone...
|
||||
#IF(NOT APPLE)
|
||||
# comment above is full of lies
|
||||
|
||||
|
|
|
|||
|
|
@ -27,11 +27,11 @@ echo
|
|||
echo 'Game Copyright date # before:'
|
||||
grep -E 'Copyright 2010-20[0-9][0-9] The MegaGlest Team' ../../source/glest_game/facilities/game_util.cpp
|
||||
sed -i 's/Copyright 2010-20[0-9][0-9] The MegaGlest Team/Copyright 2010-20'$CurrYear' The MegaGlest Team/' ../../source/glest_game/facilities/game_util.cpp
|
||||
grep -E '© 2001-20[0-9][0-9] The MegaGlest Team' ../../mk/macosx/bundle_resources/Info.plist.in
|
||||
sed -i 's/© 2001-20[0-9][0-9] The MegaGlest Team/© 2001-20'$CurrYear' The MegaGlest Team/' ../../mk/macosx/bundle_resources/Info.plist.in
|
||||
grep -E '© 2001-20[0-9][0-9] The MegaGlest Team' ../../mk/macos/bundle_resources/Info.plist.in
|
||||
sed -i 's/© 2001-20[0-9][0-9] The MegaGlest Team/© 2001-20'$CurrYear' The MegaGlest Team/' ../../mk/macos/bundle_resources/Info.plist.in
|
||||
echo 'Game Copyright date # after:'
|
||||
grep -E 'Copyright 2010-20[0-9][0-9] The MegaGlest Team' ../../source/glest_game/facilities/game_util.cpp
|
||||
grep -E '© 2001-20[0-9][0-9] The MegaGlest Team' ../../mk/macosx/bundle_resources/Info.plist.in
|
||||
grep -E '© 2001-20[0-9][0-9] The MegaGlest Team' ../../mk/macos/bundle_resources/Info.plist.in
|
||||
echo
|
||||
if [ "$modifymore" = "yes" ]; then
|
||||
# const string lastCompatibleSaveGameVersionString = "v3.9.0";
|
||||
|
|
|
|||
|
|
@ -28,9 +28,9 @@ INCLUDE_DIRECTORIES(/usr/X11/include /opt/local/include)
|
|||
|
||||
# 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/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")
|
||||
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/mk/macos/bundle_resources/Info.plist.in"
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/mk/macos/bundle_resources/Info.plist")
|
||||
SET(CPACK_BUNDLE_PLIST "${CMAKE_CURRENT_BINARY_DIR}/mk/macos/bundle_resources/Info.plist")
|
||||
|
||||
include (InstallRequiredSystemLibraries)
|
||||
|
||||
|
|
@ -38,6 +38,6 @@ include (InstallRequiredSystemLibraries)
|
|||
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")
|
||||
SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/mk/macos/bundle_resources/MegaGlest.icns")
|
||||
SET(CPACK_BUNDLE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/mk/macos/bundle_resources/MegaGlest.icns")
|
||||
SET(CPACK_BUNDLE_STARTUP_COMMAND "${PROJECT_SOURCE_DIR}/mk/macos/bundle_resources/MegaGlest.sh")
|
||||
|
|
@ -33,7 +33,7 @@ cp -r "$BINARY_DIR/"* "$APP_GAME_DIR"
|
|||
cp -r "$DATA_DIR/"* "$APP_GAME_DIR"; sleep 0.5s
|
||||
if [ -f "$APP_GAME_DIR/MegaGlest.sh" ]; then rm -f "$APP_GAME_DIR/MegaGlest.sh"; fi
|
||||
|
||||
cp "$CURRENTDIR/build/mk/macosx/bundle_resources/Info.plist" "$APP_PLIST_DIR"
|
||||
cp "$CURRENTDIR/build/mk/macos/bundle_resources/Info.plist" "$APP_PLIST_DIR"
|
||||
cp "$CURRENTDIR/bundle_resources/MegaGlest.icns" "$APP_RES_DIR"
|
||||
cp "$CURRENTDIR/bundle_resources/MegaGlest.sh" "$APP_BIN_DIR"
|
||||
mv "$APP_BIN_DIR/MegaGlest.sh" "$APP_BIN_DIR/MegaGlest"
|
||||
|
|
@ -329,16 +329,16 @@ IF(BUILD_MEGAGLEST)
|
|||
DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH})
|
||||
ELSEIF(UNIX AND APPLE)
|
||||
INSTALL(FILES
|
||||
"${PROJECT_SOURCE_DIR}/mk/macosx/glest.ini"
|
||||
"${PROJECT_SOURCE_DIR}/mk/macos/glest.ini"
|
||||
DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH})
|
||||
IF(WANT_SINGLE_INSTALL_DIRECTORY AND EXISTS "${PROJECT_SOURCE_DIR}/mk/macosx/p7zip/")
|
||||
IF(WANT_SINGLE_INSTALL_DIRECTORY AND EXISTS "${PROJECT_SOURCE_DIR}/mk/macos/p7zip/")
|
||||
INSTALL(DIRECTORY
|
||||
"${PROJECT_SOURCE_DIR}/mk/macosx/p7zip"
|
||||
"${PROJECT_SOURCE_DIR}/mk/macos/p7zip"
|
||||
DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH})
|
||||
ENDIF()
|
||||
IF(WANT_SINGLE_INSTALL_DIRECTORY AND EXISTS "${PROJECT_SOURCE_DIR}/mk/macosx/lib/")
|
||||
IF(WANT_SINGLE_INSTALL_DIRECTORY AND EXISTS "${PROJECT_SOURCE_DIR}/mk/macos/lib/")
|
||||
INSTALL(DIRECTORY
|
||||
"${PROJECT_SOURCE_DIR}/mk/macosx/lib/"
|
||||
"${PROJECT_SOURCE_DIR}/mk/macos/lib/"
|
||||
DESTINATION "${MEGAGLEST_DATA_INSTALL_PATH}/../../Frameworks/")
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
|
@ -348,7 +348,7 @@ IF(BUILD_MEGAGLEST)
|
|||
DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH})
|
||||
IF(UNIX AND APPLE AND NOT WANT_SINGLE_INSTALL_DIRECTORY)
|
||||
INSTALL(FILES
|
||||
"${PROJECT_SOURCE_DIR}/mk/macosx/bundle_resources/MegaGlest.icns"
|
||||
"${PROJECT_SOURCE_DIR}/mk/macos/bundle_resources/MegaGlest.icns"
|
||||
DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH})
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ string getPlatformTypeNameString() {
|
|||
platform = "OpenBSD";
|
||||
|
||||
#elif defined(__APPLE__)
|
||||
platform = "MacOSX";
|
||||
platform = "MacOS";
|
||||
#elif defined(_AIX)
|
||||
platform = "AIX";
|
||||
#elif defined(__ANDROID__)
|
||||
|
|
|
|||
Loading…
Reference in New Issue