Ver código fonte

fix build for anttweakbar depends

Former-commit-id: 29e0b0fa3c0fa19444400af508911c63e656b63a
Alec Jacobson 10 anos atrás
pai
commit
69984f6706

+ 0 - 4
CMakeLists.txt

@@ -115,10 +115,6 @@ file(GLOB SOURCES
   "${PROJECT_SOURCE_DIR}/include/igl/*.cpp"
 )
 
-### HACKS TO CLEAN
-list(REMOVE_ITEM SOURCES ${ui} ${PROJECT_SOURCE_DIR}/include/igl/cocoa_key_to_anttweakbar_key.cpp)
-list(REMOVE_ITEM SOURCES ${ui} ${PROJECT_SOURCE_DIR}/include/igl/ReAntTweakBar.cpp)
-
 add_library(igl STATIC ${SOURCES})
 
 #### Compile the BBW part

+ 3 - 2
include/igl/ReAntTweakBar.h

@@ -276,9 +276,10 @@ namespace igl
 //TW_API int      TW_CALL TwRemoveVar(TwBar *bar, const char *name);
 //TW_API int      TW_CALL TwRemoveAllVars(TwBar *bar);
 
-#ifndef IGL_STATIC_LIBRARY
+// Until AntTweakBar dependency folder exists, this is header-only
+//#ifndef IGL_STATIC_LIBRARY
 #  include "ReAntTweakBar.cpp"
-#endif
+//#endif
 
 #endif
 #endif

+ 2 - 2
include/igl/cocoa_key_to_anttweakbar_key.h

@@ -22,9 +22,9 @@ namespace igl
   IGL_INLINE int cocoa_key_to_anttweakbar_key(int key);
 }
 
-#ifndef IGL_STATIC_LIBRARY
+//#ifndef IGL_STATIC_LIBRARY
 #  include "cocoa_key_to_anttweakbar_key.cpp"
-#endif
+//#endif
 
 #endif
 #endif