mirror of
https://github.com/loot/libloot.git
synced 2026-07-27 14:16:01 -07:00
Use GCC 5.
Since it's got full C++11 support.
This commit is contained in:
@@ -11,6 +11,7 @@ addons:
|
||||
apt:
|
||||
sources:
|
||||
- boost-latest
|
||||
- ubuntu-toolchain-r-test
|
||||
packages:
|
||||
- libboost-log1.55-dev
|
||||
- libboost-date-time1.55-dev
|
||||
@@ -19,8 +20,12 @@ addons:
|
||||
- libboost-locale1.55-dev
|
||||
- libboost-iostreams1.55-dev
|
||||
- libssl-dev
|
||||
- gcc-5
|
||||
- g++-5
|
||||
|
||||
install:
|
||||
# Use GCC 5.
|
||||
- if [ "$CXX" = "g++" ]; then export CXX="g++-5" CC="gcc-5"; fi
|
||||
# Currently inside the cloned repo path.
|
||||
# Install Alphanum
|
||||
- cd ../..
|
||||
|
||||
+2
-2
@@ -188,8 +188,8 @@ ENDIF ()
|
||||
|
||||
# GCC and MinGW settings.
|
||||
IF (CMAKE_COMPILER_IS_GNUCXX)
|
||||
set (CMAKE_C_FLAGS "-m${PROJECT_ARCH} -O3 -std=c++0x")
|
||||
set (CMAKE_CXX_FLAGS "-m${PROJECT_ARCH} -O3 -std=c++0x")
|
||||
set (CMAKE_C_FLAGS "-m${PROJECT_ARCH} -O3 -std=c++11")
|
||||
set (CMAKE_CXX_FLAGS "-m${PROJECT_ARCH} -O3 -std=c++11")
|
||||
IF (PROJECT_STATIC_RUNTIME)
|
||||
set (CMAKE_EXE_LINKER_FLAGS "-static-libstdc++ -static-libgcc")
|
||||
set (CMAKE_SHARED_LINKER_FLAGS "-static-libstdc++ -static-libgcc")
|
||||
|
||||
Reference in New Issue
Block a user