Changeset 1955 in orxonox.OLD for orxonox/branches/automake/src

Timestamp:

Jun 15, 2004, 9:48:51 PM (21 years ago)

Author:

bensch

Message:

orxonox/branches/automake: now it should compile on windows. random→rand, glut→glut32

Location:

orxonox/branches/automake/src

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• environment.cc (modified) (1 diff)
• shoot_rocket.cc (modified) (1 diff)

orxonox/branches/automake/src/Makefile.am

@@ -1 +1 @@
 AM_CXXFLAGS="-I/usr/X11R6/include"
+AM_LDFLAGS="-L/usr/Mesa-6.0.1/lib -lglut32 -lGLU32 -lGL32 -lm -L/usr/X11R6/lib -lXt -lX11"
+
 #"-O3 -pedantic -fPIC -ffast-math -I/usr/X11R6/include"
-AM_LDFLAGS="-L/usr/Mesa-6.0.1/lib -lglut -lGLU -lGL -lm -L/usr/X11R6/lib -lXt -lX11"
+
 
 bin_PROGRAMS=orxonox

orxonox/branches/automake/src/Makefile.in

@@ -111 +111 @@
 target_alias = @target_alias@
 AM_CXXFLAGS = "-I/usr/X11R6/include"
+AM_LDFLAGS = "-L/usr/Mesa-6.0.1/lib -lglut32 -lGLU32 -lGL32 -lm -L/usr/X11R6/lib -lXt -lX11"
+
+
 #"-O3 -pedantic -fPIC -ffast-math -I/usr/X11R6/include"
-AM_LDFLAGS = "-L/usr/Mesa-6.0.1/lib -lglut -lGLU -lGL -lm -L/usr/X11R6/lib -lXt -lX11"
-
 bin_PROGRAMS = orxonox
 orxonox_SOURCES = orxonox.cc world.cc environment.cc player.cc npc.cc input_output.cc data_tank.cc ai.cc shoot_laser.cc shoot_rocket.cc

orxonox/branches/automake/src/environment.cc

@@ -42 +42 @@
       for (int y = 1; y < 9; y++)
         {
-          mountainTest[x][y] = (float)random() / 900000000;
+          mountainTest[x][y] = (float)rand() / 900000000;
                                                  
         }

orxonox/branches/automake/src/shoot_rocket.cc

@@ -147 +147 @@
   sh->type = BACKPARABLE;
   sh->xCor = x; sh->yCor = y; sh->zCor = z;
-  sh->xVel = (-1+(float)random() / 1000000000/step)/5; 
+  sh->xVel = (-1+(float)rand() / 1000000000/step)/5; 
   sh->yVel = -.3;
-  sh->zVel = (1-(float)random() / 1000000000/step)/5;
+  sh->zVel = (1-(float)rand() / 1000000000/step)/5;
   sh->xAcc = 0; sh->yAcc = .01/step; sh->zAcc = 0;
   sh->next = lastShoot;