Changeset 1933 in orxonox.OLD for orxonox/branches/chris

Timestamp:

Jun 9, 2004, 7:28:00 PM (20 years ago)

Author:

chris

Message:

orxonox/branches/chris: This compiles under windows (at least on my system) !!does not compile under linux!!

Location:

orxonox/branches/chris/core

Files:

• Makefile (modified) (4 diffs)
• environment.cc (modified) (1 diff)
• shoot_rocket.cc (modified) (1 diff)

orxonox/branches/chris/core/Makefile

@@ -9 +9 @@
 OSMESA_LIB = libOSMesa.so
 
-CFLAGS = -O3 -pedantic -fPIC -ffast-math -I/usr/X11R6/include
+CFLAGS = -O3 -pedantic -fPIC -ffast-math
 CXXFLAGS = -fPIC -O3
 GLUT_CFLAGS = -fexceptions
@@ -19 +19 @@
 LIBS = -L$(LIBDIR) $(APP_LIB_DEPS)
 
-OSMESA_LIBS = -L$(LIBDIR) -lglut -lOSMesa -lGLU -lGL $(APP_LIB_DEPS)
+OSMESA_LIBS = -L$(LIBDIR) -lglut32 -lGLU32 -lopenGL32 $(APP_LIB_DEPS)
 
 LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLUT_LIB)
@@ -52 +52 @@
 
 #.cc: $(LIB_DEP)
-#       $(CXX) -I$(INCDIR) $(CFLAGS) $< $(LIBS) -o $@
+#       $(CXX) -I$(INCDIR) $(CFLAGS) $< -lglut32 -lGLU -lopenGL32  -o $@
 
 .cc.o:
@@ -65 +65 @@
 $(TARGET): $(OBJECTS)
         @ echo "orxonox is being linked..."
-        @ $(CXX) $(LIBS) -o $(TARGET) $(OBJECTS)
+        @ $(CXX) -o $(TARGET) $(OBJECTS) -lglut32 -lGLU32 -lopenGL32 -lm
 
 

orxonox/branches/chris/core/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/chris/core/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;