Changeset 10571 in orxonox.OLD

Timestamp:

Feb 7, 2007, 9:07:16 PM (17 years ago)

Author:

bensch

Message:

cleaned out unused defs files, and moved glincl to grafics, alincl.h to sound

Location:

branches/cleanup/src

Files:

• Makefile.am (modified) (1 diff)
• defs/comincl.h (deleted)
• defs/message_structures.h (deleted)
• defs/orxonox_globals.h (moved) (moved from branches/cleanup/src/defs/globals.h)
• defs/stdincl.h (deleted)
• lib/event/key_mapper.cc (modified) (1 diff)
• lib/graphics/Makefile.am (modified) (2 diffs)
• lib/graphics/glincl.h (moved) (moved from branches/cleanup/src/defs/glincl.h)
• lib/graphics/graphics_engine.cc (modified) (1 diff)
• lib/gui/qt/gui_audio.cc (modified) (1 diff)
• lib/gui/qt/gui_control.cc (modified) (1 diff)
• lib/gui/qt/gui_general.cc (modified) (1 diff)
• lib/gui/qt/gui_video.cc (modified) (1 diff)
• lib/physics/physics_interface.cc (modified) (1 diff)
• lib/sound/alincl.h (moved) (moved from branches/cleanup/src/defs/alincl.h)
• lib/sound/sound_engine.cc (modified) (1 diff)
• lib/util/loading/game_loader.cc (modified) (1 diff)
• lib/util/loading/game_loader.h (modified) (1 diff)
• orxonox.cc (modified) (1 diff)
• subprojects/collision_detection/collision_detection.cc (modified) (1 diff)
• util/track/track.cc (modified) (1 diff)
• util/track/track_manager.cc (modified) (1 diff)
• world_entities/satellite.h (modified) (1 diff)

branches/cleanup/src/Makefile.am

@@ -47 +47 @@
                 orxonox.h \
                 ability.h \
-                defs/message_structures.h \
-                defs/stdincl.h \
                 defs/stdlibincl.h \
                 defs/sdlincl.h \
-                defs/glincl.h \
-                defs/alincl.h \
-                defs/comincl.h \
                 defs/confincl.h \
                 defs/error.h \
-                defs/globals.h \
-                defs/compiler.h \
-                subprojects/benchmark.h
+                defs/orxonox_globals.h \
+                defs/compiler.h
 
 ## orxonox.conf will be used from home-dir instead.

branches/cleanup/src/lib/event/key_mapper.cc

@@ -23 +23 @@
 #include "event_def.h"
 
-#include "globals.h"
+#include "orxonox_globals.h"
 #include "parser/ini_parser/ini_parser.h"
 #include "parser/preferences/preferences.h"

branches/cleanup/src/lib/graphics/Makefile.am

@@ -25 +25 @@
 
 noinst_HEADERS =\
+                glincl.h \
                 graphics_engine.h \
                 graphics_effect.h \
@@ -46 +47 @@
 
 
+
 SUBDIRS =       importer \
                 spatial_separation

branches/cleanup/src/lib/graphics/graphics_engine.cc

@@ -31 +31 @@
 #include "text.h"
 
-#include "globals.h"
+#include "orxonox_globals.h"
 #include "texture.h"
 

branches/cleanup/src/lib/gui/qt/gui_audio.cc

@@ -30 +30 @@
 #include <QtGui/QLCDNumber>
 #include "debug.h"
-#include "globals.h"
+#include "orxonox_globals.h"
 
 #include "qt_gui_elements.h"

branches/cleanup/src/lib/gui/qt/gui_control.cc

@@ -35 +35 @@
 #include "lib/event/key_names.h"
 
-#include "globals.h"
+#include "orxonox_globals.h"
 #include "debug.h"
 #include "qt_gui_elements.h"

branches/cleanup/src/lib/gui/qt/gui_general.cc

@@ -31 +31 @@
 
 #include "debug.h"
-#include "globals.h"
+#include "orxonox_globals.h"
 
 #include "qt_gui_elements.h"

branches/cleanup/src/lib/gui/qt/gui_video.cc

@@ -28 +28 @@
 
 #include <QtGui/QLayout>
-#include "globals.h"
+#include "orxonox_globals.h"
 #include "debug.h"
 

branches/cleanup/src/lib/physics/physics_interface.cc

@@ -27 +27 @@
 
 #include "string.h"
-#include "stdincl.h"
 
 

branches/cleanup/src/lib/sound/sound_engine.cc

@@ -24 +24 @@
 #include "debug.h"
 #include "parser/preferences/preferences.h"
-#include "globals.h"
+#include "orxonox_globals.h"
 #include "resource_sound_buffer.h"
 

branches/cleanup/src/lib/util/loading/game_loader.cc

@@ -23 +23 @@
 #include "debug.h"
 #include "campaign.h"
+#include "compiler.h"
 
 #include "key_mapper.h"

branches/cleanup/src/lib/util/loading/game_loader.h

@@ -9 +9 @@
 //#include "stdincl.h"
 #include "story_def.h"
-#include "comincl.h"
 #include "event_listener.h"
 

branches/cleanup/src/orxonox.cc

@@ -28 +28 @@
 #include "orxonox.h"
 
-#include "globals.h"
+#include "orxonox_globals.h"
 
 #include "gui/qt/qt_gui.h"

branches/cleanup/src/subprojects/collision_detection/collision_detection.cc

@@ -28 +28 @@
 #include "model.h"
 #include "collision_test_entity.h"
-#include "list.h"
 
 #include "graphics_engine.h"

branches/cleanup/src/util/track/track.cc

@@ -25 +25 @@
 #include "util/loading/load_param.h"
 #include "track/track.h"
-
+#include "glincl.h"
 #include "p_node.h"
-
-#include "stdincl.h"
 
 #include "debug.h"

branches/cleanup/src/util/track/track_manager.cc

@@ -22 +22 @@
 #include "p_node.h"
 #include "track_node.h"
-#include "stdincl.h"
 #include "text.h"
 #include "t_animation.h"

branches/cleanup/src/world_entities/satellite.h

@@ -8 +8 @@
 
 #include "world_entity.h"
-#include "comincl.h"
 
 class CharacterAttributes;