Changeset 9869 in orxonox.OLD for trunk/src/defs

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..

Location:

trunk/src/defs

Files:

• class_id.h (deleted)
• class_id_DEPRECATED.h (copied) (copied from branches/new_class_id/src/defs/class_id_DEPRECATED.h)
• debug.h (deleted)
• include_paths.am (modified) (2 diffs)

trunk/src/defs/include_paths.am

@@ -13 +13 @@
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/spatial_separation
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/render2D
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/particles
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui/gl
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui/gl/glmenu
@@ -21 +20 @@
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/math
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/network
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/tinyxml
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/physics
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/physics/fields
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/collision_detection
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/collision_reaction
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/newmat
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/sound
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/script_engine
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/defs
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/font
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/network
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/ai
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/util
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/animation
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/common
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/track
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/subprojects
+
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/../extern_libs