Changeset 2188 in orxonox.OLD for orxonox/branches/chris/src

Timestamp:

Jul 17, 2004, 10:22:35 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/chris: now it compiles for Linux, but there remains a segmentation fault, when pushing a button, also the ship is not rendered

Location:

orxonox/branches/chris/src

Files:

• Makefile (deleted)
• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (4 diffs)

orxonox/branches/chris/src/Makefile.am

@@ -1 +1 @@
 AM_CXXFLAGS="-I/usr/X11R6/include"
-AM_LDFLAGS="-L/usr/Mesa-6.0.1/lib  -L/usr/X11R6/lib -lXt -lX11"
+AM_LDFLAGS="-L/usr/Mesa-6.0.1/lib  -L/usr/X11R6/lib -lXt -lX11" $(MWINDOWS)
 
 #"-O3 -pedantic -fPIC -ffast-math -I/usr/X11R6/include"
@@ -9 +9 @@
 
 #  uncomment the following if bencoder requires the math library
-#gui_LDADD=-lm
+orxonox_LDADD=-lm
 
 #EXTRA_DIST=orxonox.lsm.in orxonox.spec.in orxonox.texinfo

orxonox/branches/chris/src/Makefile.in

@@ -112 +112 @@
 target_alias = @target_alias@
 AM_CXXFLAGS = "-I/usr/X11R6/include"
-AM_LDFLAGS = "-L/usr/Mesa-6.0.1/lib  -L/usr/X11R6/lib -lXt -lX11"
+AM_LDFLAGS = "-L/usr/Mesa-6.0.1/lib  -L/usr/X11R6/lib -lXt -lX11" $(MWINDOWS)
 
 
@@ -118 +118 @@
 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 
+
+#  uncomment the following if bencoder requires the math library
+orxonox_LDADD = -lm
 subdir = src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -131 +134 @@
         ini_parser.$(OBJEXT) keynames.$(OBJEXT) track.$(OBJEXT)
 orxonox_OBJECTS = $(am_orxonox_OBJECTS)
-orxonox_LDADD = $(LDADD)
 orxonox_DEPENDENCIES =
 orxonox_LDFLAGS =
@@ -407 +409 @@
 
 
-#  uncomment the following if bencoder requires the math library
-#gui_LDADD=-lm
-
 #EXTRA_DIST=orxonox.lsm.in orxonox.spec.in orxonox.texinfo