Merge with develop
This commit is contained in:
parent
1ae9e6c9f1
commit
7036702324
4 changed files with 27 additions and 12 deletions
code
dist/snap
|
@ -28,8 +28,6 @@ ELSE()
|
|||
ENDIF()
|
||||
|
||||
MACRO(APPEND_DEFINITION _NAME _VAL)
|
||||
# value is not empty
|
||||
IF(${_VAL})
|
||||
IF(CMAKE_VERSION VERSION_LESS "2.8.12")
|
||||
# don't support logical expressions, append definition
|
||||
LIST(APPEND ${_NAME} "-D${_VAL}")
|
||||
|
@ -37,7 +35,6 @@ MACRO(APPEND_DEFINITION _NAME _VAL)
|
|||
# support logical expressions, use them
|
||||
LIST(APPEND ${_NAME} "$<$<BOOL:${_VAL}>:-D$<JOIN:${_VAL},-D>>")
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
ENDMACRO()
|
||||
|
||||
# Set PCH_FLAGS for common flags, PCH_ARCH_XXX_FLAGS for specific archs flags and PCH_ARCHS for archs
|
||||
|
|
|
@ -832,10 +832,17 @@ MACRO(NL_SETUP_BUILD)
|
|||
ELSE()
|
||||
# Always force -mmacosx-version-min to override environement variable
|
||||
IF(CMAKE_OSX_DEPLOYMENT_TARGET)
|
||||
IF(CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS "10.7")
|
||||
MESSAGE(FATAL_ERROR "Minimum target for OS X is 10.7 but you're using ${CMAKE_OSX_DEPLOYMENT_TARGET}")
|
||||
ENDIF()
|
||||
SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -Wl,-macosx_version_min,${CMAKE_OSX_DEPLOYMENT_TARGET}")
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
# use libc++ under OX X to be able to use new C++ features (and else it'll use GCC 4.2.1 STL)
|
||||
# minimum target is now OS X 10.7
|
||||
ADD_PLATFORM_FLAGS("-stdlib=libc++")
|
||||
|
||||
SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -Wl,-headerpad_max_install_names")
|
||||
|
||||
IF(HAVE_FLAG_SEARCH_PATHS_FIRST)
|
||||
|
@ -852,6 +859,9 @@ MACRO(NL_SETUP_BUILD)
|
|||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
# use c++0x standard to use std::unique_ptr and std::shared_ptr
|
||||
ADD_PLATFORM_FLAGS("-std=c++0x")
|
||||
|
||||
ADD_PLATFORM_FLAGS("-D_REENTRANT")
|
||||
|
||||
# hardening
|
||||
|
|
|
@ -715,8 +715,13 @@ int CConfigFile::compareInstallersVersion() const
|
|||
|
||||
QString newVersion = QApplication::applicationVersion();
|
||||
|
||||
#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
|
||||
QVersionNumber installedVer = QVersionNumber::fromString(installedVersion);
|
||||
QVersionNumber newVer = QVersionNumber::fromString(newVersion);
|
||||
#else
|
||||
QString installedVer = installedVersion;
|
||||
QString newVer = newVersion;
|
||||
#endif
|
||||
|
||||
// same version
|
||||
if (newVer == installedVer) return 0;
|
||||
|
|
7
dist/snap/snapcraft.yaml
vendored
7
dist/snap/snapcraft.yaml
vendored
|
@ -42,11 +42,14 @@ parts:
|
|||
- -DRYZOM_GAMES_PREFIX=bin
|
||||
build-packages:
|
||||
- zlib1g-dev
|
||||
- libpng-dev
|
||||
- libpng12-dev
|
||||
- libjpeg8-dev
|
||||
- qttools5-dev-tools
|
||||
- libxml2-dev
|
||||
- libssl-dev
|
||||
- libqt5opengl5-dev
|
||||
stage-packages:
|
||||
- libqt5widgets5
|
||||
|
||||
- libqt5opengl5
|
||||
after: [desktop-qt5]
|
||||
|
||||
|
|
Loading…
Reference in a new issue