citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

Merge pull request #3430 from MerryMage/cpp17 

Bump to C++17
This commit is contained in:
bunnei 2018-02-14 10:05:09 -05:00 committed by GitHub
parent 3c03da12c8 1f04e2e4a1
commit 2cbe4af566
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 41 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis/linux-frozen/build.sh
View File

@ -1,4 +1,4 @@
#!/bin/bash -ex #!/bin/bash -ex
docker pull ubuntu:16.04 docker pull ubuntu:18.04
docker run -e ENABLE_COMPATIBILITY_REPORTING -v $(pwd):/citra ubuntu:16.04 /bin/bash -ex /citra/.travis/linux-frozen/docker.sh docker run -e ENABLE_COMPATIBILITY_REPORTING -v $(pwd):/citra ubuntu:18.04 /bin/bash -ex /citra/.travis/linux-frozen/docker.sh

16
.travis/linux-frozen/docker.sh
View File

@ -9,16 +9,16 @@ apt-get install -y build-essential wget git python-launchpadlib libssl-dev
# The apt repositories remove older versions regularly, so we can't use # The apt repositories remove older versions regularly, so we can't use
# apt-get and have to pull the packages directly from the archives. # apt-get and have to pull the packages directly from the archives.
/citra/.travis/linux-frozen/install_package.py \ /citra/.travis/linux-frozen/install_package.py \
libsdl2-dev 2.0.4+dfsg1-2ubuntu2 xenial \ libsdl2-dev 2.0.7+dfsg1-3ubuntu1 bionic \
qtbase5-dev 5.2.1+dfsg-1ubuntu14.3 trusty \ qtbase5-dev 5.9.3+dfsg-0ubuntu2 bionic \
libqt5opengl5-dev 5.2.1+dfsg-1ubuntu14.3 trusty \ libqt5opengl5-dev 5.9.3+dfsg-0ubuntu2 bionic \
libcurl4-openssl-dev 7.47.0-1ubuntu2.3 xenial \ libcurl4-openssl-dev 7.58.0-2ubuntu1 bionic \
libicu52 52.1-3ubuntu0.6 trusty libicu57 57.1-6ubuntu0.2 bionic
# Get a recent version of CMake # Get a recent version of CMake
wget https://cmake.org/files/v3.9/cmake-3.9.0-Linux-x86_64.sh wget https://cmake.org/files/v3.10/cmake-3.10.1-Linux-x86_64.sh
echo y | sh cmake-3.9.0-Linux-x86_64.sh --prefix=cmake echo y | sh cmake-3.10.1-Linux-x86_64.sh --prefix=cmake
export PATH=/citra/cmake/cmake-3.9.0-Linux-x86_64/bin:$PATH export PATH=/citra/cmake/cmake-3.10.1-Linux-x86_64/bin:$PATH
mkdir build && cd build mkdir build && cd build
cmake .. -DUSE_SYSTEM_CURL=ON -DCMAKE_BUILD_TYPE=Release -DCITRA_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} cmake .. -DUSE_SYSTEM_CURL=ON -DCMAKE_BUILD_TYPE=Release -DCITRA_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"}

2
.travis/linux-frozen/install_package.py
View File

@ -35,4 +35,4 @@ def get_package(pkg, distro):
for i in xrange(1, len(sys.argv), 3): for i in xrange(1, len(sys.argv), 3):
get_package([sys.argv[i], sys.argv[i + 1]], sys.argv[i + 2]) get_package([sys.argv[i], sys.argv[i + 1]], sys.argv[i + 2])
subprocess.check_call(['apt-get', 'install', '-y'] + deb_file_list) subprocess.check_call(['apt-get', 'install', '-y', '--force-yes'] + deb_file_list)

2
.travis/linux/build.sh
View File

@ -1,3 +1,3 @@
#!/bin/bash -ex #!/bin/bash -ex
docker run -e ENABLE_COMPATIBILITY_REPORTING -v $(pwd):/citra ubuntu:16.04 /bin/bash -ex /citra/.travis/linux/docker.sh docker run -e ENABLE_COMPATIBILITY_REPORTING -v $(pwd):/citra ubuntu:18.04 /bin/bash -ex /citra/.travis/linux/docker.sh

2
.travis/linux/deps.sh
View File

@ -1,3 +1,3 @@
#!/bin/sh -ex #!/bin/sh -ex
docker pull ubuntu:16.04 docker pull ubuntu:18.04

6
.travis/linux/docker.sh
View File

@ -6,9 +6,9 @@ apt-get update
apt-get install -y build-essential libsdl2-dev qtbase5-dev libqt5opengl5-dev qttools5-dev qttools5-dev-tools libcurl4-openssl-dev libssl-dev wget git apt-get install -y build-essential libsdl2-dev qtbase5-dev libqt5opengl5-dev qttools5-dev qttools5-dev-tools libcurl4-openssl-dev libssl-dev wget git
# Get a recent version of CMake # Get a recent version of CMake
wget https://cmake.org/files/v3.9/cmake-3.9.0-Linux-x86_64.sh wget https://cmake.org/files/v3.10/cmake-3.10.1-Linux-x86_64.sh
echo y | sh cmake-3.9.0-Linux-x86_64.sh --prefix=cmake echo y | sh cmake-3.10.1-Linux-x86_64.sh --prefix=cmake
export PATH=/citra/cmake/cmake-3.9.0-Linux-x86_64/bin:$PATH export PATH=/citra/cmake/cmake-3.10.1-Linux-x86_64/bin:$PATH
mkdir build && cd build mkdir build && cd build
cmake .. -DUSE_SYSTEM_CURL=ON -DCMAKE_BUILD_TYPE=Release -DENABLE_QT_TRANSLATION=ON -DCITRA_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} cmake .. -DUSE_SYSTEM_CURL=ON -DCMAKE_BUILD_TYPE=Release -DENABLE_QT_TRANSLATION=ON -DCITRA_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"}

2
.travis/macos/build.sh
View File

@ -2,7 +2,7 @@
set -o pipefail set -o pipefail
export MACOSX_DEPLOYMENT_TARGET=10.9 export MACOSX_DEPLOYMENT_TARGET=10.12
export Qt5_DIR=$(brew --prefix)/opt/qt5 export Qt5_DIR=$(brew --prefix)/opt/qt5
mkdir build && cd build mkdir build && cd build

9
CMakeLists.txt
View File

@ -1,5 +1,5 @@
# CMake 3.6 required for FindBoost to define IMPORTED libs properly on unknown Boost versions # CMake 3.8 required for 17 to be a valid value for CXX_STANDARD
cmake_minimum_required(VERSION 3.6) cmake_minimum_required(VERSION 3.8)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules") list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modules") list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modules")
include(DownloadExternals) include(DownloadExternals)
@ -89,7 +89,7 @@ message(STATUS "Target architecture: ${ARCHITECTURE}")
# Configure compilation flags # Configure compilation flags
# =========================== # ===========================
set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
if (NOT MSVC) if (NOT MSVC)
@ -129,9 +129,10 @@ else()
# /permissive- - enables stricter C++ standards conformance checks # /permissive- - enables stricter C++ standards conformance checks
set(CMAKE_C_FLAGS "/W3 /MP /Zi /Zo /permissive-" CACHE STRING "" FORCE) set(CMAKE_C_FLAGS "/W3 /MP /Zi /Zo /permissive-" CACHE STRING "" FORCE)
# /EHsc - C++-only exception handling semantics # /EHsc - C++-only exception handling semantics
# /std:c++latest - Latest available C++ standard
# /Zc:throwingNew - let codegen assume `operator new` will never return null # /Zc:throwingNew - let codegen assume `operator new` will never return null
# /Zc:inline - let codegen omit inline functions in object files # /Zc:inline - let codegen omit inline functions in object files
set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} /EHsc /Zc:throwingNew,inline" CACHE STRING "" FORCE) set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} /EHsc /std:c++latest /Zc:throwingNew,inline" CACHE STRING "" FORCE)
# /MDd - Multi-threaded Debug Runtime DLL # /MDd - Multi-threaded Debug Runtime DLL
set(CMAKE_C_FLAGS_DEBUG "/Od /MDd" CACHE STRING "" FORCE) set(CMAKE_C_FLAGS_DEBUG "/Od /MDd" CACHE STRING "" FORCE)

2
externals/boost vendored

@ -1 +1 @@
Subproject commit 3abc84abaf63a068cb59a9f9b5675c1947bc6fd9 Subproject commit 7310c95e2320ed262b0600315fa2f762c4b6cc54

17
externals/cryptopp/CMakeLists.txt vendored
View File

@ -157,11 +157,18 @@ set(cryptopp_SOURCES
cryptopp/queue.cpp cryptopp/queue.cpp
cryptopp/randpool.cpp cryptopp/randpool.cpp
cryptopp/rdtables.cpp cryptopp/rdtables.cpp
cryptopp/rijndael-simd.cpp
cryptopp/rijndael.cpp cryptopp/rijndael.cpp
cryptopp/rng.cpp cryptopp/rng.cpp
cryptopp/sha-simd.cpp
cryptopp/sha.cpp cryptopp/sha.cpp
cryptopp/sse-simd.cpp
) )
if (MINGW OR WIN32)
list(APPEND cryptopp_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/cryptopp/winpipes.cpp)
endif ()
if(MSVC AND NOT CRYPTOPP_DISABLE_ASM) if(MSVC AND NOT CRYPTOPP_DISABLE_ASM)
if(${CMAKE_GENERATOR} MATCHES ".*ARM") if(${CMAKE_GENERATOR} MATCHES ".*ARM")
message(STATUS "Disabling ASM because ARM is specified as target platform.") message(STATUS "Disabling ASM because ARM is specified as target platform.")
@ -181,6 +188,16 @@ if(MSVC AND NOT CRYPTOPP_DISABLE_ASM)
endif() endif()
endif() endif()
if ((CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT CRYPTOPP_DISABLE_ASM)
if(${CMAKE_GENERATOR} MATCHES ".*ARM")
message(STATUS "Disabling ASM because ARM is specified as target platform.")
else()
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/cryptopp/rijndael-simd.cpp PROPERTIES COMPILE_FLAGS "-msse4.1 -maes")
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/cryptopp/sha-simd.cpp PROPERTIES COMPILE_FLAGS "-msse4.2 -msha")
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/cryptopp/sse-simd.cpp PROPERTIES COMPILE_FLAGS "-msse2")
endif()
endif()
#============================================================================ #============================================================================
# Compile targets # Compile targets
#============================================================================ #============================================================================

2
externals/cryptopp/cryptopp vendored

@ -1 +1 @@
Subproject commit 24bc2b85674254fb294e717eb5b47d9f53e786b8 Subproject commit b6c6684451f925ab2e0b99acbaf66fd487ebfbd5