fix: gcc multilib

This commit is contained in:
jonnypower 2018-04-29 16:01:56 -07:00
parent aa013ca998
commit 2ccb671db0
4 changed files with 11 additions and 1 deletions

View File

@ -5,6 +5,10 @@ matrix:
- os: linux
compiler: gcc
script: cd main/source/linux && make
packages:
- g++-6
- g++-6-multilib
- gcc-multilib
- os: osx
compiler: clang

0
main/source/includes/lpng1251/configure vendored Normal file → Executable file
View File

View File

@ -11,12 +11,18 @@ GLUT_HOME =/usr/local/contrib/unmoderated
MP = #-mp -DPARTICLE_MP
OS:=$(shell uname)
# Make it real fast on an Origin 2000.
#LNO =-LNO:opt=1:fusion=2:fission=2:fusion_peeling_limit=2048:cs1=32K:cs2=8M
COPT = $(MP) -O3 $(LNO) -fPIC
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)
CFLAGS +="-target i386-apple-darwin -DCMAKE_OSX_ARCHITECTURES=i386"
endif
POBJS =action_api.o actions.o HLRender.o opengl.o system.o
ALL = libparticleMP.a
@ -31,7 +37,7 @@ all: $(ALL)
libparticleMP.a: $(POBJS)
rm -f $@
ar clq $@ $(POBJS)
$(C++) -dynamiclib -undefined suppress -flat_namespace *.o -o libparticles.dylib
SPDir:
(make)