Commit Graph
47 Commits
Author SHA1 Message Date
Julian Panetta 8e933d55e5 Revert to unconditionally adding GLEW on Linux/Windows;
NanoGui doesn't add it like it adds GLFW.


Former-commit-id: 5fe2133c5c
2017-02-02 14:26:07 -05:00
Julian Panetta 0a47cbf143 Work-around for GLFW+GLEW+NANOGUI CMake conflict
Former-commit-id: c7b023dbac
2017-02-02 14:04:35 -05:00
Daniele Panozzo e5f1c4d258 glew fix
Former-commit-id: e98d790285
2017-02-02 10:56:47 -05:00
Alec Jacobson ab7ccca931 compiling on dgp linux server
Former-commit-id: 5585695fe2
2017-01-23 10:57:23 -05:00
Alec Jacobson 9914a76269 attempt to fix glew issue
Former-commit-id: 421c9bc959
2017-01-23 08:21:48 -05:00
Alec Jacobson 0663d656eb attempt to clean up opengl mess
Former-commit-id: c316aeb99e
2017-01-22 16:51:14 -05:00
Alec Jacobson f629770813 fix linux/windows opengl include?
Former-commit-id: 34b6ccf513
2017-01-10 02:53:58 -05:00
Alec Jacobson 9f6ec5ded2 attempt to fix windows errors
Former-commit-id: 3a62064434
2017-01-10 02:42:00 -05:00
Alec Jacobson 863073619a libiglfoo.a --> libigl_foo.a, acknowledge that viewer needs opengl and glfw in cmake
Former-commit-id: dfd107368b
2017-01-10 02:08:47 -05:00
Alec Jacobson 6ca42fd80e libs
Former-commit-id: 1b396cf07d
2016-11-10 14:57:16 -05:00
Alec Jacobson 2a34aa72bc glfw missing libraries (how was this ever working?)
Former-commit-id: feb26b33ec
2016-11-10 09:26:42 -05:00
Alec Jacobson 8beb89fea9 Merge branch 'master' of github.com:libigl/libigl into alecjacobson
Former-commit-id: 6174a89c7a
2016-10-20 22:02:05 -04:00
Alec Jacobson c76993c791 move bbw with active set to main lib, rm bbw extra, create mosek::bbw
Former-commit-id: 723d5cd6eb
2016-10-20 12:31:13 -04:00
Daniele Panozzo 303641e6b3 Merge branch 'python_bindings' of https://github.com/s-koch/libigl
Former-commit-id: 1dc17bb6c8
2016-10-19 09:19:17 -04:00
Oded Stein 9c318ef669 Added R2016b to MATLAB versions
Former-commit-id: 6a11468213
2016-09-20 13:58:46 -04:00
Sebastian Koch 19f547093e Merge branch 'master-upstream' into python_bindings
Former-commit-id: 1bfdf9b30e
2016-09-14 19:13:03 +02:00
Olga Diamanti 4e0024d7c4 Merge branch 'master' of https://github.com/libigl/libigl
Former-commit-id: 95c6b1d0cf
2016-08-01 08:50:19 -07:00
Daniele Panozzo cc7db43154 wrong option in the cmake file
Former-commit-id: 63bfc2d248
2016-07-31 17:08:28 -04:00
Daniele Panozzo 2e44825c2b fix for duplicate symbols in stbi
fix for uninitialized memory in nanogui


Former-commit-id: 4b1c1b6a26
2016-07-31 16:13:21 -04:00
Sebastian Koch 8b9bb47883 Fixed OpenGL linking problems with new version of GLFW
Former-commit-id: 0b056eb7df
2016-07-13 12:41:45 +02:00
Olga Diamanti 029ca814bf Merge branch 'master' of https://github.com/libigl/libigl
Former-commit-id: 7c5c08f5dc
2016-07-12 09:35:11 -07:00
Daniele Panozzo f0ecda1418 Merge commit '5ba386306b0e1dc605941711a21d6031132d8094 [formerly 8c6e743cc1]'
# Conflicts:
#	python/modules/py_igl_viewer.cpp


Former-commit-id: 11f7d59227
2016-07-06 14:56:52 -04:00
Olga Diamanti b0f4367e2f Merge branch 'master' of https://github.com/libigl/libigl
Former-commit-id: 03a58d0b0c
2016-07-05 11:05:07 -07:00
Alec Jacobson 4fb43d6b45 merge
Former-commit-id: 44eb65128d
2016-06-13 10:51:53 -04:00
Daniele Panozzo 0daf9e09f6 fix for double symbols in stbi
fixes for VS2015


Former-commit-id: 866ecac9a9
2016-06-12 21:39:09 -04:00
Alec Jacobson 98472b1610 swept volume tutorial, extra libs vars in CMakeLists
Former-commit-id: 04731985f0
2016-06-12 16:38:35 -04:00
Alec Jacobson 98f500be2a anttweakbar support
Former-commit-id: 8ff1d72146
2016-06-09 18:58:29 -04:00
Olga Diamanti b562595605 had to change CMAKE_MODULE_PATH to override the default findMatlab.cmake of Cmake 3.5
added version 2016a to findMatlab.cmake


Former-commit-id: 84d67e1456
2016-05-25 14:11:39 +02:00
Alec Jacobson 94b7d07f84 better compilation/warnings
Former-commit-id: 121e36cd63
2016-05-19 19:31:07 -04:00
Alec Jacobson cd4f91b47f mosek dir left out for iglbbw
Former-commit-id: 710d07045b
2016-05-19 10:46:41 -04:00
Alec Jacobson 812f18eced fix anttweakbar include handling
Former-commit-id: 9d0e14a035
2016-03-31 14:10:51 -04:00
Daniele Panozzo b0dffafd69 fixed copy dll path
Former-commit-id: 76f2a7ad72
2016-03-30 21:27:33 -04:00
Daniele Panozzo 600279e5b0 visual studio 2015 fix for nanogui
Former-commit-id: 6a285a1dfa
2016-03-20 23:41:39 -04:00
Alec Jacobson dab8fad5dd separate boolean code to cgal and cork, fix cmake for lib and tutorial
Former-commit-id: b44cb68b3d
2016-03-17 18:23:42 -04:00
Alec Jacobson f82600e16f place libraries in /lib folder
Former-commit-id: afecf1677e
2016-03-17 15:49:39 -04:00
Romain Prévost 16ab2f55ab fixed MSVC runtime issue
disable warnings


Former-commit-id: d740fc2b9f
2016-03-09 10:04:47 +01:00
Romain Prévost 999332505b embree static fixed
Former-commit-id: 33c92219e9
2016-03-08 17:49:02 +01:00
Romain Prévost e4b1ec60bf Update CMakeLists.txt
Former-commit-id: 3c2daf540c
2016-03-08 15:53:54 +01:00
Daniele Panozzo eca7fd635e disable build of glew on macosx
Former-commit-id: aaf998ef33
2016-03-08 08:36:32 -05:00
Romain Prévost 868ca77100 glew fix
Former-commit-id: 5d4e0e7fb9
2016-03-08 14:14:57 +01:00
Romain Prévost e5e4bb0fe0 cgal/boolean cmake fix
viewer cmake fix


Former-commit-id: 2b6b43eb7b
2016-03-08 00:57:18 +01:00
Romain Prévost c33eb3ab83 glew fix
Former-commit-id: 649ee34ddd
2016-03-07 10:54:10 +01:00
Romain Prévost 5548464b67 updated cmake version
Former-commit-id: 2cd2d17780
2016-03-06 23:23:32 +01:00
Romain Prévost 240ec6dfe6 fixing main cmake to avoid cmake pollution
travis linux updated cmake


Former-commit-id: 2180bca0fd
2016-03-06 22:55:04 +01:00
Romain Prévost 48b50e575e fixing main cmake to avoid cmake pollution
Former-commit-id: fb21b7486d
2016-03-06 11:57:37 +01:00
Daniele Panozzo 0364f7ea5c minor linux fixes (ubuntu 15.04)
Former-commit-id: 52846f23d3
2016-03-04 14:03:09 -05:00
Daniele Panozzo d3f8584205 cleaned up the cmake folder
moved cmake to shared/cmake


Former-commit-id: 583a456e12
2016-03-03 16:49:07 -05:00