Changeset 5738 for code/trunk/src/orxonox/overlays

Timestamp:

Sep 1, 2009, 2:03:05 AM (15 years ago)

Author:

landauf

Message:

merged libraries2 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/overlays/CMakeLists.txt (modified) (1 diff)
• src/orxonox/overlays/FadeoutText.cc (deleted)
• src/orxonox/overlays/FadeoutText.h (deleted)
• src/orxonox/overlays/GUIOverlay.cc (deleted)
• src/orxonox/overlays/GUIOverlay.h (deleted)
• src/orxonox/overlays/InGameConsole.cc (copied) (copied from code/branches/libraries2/src/orxonox/overlays/InGameConsole.cc)
• src/orxonox/overlays/InGameConsole.h (copied) (copied from code/branches/libraries2/src/orxonox/overlays/InGameConsole.h)
• src/orxonox/overlays/Map.cc (copied) (copied from code/branches/libraries2/src/orxonox/overlays/Map.cc)
• src/orxonox/overlays/Map.h (copied) (copied from code/branches/libraries2/src/orxonox/overlays/Map.h)
• src/orxonox/overlays/OverlayText.cc (deleted)
• src/orxonox/overlays/OverlayText.h (deleted)
• src/orxonox/overlays/OverlaysPrereqs.h (deleted)
• src/orxonox/overlays/debug (deleted)
• src/orxonox/overlays/hud (deleted)
• src/orxonox/overlays/stats (deleted)

code/trunk/src/orxonox/overlays/CMakeLists.txt

@@ -2 +2 @@
   OrxonoxOverlay.cc
   OverlayGroup.cc
+
+  InGameConsole.cc
+  Map.cc
 )
-
-SET_SOURCE_FILES(OVERLAYS_SRC_FILES
-  OverlayText.cc
-  FadeoutText.cc
-  GUIOverlay.cc
-)
-
-ADD_SUBDIRECTORY(debug)
-ADD_SUBDIRECTORY(hud)
-ADD_SUBDIRECTORY(stats)
-
-ORXONOX_ADD_LIBRARY(overlays
-  MODULE
-  FIND_HEADER_FILES
-  DEFINE_SYMBOL
-    "OVERLAYS_SHARED_BUILD"
-  PCH_FILE
-    ../OrxonoxPrecompiledHeaders.h
-  LINK_LIBRARIES
-    orxonox
-  SOURCE_FILES ${OVERLAYS_SRC_FILES}
-)