add travis build for OSX and fix travis build for Linux

This commit is contained in:
Alexander Skovpen 2018-07-12 15:24:09 +03:00 committed by dukelsky
parent e0664f7887
commit 3c52692ffc
2 changed files with 14 additions and 2 deletions

View File

@ -1,10 +1,14 @@
language: c language: cpp
os: os:
- linux - linux
- osx
branches:
only:
- master
compiler: compiler:
- gcc - gcc
- clang - clang
before_install: before_install:
- cp golded3/mygolded.__h golded3/mygolded.h - cp golded3/mygolded.__h golded3/mygolded.h
script: script:
- ./dist-gpl.sh - make

View File

@ -123,8 +123,12 @@ ifeq ($(PLATFORM),osx) # Mac OSX
CAT=cat CAT=cat
SED=sed SED=sed
GREP=grep GREP=grep
ifndef CC
CC=gcc CC=gcc
endif
ifndef CXX
CXX=g++ CXX=g++
endif
AR=ar AR=ar
RANLIB=ranlib RANLIB=ranlib
PLATFORM=osx PLATFORM=osx
@ -141,8 +145,12 @@ else # Linux, *BSD or another unix-like OS
CAT=cat CAT=cat
SED=sed SED=sed
GREP=grep GREP=grep
ifndef CC
CC=gcc CC=gcc
endif
ifndef CXX
CXX=g++ CXX=g++
endif
AR=ar AR=ar
RANLIB=ranlib RANLIB=ranlib
PLATFORM=lnx PLATFORM=lnx