Changeset 9869 in orxonox.OLD for trunk/src/Makefile.am

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/Makefile.am (modified) (2 diffs)

trunk/src/Makefile.am

@@ -37 +37 @@
                 orxonox.cc \
                 \
-                lib/particles/model_particles.cc \
-                lib/particles/spark_particles.cc \
-                lib/particles/sprite_particles.cc \
-                lib/particles/plane_emitter.cc \
-                lib/graphics/effects/fog_effect.cc \
-                lib/graphics/effects/volfog_effect.cc \
-                lib/graphics/effects/rain_effect.cc \
-                lib/graphics/effects/snow_effect.cc \
-                lib/graphics/effects/cloud_effect.cc \
-                lib/graphics/effects/lightning_effect.cc \
-                lib/graphics/effects/lense_flare.cc \
-                \
                 util/multiplayer_team_deathmatch.cc \
                 util/singleplayer_shootemup.cc \
@@ -69 +57 @@
                 defs/confincl.h \
                 defs/error.h \
-                defs/debug.h \
                 defs/globals.h \
                 defs/compiler.h \
-                defs/class_id.h \
+                defs/class_id_DEPRECATED.h \
                 subprojects/benchmark.h