Merge pull request #62 from jeefo/travis-fix

Travis fix

.travis.yml

@@ -1,32 +1,23 @@
 addons:
   apt:
     packages:
-    - clang-3.8
     - lib32stdc++6
     - lib32z1-dev
     - libc6-dev-i386
     - linux-libc-dev
     - gcc-multilib
     - g++-multilib
-    sources:
-    - llvm-toolchain-precise-3.8
-    - ubuntu-toolchain-r-test
 language: cpp
-branches:
-  only:
-    - master
 compiler:
   - clang
+os:
+  - linux
+  - osx
 before_script:
-  - sudo wget https://yapb.ru/ci/crosstool/osxcross.tar.gz -O /tmp/osxcross.tgz && mkdir -p /tmp/osxcross/target && tar xzf /tmp/osxcross.tgz -C /tmp/osxcross/target/
-  - export PATH=$PATH:/tmp/osxcross/target/bin
   - wget https://yapb.ru/ci/scripts/gitrev.sh && chmod a+x ./gitrev.sh && ./gitrev.sh
 script:
-  - cd project && CC=clang-3.8 make all
+  - cd project && CC=clang && make all
 after_success:
-  - curl --ftp-create-dirs -T ./release/yapb.so -u $FTP_USER:$FTP_PASS ftp://$FTP_HOST/project/release/yapb.so
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then curl --ftp-create-dirs -T ./release/yapb.so -u $FTP_USER:$FTP_PASS ftp://$FTP_HOST/project/release/yapb.so && curl --ftp-create-dirs -T ./debug/yapb.so -u $FTP_USER:$FTP_PASS ftp://$FTP_HOST/project/debug/yapb.so && curl -X GET "https://yapb.ru/agent/packager.php?key=$PACKAGER_KEY&os=linux"; fi
-  - curl --ftp-create-dirs -T ./debug/yapb.so -u $FTP_USER:$FTP_PASS ftp://$FTP_HOST/project/debug/yapb.so
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then curl --ftp-create-dirs -T ./release/yapb.dylib -u $FTP_USER:$FTP_PASS ftp://$FTP_HOST/project/release/yapb.dylib && curl --ftp-create-dirs -T ./debug/yapb.dylib -u $FTP_USER:$FTP_PASS ftp://$FTP_HOST/project/debug/yapb.dylib && curl -X GET "https://yapb.ru/agent/packager.php?key=$PACKAGER_KEY&os=osx"; fi
-  - curl --ftp-create-dirs -T ./release/yapb.dylib -u $FTP_USER:$FTP_PASS ftp://$FTP_HOST/project/release/yapb.dylib
-  - curl --ftp-create-dirs -T ./debug/yapb.dylib -u $FTP_USER:$FTP_PASS ftp://$FTP_HOST/project/debug/yapb.dylib
-  - curl -X GET "https://yapb.ru/agent/packager.php?key=$PACKAGER_KEY&os=posix"
   

project/makefile

@@ -24,7 +24,7 @@ ifeq "$(DEBUG)" "true"
 	COMPILER_FLAGS += -D_DEBUG -DDEBUG -g3
 	BINARY_DIR = debug
 else
-	COMPILER_FLAGS += -DNDEBUG -pipe -Ofast -msse$(COMPILER_SSE_VERSION) -funroll-loops -fomit-frame-pointer -fno-stack-protector -fvisibility=hidden -fvisibility-inlines-hidden
+	COMPILER_FLAGS += -DNDEBUG -pipe -O2 -msse$(COMPILER_SSE_VERSION) -funroll-loops -fomit-frame-pointer -fno-stack-protector -fvisibility=hidden -fvisibility-inlines-hidden
 	BINARY_DIR = release
 endif
 
@@ -32,17 +32,13 @@ INCLUDE = -I../include -I../include/engine
 COMPILER = $(CC)
 
 ifeq "$(shell uname -s)" "Darwin"
-	MACOS = true
+	OSX = true
-else
-	ifeq "$(MACOS)" "true"
-		COMPILER = o32-clang
-	endif
 endif
 
-ifeq "$(MACOS)" "true"
+ifeq "$(OSX)" "true"
 	LIBRARY_EXT = dylib
 	COMPILER_FLAGS += -DOSX -D_OSX -DPOSIX
-	LINKER_FLAGS += -dynamiclib -lstdc++ -mmacosx-version-min=10.5 -arch i386
+	LINKER_FLAGS += -dynamiclib -lstdc++ -mmacosx-version-min=10.12 -arch i386
 else
 	LIBRARY_EXT = so
 	COMPILER_FLAGS += -DLINUX -D_LINUX -DPOSIX
@@ -52,12 +48,11 @@ endif
 BINARY_OUTPUT = $(PROJECT).$(LIBRARY_EXT)
 
 ifeq ($(findstring clang,$(COMPILER)),clang)
-	COMPILER_FLAGS += -D__extern_always_inline="extern __always_inline"
+	ifeq "$(OSX)" "false"
-	ifeq "$(MACOS)" "false"
 		LINKER_FLAGS += -lgcc_eh
 	endif
 else ifeq ($(findstring gcc,$(COMPILER)),gcc)
-	ifneq "$(MACOS)" "false"
+	ifneq "$(OSX)" "false"
 		LINKER_FLAGS += -static-libgcc
 		COMPILER_FLAGS += -funroll-all-loops
 	endif
@@ -86,23 +81,9 @@ release:
 debug:
 	$(MAKE) compile DEBUG=true
 
-release_macos:
+all:
-	$(MAKE) compile MACOS=true DEBUG=false
-
-debug_macos:
-	$(MAKE) compile MACOS=true DEBUG=true
-
-all_linux:
 	$(MAKE) compile DEBUG=true
 	$(MAKE) compile DEBUG=false
-
-all_macos:
-	$(MAKE) compile MACOS=true DEBUG=false
-	$(MAKE) compile MACOS=true DEBUG=true
-
-all: all_linux all_macos
-default: all_linux
-
 clean:
 	rm -rf release/*.o
 	rm -rf release/$(BINARY_OUTPUT)