Remove unused libs

CMakeLists.txt

@@ -2,7 +2,11 @@
 
 project ("surfseg")
 
+if (DEFINED ENV{GEL_LIB_ROOT_DIR})
+	set (GEL_LIB_ROOT_DIR "$ENV{GEL_LIB_ROOT_DIR}")
+else ()
 	set (GEL_LIB_ROOT_DIR ${PROJECT_SOURCE_DIR}/../GEL)
+endif ()
 
 set (CMAKE_CXX_STANDARD 14)
 
@@ -12,15 +16,14 @@ endif ()
 
 if (WIN32)
 	# For Windows we manually specify the location of the header- and lib directories
-    set (EXT_LIB_ROOT_DIR ${PROJECT_SOURCE_DIR}/../../../lib)
+	# For other OSs we assume the compiler can find them on its own
 	if (CMAKE_SIZEOF_VOID_P EQUAL 8)
 		# 64 bits
-		link_directories (${EXT_LIB_ROOT_DIR}/freeglut/lib/x64 ${EXT_LIB_ROOT_DIR}/glew-2.1.0/lib/Release/x64 ${GEL_LIB_ROOT_DIR}/GEL_WIN/x64/${CMAKE_BUILD_TYPE})
+		link_directories (${GEL_LIB_ROOT_DIR}/GEL_WIN/x64/${CMAKE_BUILD_TYPE})
 	elseif (CMAKE_SIZEOF_VOID_P EQUAL 4)
 		# 32 bits
-		link_directories (${EXT_LIB_ROOT_DIR}/freeglut/lib ${EXT_LIB_ROOT_DIR}/glew-2.1.0/lib/Release/Win32 ${GEL_LIB_ROOT_DIR}/GEL_WIN/${CMAKE_BUILD_TYPE})
+		link_directories (${GEL_LIB_ROOT_DIR}/GEL_WIN/${CMAKE_BUILD_TYPE})
 	endif ()
-    include_directories (${EXT_LIB_ROOT_DIR}/freeglut/include ${EXT_LIB_ROOT_DIR}/glew-2.1.0/include)
 endif ()
 include_directories (${PROJECT_SOURCE_DIR}/surfseg/include ${PROJECT_SOURCE_DIR}/surfseg/src ${GEL_LIB_ROOT_DIR}/src)
 

surfseg/matlab/CMakeLists.txt

 find_package(Matlab)
 
+if (DEFINED ENV{MESH_LIB_ROOT_DIR})
+	set (MESH_LIB_ROOT_DIR "$ENV{MESH_LIB_ROOT_DIR}")
+else ()
 	set (MESH_LIB_ROOT_DIR ${PROJECT_SOURCE_DIR}/../MESH)
+endif ()
+
 
 if (Matlab_FOUND)
 	include_directories (${Matlab_INCLUDE_DIRS})
 	include_directories (${PROJECT_SOURCE_DIR}/surfseg/include ${PROJECT_SOURCE_DIR}/surfseg/src)
 	include_directories (${GEL_LIB_ROOT_DIR}/src ${MESH_LIB_ROOT_DIR} ${MESH_LIB_ROOT_DIR}/lib3d/include)
 	if (WIN32)
+		if (NOT DEFINED CMAKE_BUILD_TYPE)
+			# If this was not specified, we assume a release build
+			set (CMAKE_BUILD_TYPE Release)
+		endif ()
 		link_directories (${MESH_LIB_ROOT_DIR}/build/x64-${CMAKE_BUILD_TYPE})
 	else ()
 		link_directories (${MESH_LIB_ROOT_DIR}/build)

surfseg/matlab/compile_mex.m

-mex mex_surfcut.cpp matlab_util.cpp -I../include -I../src -I../../../GEL/src CXXFLAGS="-std=c++14 -fPIC" -L../../build/surfseg/src -lsurfseg
-mex mex_ksurfcut.cpp matlab_util.cpp -I../include -I../src -I../../../GEL/src CXXFLAGS="-std=c++14 -fPIC" -L../../build/surfseg/src -lsurfseg
-mex mex_surfcut_planesep.cpp matlab_util.cpp -I../include -I../src -I../../../GEL/src CXXFLAGS="-std=c++14 -fPIC" -L../../build/surfseg/src -lsurfseg
-mex mex_surfcut_planesep_dual.cpp matlab_util.cpp -I../include -I../src -I../../../GEL/src CXXFLAGS="-std=c++14 -fPIC" -L../../build/surfseg/src -lsurfseg
-mex mex_surfcut_planesep_qpbo.cpp matlab_util.cpp -I../include -I../src -I../../../GEL/src CXXFLAGS="-std=c++14 -fPIC" -L../../build/surfseg/src -lsurfseg
-
-mex mex_surfcut_4d.cpp matlab_util.cpp -I../include -I../src -I../../../GEL/src CXXFLAGS="-std=c++14 -fPIC" -L../../build/surfseg/src -lsurfseg
-
-mex mex_gauss_curvature.cpp matlab_util.cpp -I../include -I../src -I../../../GEL/src CXXFLAGS="-std=c++14 -fPIC" -L../../build/surfseg/src -lsurfseg
-mex mex_star_intersect.cpp matlab_util.cpp -I../include -I../src -I../../../GEL/src CXXFLAGS="-std=c++14 -fPIC" -L../../build/surfseg/src -lsurfseg
-mex mex_subdiv_icosahedron.cpp matlab_util.cpp -I../include -I../src -I../../../GEL/src CXXFLAGS="-std=c++14 -fPIC" -L../../build/surfseg/src -lsurfseg
-mex mex_hausdorff.cpp matlab_util.cpp -I../include -I../src -I../../../GEL/src -I../../../MESH -I../../../MESH/lib3d/include CXXFLAGS="-std=c++14 -fPIC" -LDFLAGS="-fPIC" -L../../build/surfseg/src -L../../../MESH/build -lsurfseg -lmesh
+% You may need to modify these to fit your system
+GEL_LIB_ROOT_DIR = '../../../GEL';
+MESH_LIB_ROOT_DIR = '../../../MESH';
+BUILD_DIR = '../../build/surfseg/src';
+
+COMMON_ARGS = {'matlab_util.cpp','-I../include','-I../src',...
+    ['-I',GEL_LIB_ROOT_DIR,'/src'],...
+    ['-I',MESH_LIB_ROOT_DIR],['-I',MESH_LIB_ROOT_DIR,'/lib3d/include'],...
+    'CXXFLAGS="-std=c++14 -fPIC"',['-L',BUILD_DIR],'-lsurfseg'};
+
+mex('mex_surfcut.cpp',COMMON_ARGS{:});
+mex('mex_ksurfcut.cpp',COMMON_ARGS{:});
+mex('mex_surfcut_planesep.cpp',COMMON_ARGS{:});
+mex('mex_surfcut_planesep_dual.cpp',COMMON_ARGS{:});
+mex('mex_surfcut_planesep_qpbo.cpp',COMMON_ARGS{:});
+
+mex('mex_surfcut_4d.cpp',COMMON_ARGS{:});
+
+mex('mex_gauss_curvature.cpp',COMMON_ARGS{:});
+mex('mex_star_intersect.cpp',COMMON_ARGS{:});
+mex('mex_subdiv_icosahedron.cpp',COMMON_ARGS{:});
+mex('mex_hausdorff.cpp',COMMON_ARGS{:});

surfseg/src/CMakeLists.txt

@@ -7,14 +7,4 @@ target_compile_definitions (surfseg PRIVATE NO_OPENGL)
 
 set_property(TARGET surfseg PROPERTY POSITION_INDEPENDENT_CODE ON)
 
-# Setup linking for all targets
-foreach (EXE ObjView SubIcoView DscView DscSmooth SurfSegment SmoothMesh surfseg)
-	target_link_libraries(${EXE} GEL)
-	if (LINUX)
-		target_link_libraries (${EXE} GL GLU glut)
-	elseif (WIN32)
-		target_link_libraries (${EXE} glew32 glut32)
-	else ()
-		message (FATAL_ERROR "Apple not supported -- you can maybe use the linux target")
-	endif ()
-endforeach ()
+target_link_libraries(surfseg GEL)
\ No newline at end of file

surfseg/src/manifold_mesh.cpp

@@ -7,8 +7,6 @@
 #include <algorithm>
 #include <cmath>
 
-#include <GL/glew.h>
-
 #include "manifold_mesh.h"
 #include "util.h"