Browse Source

Another try for Linux Travis

Thomas Buck 9 years ago
parent
commit
4a9753e3f6
2 changed files with 1 additions and 2 deletions
  1. 1
    0
      cmake/travis_script_linux.sh
  2. 0
    2
      src/deps/imgui/imconfig.h

+ 1
- 0
cmake/travis_script_linux.sh View File

3
 if [ "$CC" = "gcc" ]; then export CC="gcc-4.8"; fi
3
 if [ "$CC" = "gcc" ]; then export CC="gcc-4.8"; fi
4
 if [ "$CXX" = "g++" ]; then export CXX="g++-4.8"; fi
4
 if [ "$CXX" = "g++" ]; then export CXX="g++-4.8"; fi
5
 
5
 
6
+if [ "$CC" = "clang" ]; then export CC="clang-3.5"; fi
6
 if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.5"; fi
7
 if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.5"; fi
7
 
8
 
8
 git clone https://github.com/hpicgs/glbinding.git
9
 git clone https://github.com/hpicgs/glbinding.git

+ 0
- 2
src/deps/imgui/imconfig.h View File

30
 #define IMGUI_INCLUDE_IMGUI_USER_H
30
 #define IMGUI_INCLUDE_IMGUI_USER_H
31
 
31
 
32
 //---- Define implicit cast operators to convert back<>forth from your math types and ImVec2/ImVec4.
32
 //---- Define implicit cast operators to convert back<>forth from your math types and ImVec2/ImVec4.
33
-#include <glm/vec2.hpp>
34
 #define IM_VEC2_CLASS_EXTRA                                                \
33
 #define IM_VEC2_CLASS_EXTRA                                                \
35
         ImVec2(const glm::vec2& f) { x = f.x; y = f.y; }                   \
34
         ImVec2(const glm::vec2& f) { x = f.x; y = f.y; }                   \
36
         operator glm::vec2() const { return glm::vec2(x, y); }
35
         operator glm::vec2() const { return glm::vec2(x, y); }
37
 
36
 
38
-#include <glm/vec4.hpp>
39
 #define IM_VEC4_CLASS_EXTRA                                                \
37
 #define IM_VEC4_CLASS_EXTRA                                                \
40
         ImVec4(const glm::vec4& f) { x = f.x; y = f.y; z = f.z; w = f.w; } \
38
         ImVec4(const glm::vec4& f) { x = f.x; y = f.y; z = f.z; w = f.w; } \
41
         operator glm::vec4() const { return glm::vec4(x,y,z,w); }
39
         operator glm::vec4() const { return glm::vec4(x,y,z,w); }

Loading…
Cancel
Save