Просмотр исходного кода

makefile adjustments for iOS

Former-commit-id: c06f4d4bcce12741e608e5572f5ced0b2253d01f
Stefan Messmer 11 лет назад
Родитель
Сommit
36f509dde3
3 измененных файлов с 35 добавлено и 1 удалено
  1. 15 0
      Makefile
  2. 19 0
      Makefile.conf
  3. 1 1
      include/igl/bbw/Makefile

+ 15 - 0
Makefile

@@ -1,5 +1,6 @@
 .PHONY: all
 all: lib extras examples
+ios: lib extras lib/igl.framework/
 
 GG=g++
 #GG=clang++
@@ -68,6 +69,7 @@ extras:
 # SOURCE 
 #############################################################################
 CPP_FILES=$(wildcard include/igl/*.cpp)
+H_FILES=$(wildcard include/igl/*.h)
 OBJ_FILES=$(addprefix obj/,$(notdir $(CPP_FILES:.cpp=.o)))
 
 # include igl headers
@@ -105,7 +107,20 @@ lib/libigl.a: $(OBJ_FILES)
 obj/%.o: include/igl/%.cpp include/igl/%.h
 	$(GG) $(CFLAGS) $(AFLAGS) -c -o $@ $< $(INC)
 
+lib/igl.framework/:
+	rm -rf 
+	mkdir -p $@
+	cp lib/* $@
+	cp $(H_FILES) $@/Headers
+	for p in  $(EXTRA_DIRS); \
+	do \
+	echo "cd $$p" ; \
+	cp *.h ../../$@/Headers/bbw; \
+	done
+
+
 clean:
+	rm -rf lib/igl.framework/
 	rm -f obj/*.o
 	rm -f lib/libigl.a
 	make -C examples clean

+ 19 - 0
Makefile.conf

@@ -111,6 +111,25 @@ ifeq ($(IGL_USERNAME),chrsch)
   endif
 endif
 
+ifeq ($(IGL_USERNAME),stefanmessmer) 
+	GG=clang++
+	IGL_WITH_TETGEN=0
+	IGL_WITH_EMBREE=0
+	IGL_WITH_MATLAB=0
+	IGL_WITH_MOSEK=0
+	IGL_WITH_BBW=1
+	IGL_WITH_PNG=0
+	IGL_WITH_XML=0
+	IGL_WITH_BOOST=0
+	#OPENGL_INC=-I$(DEFAULT_PREFIX)/include
+	#OPENGL_LIB=-lGL -lGLU
+	# Glut is needed only for examples
+	#GLUT_LIB=-lglut
+	#ANTTWEAKBAR_LIB=-lAntTweakBar
+	OPENPMP = -openmp
+	AFLAGS= -DIGL_NO_MOSEK -DIGL_NO_ANTTWEAKBAR -DIGL_NO_OPENGL -arch armv7s -arch armv7 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk
+endif
+
 
 
 #############################################################################

+ 1 - 1
include/igl/bbw/Makefile

@@ -52,7 +52,7 @@ obj:
 	ar cqs $@ $(OBJ_FILES)
 
 obj/%.o: %.cpp %.h
-	g++ $(AFLAGS) $(CFLAGS) -c -o $@ $< $(INC)
+	$(GG) $(AFLAGS) $(CFLAGS) -c -o $@ $< $(INC)
 
 clean:
 	rm -f obj/*.o