Browse Source

Added Mac Travis build steps

Thomas Buck 10 years ago
parent
commit
cfd39a06ba

+ 2
- 5
.travis.yml View File

@@ -12,12 +12,9 @@ install:
12 12
     - if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake/travis_install_linux.sh; fi
13 13
     - if [ "$TRAVIS_OS_NAME" = "osx" ]; then cmake/travis_install_mac.sh; fi
14 14
 
15
-before_script:
16
-    - if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake/travis_before_script_linux.sh; fi
17
-    - if [ "$TRAVIS_OS_NAME" = "osx" ]; then cmake/travis_before_script_mac.sh; fi
18
-
19 15
 script:
20
-    - (mkdir build && cd build && cmake .. && make)
16
+    - if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake/travis_script_linux.sh; fi
17
+    - if [ "$TRAVIS_OS_NAME" = "osx" ]; then cmake/travis_script_mac.sh; fi
21 18
 
22 19
 notifications:
23 20
     irc:

+ 1
- 0
cmake/travis_before_install_mac.sh View File

@@ -1,3 +1,4 @@
1 1
 #!/bin/bash
2 2
 
3
+brew update
3 4
 

+ 0
- 3
cmake/travis_before_script_mac.sh View File

@@ -1,3 +0,0 @@
1
-#!/bin/bash
2
-
3
-

+ 1
- 0
cmake/travis_install_mac.sh View File

@@ -1,3 +1,4 @@
1 1
 #!/bin/bash
2 2
 
3
+brew install sdl2 sdl2_ttf freealut cmake
3 4
 

cmake/travis_before_script_linux.sh → cmake/travis_script_linux.sh View File

@@ -3,3 +3,5 @@
3 3
 if [ "$CC" = "gcc" ]; then export CC="gcc-4.8"; fi
4 4
 if [ "$CXX" = "g++" ]; then export CXX="g++-4.8"; fi
5 5
 
6
+mkdir build && cd build && cmake .. && make
7
+

+ 4
- 0
cmake/travis_script_mac.sh View File

@@ -0,0 +1,4 @@
1
+#!/bin/bash
2
+
3
+mkdir build && cd build && cmake .. && make
4
+

Loading…
Cancel
Save