add travis build for OSX and fix travis build for Linux
This commit is contained in:
parent
e0664f7887
commit
3c52692ffc
@ -1,10 +1,14 @@
|
||||
language: c
|
||||
language: cpp
|
||||
os:
|
||||
- linux
|
||||
- osx
|
||||
branches:
|
||||
only:
|
||||
- master
|
||||
compiler:
|
||||
- gcc
|
||||
- clang
|
||||
before_install:
|
||||
- cp golded3/mygolded.__h golded3/mygolded.h
|
||||
script:
|
||||
- ./dist-gpl.sh
|
||||
- make
|
||||
|
@ -123,8 +123,12 @@ ifeq ($(PLATFORM),osx) # Mac OSX
|
||||
CAT=cat
|
||||
SED=sed
|
||||
GREP=grep
|
||||
ifndef CC
|
||||
CC=gcc
|
||||
endif
|
||||
ifndef CXX
|
||||
CXX=g++
|
||||
endif
|
||||
AR=ar
|
||||
RANLIB=ranlib
|
||||
PLATFORM=osx
|
||||
@ -141,8 +145,12 @@ else # Linux, *BSD or another unix-like OS
|
||||
CAT=cat
|
||||
SED=sed
|
||||
GREP=grep
|
||||
ifndef CC
|
||||
CC=gcc
|
||||
endif
|
||||
ifndef CXX
|
||||
CXX=g++
|
||||
endif
|
||||
AR=ar
|
||||
RANLIB=ranlib
|
||||
PLATFORM=lnx
|
||||
|
Reference in New Issue
Block a user