Changeset 3498 in orxonox.OLD for orxonox/branches/trackManager/src/Makefile.am

Timestamp:

Mar 11, 2005, 11:59:58 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/trackManager: merged trunk back to tracManager R3440:3497 → 3498
merged with command:
svn merge ../trunk/ trackManager/ -r 3430:HEAD
conflicts resolved in favor of the Trunk

File:

• orxonox/branches/trackManager/src/Makefile.am (modified) (2 diffs)

orxonox/branches/trackManager/src/Makefile.am

@@ -1 @@
-#AM_CXXFLAGS=""
+MAINSRCDIR=.
+AM_CXXFLAGS=-I$(MAINSRCDIR)
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/world_entities
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/story_entities
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/coord
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/data
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gaphics
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/font
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/importer
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/lang
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/util
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/math
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/defs
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/font
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/network
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/glmenu
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/ai
+
+
 AM_LDFLAGS= $(MWINDOWS)
 
@@ -8 +28 @@
 
 orxonox_SOURCES= orxonox.cc \
-                 world.cc \
-                 player.cc \
-                 collision.cc \
-                 data_tank.cc \
-                 world_entity.cc \
-                 vector.cc \
+                 game_loader.cc \
+                 command_node.cc \
+                 keynames.cc \
                  camera.cc \
-                 command_node.cc \
-                 ini_parser.cc \
-                 keynames.cc \
-                 base_entity.cc \
-                 game_loader.cc \
-                 campaign.cc \
-                 story_entity.cc \
-                 environment.cc \
-                 importer/model.cc \
-                 importer/objModel.cc \
-                 importer/array.cc \
-                 importer/material.cc \
-                 importer/texture.cc \
-                 list.cc \
-                 p_node.cc \
-                 null_parent.cc \
-                 track_node.cc \
-                 base_object.cc \
-                 helper_parent.cc \
                  track_manager.cc \
-                 matrix.cc \
-                 curve.cc \
-                 glmenu_imagescreen.cc \
-                 skysphere.cc 
+                 light.cc \
+                 story_entities/story_entity.cc \
+                 story_entities/campaign.cc \
+                 story_entities/world.cc \
+                 world_entities/world_entity.cc \
+                 world_entities/player.cc \
+                 world_entities/environment.cc \
+                 world_entities/skysphere.cc \
+                 ai/ai.cc \
+                 lib/coord/p_node.cc \
+                 lib/coord/null_parent.cc \
+                 lib/coord/helper_parent.cc \
+                 lib/data/data_tank.cc \
+                 lib/graphics/font/fontset.cc \
+                 lib/graphics/importer/array.cc \
+                 lib/graphics/importer/objModel.cc \
+                 lib/graphics/importer/model.cc \
+                 lib/graphics/importer/material.cc \
+                 lib/graphics/importer/texture.cc \
+                 lib/lang/base_entity.cc \
+                 lib/lang/base_object.cc \
+                 lib/util/ini_parser.cc \
+                 lib/util/list.cc \
+                 lib/math/vector.cc \
+                 lib/math/matrix.cc \
+                 lib/math/curve.cc \
+                 glmenu/glmenu_imagescreen.cc 
 
-noinst_HEADERS = ability.h \
-                 data_tank.h \
-                 collision.h \
-                 npc.h \
-                 stdincl.h \
-                 ai.h \
-                 environment.h \
-                 orxonox.h \
-                 synchronisable.h \
-                 base_entity.h \
-                 error.h \
-                 player.h \
+noinst_HEADERS = orxonox.h \
+                 game_loader.h \
+                 track_manager.h \
+                 ability.h \
                  camera.h \
-                 ini_parser.h \
-                 power_up.h \
-                 vector.h \
                  keynames.h \
                  proto_class.h \
-                 world.h \
                  command_node.h \
-                 list.h \
-                 shoot_laser.h \
-                 world_entity.h \
                  message_structures.h \
-                 shoot_rocket.h \
-                 list_template.h \
-                 story_entity.h \
-                 story_def.h \
-                 game_loader.h \
-                 campaign.h \
-                 p_node.h \
-                 null_parent.h \
-                 base_object.h \
-                 helper_parent.h \
-                 track_manager.h \
-                 matrix.h \
-                 curve.h \
-                 glmenu_imagescreen.h \
-                 debug.h \
-                 skysphere.h
+                 light.h \
+                 story_entities/story_entity.h \
+                 story_entities/story_def.h \
+                 story_entities/campaign.h \
+                 story_entities/world.h \
+                 world_entities/world_entity.h \
+                 world_entities/player.h \
+                 world_entities/npc.h \
+                 world_entities/environment.h \
+                 world_entities/skysphere.h \
+                 world_entities/shoot_laser.h \
+                 world_entities/shoot_rocket.h \
+                 world_entities/power_up.h \
+                 ai/ai.h \
+                 network/synchronisable.h \
+                 defs/stdincl.h \
+                 defs/glincl.h \
+                 defs/error.h \
+                 defs/debug.h \
+                 lib/coord/p_node.h \
+                 lib/coord/null_parent.h \
+                 lib/coord/helper_parent.h \
+                 lib/graphics/font/fontset.h \
+                 lib/data/data_tank.h \
+                 lib/lang/base_entity.h \
+                 lib/lang/base_object.h \
+                 lib/util/list.h \
+                 lib/util/list_template.h \
+                 lib/util/ini_parser.h \
+                 lib/math/vector.h \
+                 lib/math/matrix.h \
+                 lib/math/curve.h \
+                 glmenu/glmenu_imagescreen.h 
+
 
 ## orxonox.conf will be used from home-dir instead.
 EXTRA_DIST = orxonox.conf
 
-### GTK_RELATED
-if HAVE_GTK2
-  GTK_PROGS =console
-else
-  GTK_PROGS =
-endif
 if SUB_PROJECTS
-  SUB_PROGS = importer \
-              gui \
-              $(GTK_PROGS)
+  SUB_PROGS = lib
 else
   SUB_PROGS =