浏览代码

add anttweakbar

Former-commit-id: cd68eabf42b65869da1dcf716a3d9f337cb438a6
Alec Jacobson 10 年之前
父节点
当前提交
6d722dbc97

+ 0 - 2
include/igl/ReAntTweakBar.cpp → include/igl/anttweakbar/ReAntTweakBar.cpp

@@ -6,7 +6,6 @@
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
 #include "ReAntTweakBar.h"
-#ifndef IGL_NO_ANTTWEAKBAR
 
 #include <cstdio>
 #include <cstring>
@@ -921,4 +920,3 @@ IGL_INLINE const std::vector<igl::ReTwCBItem> & igl::ReTwBar::get_cb_items()
 {
   return cb_items;
 }
-#endif

+ 2 - 4
include/igl/ReAntTweakBar.h → include/igl/anttweakbar/ReAntTweakBar.h

@@ -7,7 +7,6 @@
 // obtain one at http://mozilla.org/MPL/2.0/.
 #ifndef IGL_REANTTWEAKBAR_H
 #define IGL_REANTTWEAKBAR_H
-#ifndef IGL_NO_ANTTWEAKBAR
 #include "igl_inline.h"
 // ReAntTweakBar is a minimal wrapper for the AntTweakBar library that allows
 // "bars" to be saved and load from disk. Changing your existing app that uses
@@ -277,9 +276,8 @@ namespace igl
 //TW_API int      TW_CALL TwRemoveAllVars(TwBar *bar);
 
 // Until AntTweakBar dependency folder exists, this is header-only
-//#ifndef IGL_STATIC_LIBRARY
+#ifndef IGL_STATIC_LIBRARY
 #  include "ReAntTweakBar.cpp"
-//#endif
-
 #endif
+
 #endif

+ 0 - 2
include/igl/cocoa_key_to_anttweakbar_key.cpp → include/igl/anttweakbar/cocoa_key_to_anttweakbar_key.cpp

@@ -6,7 +6,6 @@
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
 #include "cocoa_key_to_anttweakbar_key.h"
-#ifndef IGL_NO_ANTTWEAKBAR
 
 #include <AntTweakBar.h>
 
@@ -80,4 +79,3 @@ IGL_INLINE int igl::cocoa_key_to_anttweakbar_key(int key)
   }
   return key;
 }
-#endif

+ 2 - 4
include/igl/cocoa_key_to_anttweakbar_key.h → include/igl/anttweakbar/cocoa_key_to_anttweakbar_key.h

@@ -7,7 +7,6 @@
 // obtain one at http://mozilla.org/MPL/2.0/.
 #ifndef IGL_COCOA_KEY_TO_ANTTWEAKBAR_KEY_H
 #define IGL_COCOA_KEY_TO_ANTTWEAKBAR_KEY_H
-#ifndef IGL_NO_ANTTWEAKBAR
 #include "igl_inline.h"
 
 
@@ -22,9 +21,8 @@ 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