瀏覽代碼

adding missing embree cmake files:

Former-commit-id: 89399c4e39245ead683745a9f9c9100d69569cbe
Alec Jacobson (jalec 11 年之前
父節點
當前提交
bcf0caee1b
共有 2 個文件被更改,包括 1 次插入7 次删除
  1. 0 6
      .hgignore
  2. 1 1
      examples/ambient-occlusion/Makefile

+ 0 - 6
.hgignore

@@ -4,7 +4,6 @@ syntax: glob
 *.a
 *.dylib
 *~
-*CMakeFiles*
 example
 examples/bbw/bbw_demo_selfcontained/*
 examples/bbw/bbw_demo_selfcontained.zip
@@ -15,11 +14,6 @@ example1
 external/yimg/.git*
 external/tinyxml2/CMakeFiles*
 external/tinyxml2/CMakeCache.txt
-external/embree/bin/*
-external/embree/bin
-external/embree/doc/html/*
-external/embree/doc/latex/*
-*.cmake
 .DS_Store
 libigl.zip
 *tags

+ 1 - 1
examples/ambient-occlusion/Makefile

@@ -27,7 +27,7 @@ INC=$(LIBIGL_INC) $(ANTTWEAKBAR_INC) $(EIGEN3_INC) $(EMBREE_INC)
 LIB=$(OPENGL_LIB) $(GLUT_LIB) $(ANTTWEAKBAR_LIB) $(LIBIGL_LIB) $(EMBREE_LIB)
 
 example: example.o
-	g++ $(OPENMP) $(AFLAGS) $(CFLAGS) -o example example.o $(LIB)
+	g++ $(OPENMP) $(AFLAGS) $(CFLAGS) $(LIB) -o example example.o 
 
 example.o: example.cpp
 	g++ $(OPENMP) $(AFLAGS) $(CFLAGS) -c example.cpp -o example.o $(INC)