ensl/NS
0
0
Fork 0
mirror of https://github.com/ENSL/NS.git synced 2024-11-25 22:11:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

revert gcc g++ version for travis

Browse source
This commit is contained in:
pierow 2018-08-07 02:16:05 -04:00
parent 38bf6c80e8
commit 7cf4db2810
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.travis.yml
View file

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

2
main/source/particle/Makefile
View file

@ -15,7 +15,7 @@ MP = #-mp -DPARTICLE_MP
#LNO =-LNO:opt=1:fusion=2:fission=2:fusion_peeling_limit=2048:cs1=32K:cs2=8M #LNO =-LNO:opt=1:fusion=2:fission=2:fusion_peeling_limit=2048:cs1=32K:cs2=8M
COPT = $(MP) -O3 $(LNO) -fPIC COPT = $(MP) -O3 $(LNO) -fPIC
CFLAGS = $(COPT) $(COMPFLAGS) -I. -I.. -I$(GLUT_HOME)/include -I/usr/include/c++/7/ -I../common -I../public -I../pm_shared -I../engine CFLAGS = $(COPT) $(COMPFLAGS) -I. -I.. -I$(GLUT_HOME)/include -I/usr/include/c++/4.8/ -I../common -I../public -I../pm_shared -I../engine
POBJS =action_api.o actions.o HLRender.o opengl.o system.o POBJS =action_api.o actions.o HLRender.o opengl.o system.o

2
main/source/particles/Makefile
View file

@ -17,7 +17,7 @@ OS:=$(shell uname)
#LNO =-LNO:opt=1:fusion=2:fission=2:fusion_peeling_limit=2048:cs1=32K:cs2=8M #LNO =-LNO:opt=1:fusion=2:fission=2:fusion_peeling_limit=2048:cs1=32K:cs2=8M
COPT = $(MP) -O3 $(LNO) -fPIC COPT = $(MP) -O3 $(LNO) -fPIC
CFLAGS = $(COPT) $(COMPFLAGS) -I. -I.. -I$(GLUT_HOME)/include -I/usr/include/c++/7/ -I../common -I../public -I../pm_shared -I../engine CFLAGS = $(COPT) $(COMPFLAGS) -I. -I.. -I$(GLUT_HOME)/include -I/usr/include/c++/4.8/ -I../common -I../public -I../pm_shared -I../engine
ifeq ($(OS),Darwin) ifeq ($(OS),Darwin)
SLIBB = libtool -static *.o -o libparticleMP.a SLIBB = libtool -static *.o -o libparticleMP.a