Ver código fonte

Use latest glbinding release instead of git head

Thomas Buck 9 anos atrás
pai
commit
d61505c809
2 arquivos alterados com 8 adições e 11 exclusões
  1. 0
    8
      README.md
  2. 8
    3
      cmake/travis_script_linux.sh

+ 0
- 8
README.md Ver arquivo

@@ -20,14 +20,6 @@ Visit the IRC Channel `#OpenRaider` on `chat.freenode.net` ([Webchat](http://web
20 20
 * [SDL2](http://www.libsdl.org) or [GLFW](http://www.glfw.org)
21 21
 * [OpenAL](http://www.openal.org) & [ALUT](https://github.com/vancegroup/freealut) (optional, needed for sound output)
22 22
 
23
-Mac OS X with XCode and [MacPorts](http://www.macports.org) installed (or replace `libsdl2` by `glfw`):
24
-
25
-    sudo port install cmake glm libsdl2
26
-
27
-Unfortunately, glbinding is not available as binary. But it can be built and installed from source easily. To create a distributable Bundle with glbinding in the default location, do this before running `make install`:
28
-
29
-    sudo install_name_tool -id /usr/local/lib/libglbinding.dylib /usr/local/lib/libglbinding.dylib
30
-
31 23
 ## Building
32 24
 
33 25
 The basic steps needed to build and run OpenRaider:

+ 8
- 3
cmake/travis_script_linux.sh Ver arquivo

@@ -6,10 +6,14 @@ if [ "$CXX" = "g++" ]; then export CXX="g++-4.8"; fi
6 6
 if [ "$CC" = "clang" ]; then export CC="clang-3.5"; fi
7 7
 if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.5"; fi
8 8
 
9
-# Need to build current glbinding from source
10
-git clone https://github.com/hpicgs/glbinding.git
11
-cd glbinding
9
+# Need to build latest glbinding from source
10
+GLBVER=`curl https://api.github.com/repos/hpicgs/glbinding/releases/latest | grep -m1 tag_name | cut -d\" -f4`
11
+curl -L https://github.com/hpicgs/glbinding/archive/${GLBVER}.tar.gz | tar xzf -
12
+cd glbinding-${GLBVER#v}
13
+
14
+# Hacky fix to allow building glbinding with clang on Linux
12 15
 sed -i 's/  -Werror/  /g' cmake/PlatformLinuxGCC.cmake
16
+
13 17
 mkdir build
14 18
 cd build
15 19
 cmake ..
@@ -18,5 +22,6 @@ sudo make install
18 22
 cd ..
19 23
 cd ..
20 24
 
25
+# Build OpenRaider and run the unit tests
21 26
 mkdir build && cd build && cmake .. && make -j 4 && make check
22 27
 

Carregando…
Cancelar
Salvar