Browse Source

static build on windows, added linux build

Former-commit-id: 412c00446925c663b8517bc8f153ada083a005bb
Daniele Panozzo 9 years ago
parent
commit
001d26fae3
3 changed files with 23 additions and 21 deletions
  1. 1 1
      .appveyor.yml
  2. 21 19
      .travis.yml
  3. 1 1
      README.md

+ 1 - 1
.appveyor.yml

@@ -13,7 +13,7 @@ build_script:
   - cd c:\projects\libigl\tutorial
   - mkdir build
   - cd build
-  - cmake -G "Visual Studio 14 2015 Win64" ../
+  - cmake -D "LIBIGL_USE_STATIC_LIBRARY=ON" -G "Visual Studio 14 2015 Win64" ../
   - set MSBuildLogger="C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
   - set MSBuildOptions=/v:m /p:Configuration=Release /logger:%MSBuildLogger%
   - msbuild %MSBuildOptions% libigl_tutorials.sln

+ 21 - 19
.travis.yml

@@ -2,25 +2,27 @@ language: cpp
 sudo: false
 matrix:
   include:
-    # - os: linux
-    #   compiler: gcc-4.8.1
-    #   script:
-    #     - git submodule update --init --recursive
-    #     - cd tutorial
-    #     - mkdir build
-    #     - cd build
-    #     - CXXFLAGS="-mno-rtm" cmake -DCMAKE_CXX_COMPILER=g++-4.8 ../
-    #     - make -j 2
-    #   addons:
-    #     apt:
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-    #         - kalakris-cmake
-    #       packages:
-    #         - g++-4.8
-    #         - libglu1-mesa-dev
-    #         - libxxf86vm-dev
-    #         - cmake
+    - os: linux
+      compiler: gcc-4.8.1
+      script:
+        - git submodule update --init --recursive
+        - mkdir external/nanogui/ext/glfw/include/GL
+        - wget -P external/nanogui/ext/glfw/include/GL http://www.opengl.org/registry/api/GL/glcorearb.h
+        - cd tutorial
+        - mkdir build
+        - cd build
+        - cmake -DCMAKE_CXX_COMPILER=g++-4.8 ../
+        - make -j 2
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - kalakris-cmake
+    #       packages: cmake build-essential xorg-dev libglu1-mesa-dev g++-4.8
+            - xorg-dev
+            - libglu1-mesa-dev
+            - g++-4.8
+            - cmake
     #         - binutils
     #         - libx11-dev
     #         - mesa-common-dev

+ 1 - 1
README.md

@@ -1,6 +1,6 @@
 # libigl - A simple C++ geometry processing library
 [![Build Status](https://travis-ci.org/libigl/libigl.svg?branch=master)](https://travis-ci.org/libigl/libigl)
-
+[![Build status](https://ci.appveyor.com/api/projects/status/mf3t9rnhco0vhly8?svg=true)](https://ci.appveyor.com/project/danielepanozzo/libigl-6hjk1)
 ![](libigl-teaser.png)
 
 <https://github.com/libigl/libigl/>