Commit Graph
36 Commits
Author SHA1 Message Date
Alec Jacobson 6174a89c7a Merge branch 'master' of github.com:libigl/libigl into alecjacobson 2016-10-20 22:02:05 -04:00
Alec Jacobson 723d5cd6eb move bbw with active set to main lib, rm bbw extra, create mosek::bbw 2016-10-20 12:31:13 -04:00
Daniele Panozzo 1dc17bb6c8 Merge branch 'python_bindings' of https://github.com/s-koch/libigl 2016-10-19 09:19:17 -04:00
Oded Stein 6a11468213 Added R2016b to MATLAB versions 2016-09-20 13:58:46 -04:00
Sebastian Koch 1bfdf9b30e Merge branch 'master-upstream' into python_bindings 2016-09-14 19:13:03 +02:00
Olga Diamanti 95c6b1d0cf Merge branch 'master' of https://github.com/libigl/libigl 2016-08-01 08:50:19 -07:00
Daniele Panozzo 63bfc2d248 wrong option in the cmake file 2016-07-31 17:08:28 -04:00
Daniele Panozzo 4b1c1b6a26 fix for duplicate symbols in stbi
fix for uninitialized memory in nanogui
2016-07-31 16:13:21 -04:00
Sebastian Koch 0b056eb7df Fixed OpenGL linking problems with new version of GLFW 2016-07-13 12:41:45 +02:00
Olga Diamanti 7c5c08f5dc Merge branch 'master' of https://github.com/libigl/libigl 2016-07-12 09:35:11 -07:00
Daniele Panozzo 11f7d59227 Merge commit '8c6e743cc184155461631cd92dd52029d86c37b9'
# Conflicts:
#	python/modules/py_igl_viewer.cpp
2016-07-06 14:56:52 -04:00
Olga Diamanti 03a58d0b0c Merge branch 'master' of https://github.com/libigl/libigl 2016-07-05 11:05:07 -07:00
Alec Jacobson 44eb65128d merge 2016-06-13 10:51:53 -04:00
Daniele Panozzo 866ecac9a9 fix for double symbols in stbi
fixes for VS2015
2016-06-12 21:39:09 -04:00
Alec Jacobson 04731985f0 swept volume tutorial, extra libs vars in CMakeLists 2016-06-12 16:38:35 -04:00
Alec Jacobson 8ff1d72146 anttweakbar support 2016-06-09 18:58:29 -04:00
Olga Diamanti 84d67e1456 had to change CMAKE_MODULE_PATH to override the default findMatlab.cmake of Cmake 3.5
added version 2016a to findMatlab.cmake
2016-05-25 14:11:39 +02:00
Alec Jacobson 121e36cd63 better compilation/warnings 2016-05-19 19:31:07 -04:00
Alec Jacobson 710d07045b mosek dir left out for iglbbw 2016-05-19 10:46:41 -04:00
Alec Jacobson 9d0e14a035 fix anttweakbar include handling 2016-03-31 14:10:51 -04:00
Daniele Panozzo 76f2a7ad72 fixed copy dll path 2016-03-30 21:27:33 -04:00
Daniele Panozzo 6a285a1dfa visual studio 2015 fix for nanogui 2016-03-20 23:41:39 -04:00
Alec Jacobson b44cb68b3d separate boolean code to cgal and cork, fix cmake for lib and tutorial 2016-03-17 18:23:42 -04:00
Alec Jacobson afecf1677e place libraries in /lib folder 2016-03-17 15:49:39 -04:00
Romain Prévost d740fc2b9f fixed MSVC runtime issue
disable warnings
2016-03-09 10:04:47 +01:00
Romain Prévost 33c92219e9 embree static fixed 2016-03-08 17:49:02 +01:00
Romain Prévost 3c2daf540c Update CMakeLists.txt 2016-03-08 15:53:54 +01:00
Daniele Panozzo aaf998ef33 disable build of glew on macosx 2016-03-08 08:36:32 -05:00
Romain Prévost 5d4e0e7fb9 glew fix 2016-03-08 14:14:57 +01:00
Romain Prévost 2b6b43eb7b cgal/boolean cmake fix
viewer cmake fix
2016-03-08 00:57:18 +01:00
Romain Prévost 649ee34ddd glew fix 2016-03-07 10:54:10 +01:00
Romain Prévost 2cd2d17780 updated cmake version 2016-03-06 23:23:32 +01:00
Romain Prévost 2180bca0fd fixing main cmake to avoid cmake pollution
travis linux updated cmake
2016-03-06 22:55:04 +01:00
Romain Prévost fb21b7486d fixing main cmake to avoid cmake pollution 2016-03-06 11:57:37 +01:00
Daniele Panozzo 52846f23d3 minor linux fixes (ubuntu 15.04) 2016-03-04 14:03:09 -05:00
Daniele Panozzo 583a456e12 cleaned up the cmake folder
moved cmake to shared/cmake
2016-03-03 16:49:07 -05:00