Text archives Help

---

Author: abe
Date: Sat Oct 14 00:04:49 2006
New Revision: 1224

Modified:
   trunk/Engine/Factory/RegisterKnownComponents.cc
   trunk/UserInterface/CMakeLists.txt
Log:

Removed PromptUI from the build, it was causing a circular dependency
between Factory.so and UserInterface.so. (We'll look into a more
reasonable fix to the problem next week.)

M    UserInterface/CMakeLists.txt
M    Engine/Factory/RegisterKnownComponents.cc



Modified: trunk/Engine/Factory/RegisterKnownComponents.cc
==============================================================================
--- trunk/Engine/Factory/RegisterKnownComponents.cc     (original)
+++ trunk/Engine/Factory/RegisterKnownComponents.cc     Sat Oct 14 00:04:49 
2006
@@ -61,7 +61,7 @@
 #include <Model/Groups/BVH.h>
 #include <Model/Groups/GriddedGroup.h>
 #include <Model/Groups/Group.h>
-#include <UserInterface/PromptUI.h>
+// #include <UserInterface/PromptUI.h>
 #include <UserInterface/XWindowUI.h>
 #include <UserInterface/NullUI.h>
 #include <UserInterface/CameraPathAutomator.h>
@@ -128,7 +128,7 @@
 
     // Register user interfaces
     engine->registerComponent("null", &NullUI::create);
-    engine->registerComponent("prompt", &PromptUI::create);
+    //     engine->registerComponent("prompt", &PromptUI::create);
     engine->registerComponent("X", &XWindowUI::create);
     engine->registerComponent("camerapath", &CameraPathAutomator::create);
 

Modified: trunk/UserInterface/CMakeLists.txt
==============================================================================
--- trunk/UserInterface/CMakeLists.txt  (original)
+++ trunk/UserInterface/CMakeLists.txt  Sat Oct 14 00:04:49 2006
@@ -5,14 +5,17 @@
   CameraPathAutomator.h
   CameraPathAutomator.cc
   NullUI.h
-  PromptUI.h
-  PromptUI.cc
+  # PromptUI.h
+  # PromptUI.cc
   SyncFrameAutomator.cc
   SyncFrameAutomator.h
   XWindowUI.h
   XWindowUI.cc
   )
 
-TARGET_LINK_LIBRARIES(Manta_UserInterface Manta_Engine Manta_Interface
-                      Manta_Core_XUtils Manta_Core)
+TARGET_LINK_LIBRARIES(Manta_UserInterface 
+                      Manta_Engine 
+                      Manta_Interface
+                      Manta_Core_XUtils 
+                      Manta_Core)
 TARGET_LINK_LIBRARIES(Manta_UserInterface ${OPENGL_LIBRARIES} 
${X11_LIBRARIES})

---

• [MANTA] r1224 - in trunk: Engine/Factory UserInterface, abe, 10/14/2006

---

Archive powered by MHonArc 2.6.16.