ensl/NS
0
0
Fork 0
mirror of https://github.com/ENSL/NS.git synced 2025-03-25 19:51:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

g++7 for linux travisci and adding stdlib to osx makefile

Browse source
This commit is contained in:
pierow 2018-08-05 22:25:48 -04:00
parent d84484fd37
commit 4f0f49409f
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.travis.yml
View file

@ -8,9 +8,11 @@ matrix:
env: OPJ_CI_ARCH=i386
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- gcc-multilib
- g++-multilib
- gcc-7-multilib
- g++-7-multilib
- libc6-i386
- libcurl4-openssl-dev:i386
- libpng12-dev:i386

2
main/source/linux/Makefile
View file

@ -61,7 +61,7 @@ ifeq ($(OS),Darwin)
CC ="$(COMPILER_BIN_DIR)/clang -Qunused-arguments -isysroot $(SDKROOT) -mmacosx-version-min=10.5 -fasm-blocks -I$(SDKROOT)/usr/include/malloc $(ARCH_FLAGS)"
endif
ifeq ($(origin CPLUS), default)
CPLUS ="$(COMPILER_BIN_DIR)/clang++ -std=c++14 -Qunused-arguments -isysroot $(SDKROOT) -mmacosx-version-min=10.5 -fasm-blocks -I$(SDKROOT)/usr/include/malloc $(ARCH_FLAGS)"
CPLUS ="$(COMPILER_BIN_DIR)/clang++ -std=c++14 -stdlib=libc++ -Qunused-arguments -isysroot $(SDKROOT) -mmacosx-version-min=10.5 -fasm-blocks -I$(SDKROOT)/usr/include/malloc $(ARCH_FLAGS)"
endif
LINK ?= $(CPLUS)
endif