Quellcode durchsuchen

common inc/lib defs

Former-commit-id: 69a7b0fdb1c95a375be9fed946611a757c0caf8c
Alec Jacobson vor 10 Jahren
Ursprung
Commit
4f16bb9575
2 geänderte Dateien mit 40 neuen und 15 gelöschten Zeilen
  1. 0 14
      build/Makefile
  2. 40 1
      build/Makefile.conf

+ 0 - 14
build/Makefile

@@ -85,23 +85,9 @@ INC+=-I../include/
 # DEPENDENCIES
 #############################################################################
 INC+=$(OPENGL_INC)
-
-# Eigen dependency
-ifndef EIGEN3_INC
-	EIGEN3_INC=-I$(DEFAULT_PREFIX)/include/eigen3 -I$(DEFAULT_PREFIX)/include/eigen3/unsupported
-endif
 INC+=$(EIGEN3_INC)
-
-# AntTweakBar dependency
-#ANTTWEAKBAR_INC=-I$(DEFAULT_PREFIX)/include
-ANTTWEAKBAR_INC=-I../external/AntTweakBar/include
 INC+=$(ANTTWEAKBAR_INC)
 
-## OpenGL dependency
-#LIB+=-framework OpenGL
-#LIB+=-framework GLUT
-#LIB+=-framework AppKit
-
 .PHONY: obj
 obj:
 	mkdir -p obj

+ 40 - 1
build/Makefile.conf

@@ -3,6 +3,8 @@
 #############################################################################
 UNAME := $(shell uname)
 
+THIS_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
+
 GG=g++
 #GG=clang++
 #GG=/usr/bin/g++     17s
@@ -199,7 +201,44 @@ endif
 ifndef GLUT_LIB
 	GLUT_LIB=-framework GLUT
 endif
+# Eigen dependency
+ifndef EIGEN3_INC
+	EIGEN3_INC=-I$(DEFAULT_PREFIX)/include/eigen3 -I$(DEFAULT_PREFIX)/include/eigen3/unsupported
+endif
+
+ifndef LIBIGL
+	LIBIGL=$(THIS_DIR)/../
+endif
+LIBIGL_LIB=-L$(LIBIGL)/lib -ligl
+LIBIGL_INC=-I$(LIBIGL)/include
+
+ifndef ANTTWEAKBAR_INC
+	ANTTWEAKBAR_INC=-I$(LIBIGL)/external/AntTweakBar/include
+endif
 ifndef ANTTWEAKBAR_LIB
 	# AntTweakBar needs AppKit on mac os x
-	ANTTWEAKBAR_LIB=-lAntTweakBar -framework AppKit
+	ANTTWEAKBAR_LIB=-L$(LIBIGL)/external/AntTweakBar/lib -lAntTweakBar -framework AppKit
+endif
+
+ifndef SINGULAR_VALUE_DECOMPOSITION_INC
+				SINGULAR_VALUE_DECOMPOSITION_INC=\
+				-I$(LIBIGL)/external/Singular_Value_Decomposition/
+endif
+
+ifndef TETGEN
+# By default I'm using the libigl version. Adjust accordingly
+				TETGEN=$(LIBIGL)/external/tetgen
+				TETGEN_LIB=-L$(TETGEN) -ligltetgen -ltet 
+				TETGEN_INC=-I$(TETGEN)
+endif
+
+ifndef EMBREE
+				EMBREE=$(LIBIGL)/external/embree
+				EMBREE_INC=-I$(EMBREE)/ -I$(EMBREE)/include
+				EMBREE_LIB=-L$(EMBREE)/build -lembree -lsys
+endif
+ifndef YIMG
+				YIMG=$(LIBIGL)/external/yimg
+				YIMG_LIB=-L$(YIMG) -lyimg -lz -L/usr/X11/lib -L$(DEFAULT_PREFIX)/lib -lpng -bind_at_load
+				YIMG_INC=-I/usr/X11/include -I$(YIMG) 
 endif