Changeset 3238 in orxonox.OLD for orxonox/branches/nico/src/Makefile.am

Timestamp:

Dec 20, 2004, 2:42:54 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches: updated branches: buerli, nico, sound. And moved bezierTrack to old.bezierTrack. Conflicts resolved in a usefull order.
Conflics mostly resolved in favor of trunk
merge.

File:

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

orxonox/branches/nico/src/Makefile.am

@@ -1 @@
-AM_CXXFLAGS="-I/usr/X11R6/include"
-AM_LDFLAGS="-L/usr/Mesa-6.0.1/lib  -L/usr/X11R6/lib -lXt -lX11" $(MWINDOWS)
+#AM_CXXFLAGS=""
+AM_LDFLAGS= $(MWINDOWS)
 
 #"-O3 -pedantic -fPIC -ffast-math -I/usr/X11R6/include"
@@ -7 +7 @@
 bin_PROGRAMS=orxonox
 
-orxonox_SOURCES=orxonox.cc world.cc player.cc data_tank.cc world_entity.cc vector.cc camera.cc collision.cc command_node.cc ini_parser.cc keynames.cc track.cc base_entity.cc game_loader.cc campaign.cc story_entity.cc object.cc environment.cc array.cc material.cc list.cc
-noinst_HEADERS=ability.h data_tank.h npc.h stdincl.h ai.h environment.h orxonox.h synchronisable.h base_entity.h error.h player.h track.h camera.h ini_parser.h power_up.h vector.h collision.h keynames.h proto_class.h world.h command_node.h list.h shoot_laser.h world_entity.h coordinates.h message_structures.h shoot_rocket.h object.h array.h material.h list_template.h story_entity.h story_def.h game_loader.h campaign.h
+orxonox_SOURCES= orxonox.cc \
+                 world.cc \
+                 player.cc \
+                 collision.cc \
+                 data_tank.cc \
+                 world_entity.cc \
+                 vector.cc \
+                 camera.cc \
+                 command_node.cc \
+                 ini_parser.cc \
+                 keynames.cc \
+                 track.cc \
+                 base_entity.cc \
+                 game_loader.cc \
+                 campaign.cc \
+                 story_entity.cc \
+                 environment.cc \
+                 importer/object.cc \
+                 importer/array.cc \
+                 importer/material.cc \
+                 list.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 \
+                 track.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 \
+                 coordinates.h \
+                 message_structures.h \
+                 shoot_rocket.h \
+                 list_template.h \
+                 story_entity.h \
+                 story_def.h \
+                 game_loader.h \
+                 campaign.h
 
+## orxonox.conf will be used from home-dir instead.
+EXTRA_DIST = orxonox.conf
 
-#  uncomment the following if bencoder requires the math library
+### GTK_RELATED
+if HAVE_GTK2
+  GTK_PROGS =console
+else
+  GTK_PROGS =
+endif
+
+SUBDIRS = . \
+          importer \
+          gui \
+          $(GTK_PROGS)
+
+#  uncomment the following if orxonox requires the math library
 #orxonox_LDADD=-lm