summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan C <ianc@noddybox.co.uk>2007-05-22 23:27:20 +0000
committerIan C <ianc@noddybox.co.uk>2007-05-22 23:27:20 +0000
commit737c093cddb6ad5c23bead4b2f98de27572e74be (patch)
treeefc0a9eb82a22097f8dd3afeccabd22b2391d6f2
parent40b6e995d0534839e352d3f56485ca9ea7f41b89 (diff)
Fixed to build on Ubuntu 7.04
-rw-r--r--dat12
-rw-r--r--depend.mak5
-rw-r--r--makefile5
3 files changed, 14 insertions, 8 deletions
diff --git a/dat b/dat
index 6b9ea1c..5c63d53 100644
--- a/dat
+++ b/dat
@@ -3,7 +3,7 @@
# Note that when using object names, case is important. Case in commands and
# arguments is not.
#
-# $Id: dat,v 1.1.1.1 2006-05-02 19:12:45 ianc Exp $
+# $Id: dat,v 1.2 2007-05-22 23:27:20 ianc Exp $
#
@@ -253,10 +253,10 @@ look_at Sun;
#
# eg.
-# num_texture 3;
-# texture Moon,moon.raw,256,256;
-# texture Earth,earth.raw,512,256;
-# mreuse Belt,10,Moon;
+num_texture 3;
+texture Moon,moon.raw,256,256;
+texture Earth,earth.raw,512,256;
+mreuse Belt,10,Moon;
# Define rings
@@ -306,7 +306,7 @@ look_at Sun;
ring Earth,2.0,2.1,1.0,1.0,1.0,0.6,0.5,45;
# eg.
-# ring_texture Earth,ring.raw,256,256;
+ring_texture Earth,ring.raw,256,256;
# Define trails. If enabled objects leave behind a point as they travel.
diff --git a/depend.mak b/depend.mak
index e69de29..cac346a 100644
--- a/depend.mak
+++ b/depend.mak
@@ -0,0 +1,5 @@
+glgrav.o: glgrav.cpp global.h config.h mass.h particles.h sparks.h
+mass.o: mass.cpp mass.h global.h
+config.o: config.cpp config.h global.h mass.h
+particles.o: particles.cpp particles.h global.h
+sparks.o: sparks.cpp sparks.h global.h
diff --git a/makefile b/makefile
index d60531c..297c53d 100644
--- a/makefile
+++ b/makefile
@@ -19,7 +19,7 @@
#
# -------------------------------------------------------------------------
#
-# $Id: makefile,v 1.1.1.1 2006-05-02 19:12:45 ianc Exp $
+# $Id: makefile,v 1.2 2007-05-22 23:27:20 ianc Exp $
#
TARGET = glgrav
@@ -41,7 +41,8 @@ OBJECTS = $(SOURCES:.cpp=.o)
# NOTE1: Use these libs for GNU/linux. They should work with any unix that has
# X11 too.
#
-LIBS = -L/usr/X11R6/lib -lglut -lGLU -lGL -lX11 -lXext -lXi -lXmu -lm
+#LIBS = -L/usr/X11R6/lib -lglut -lGLU -lGL -lX11 -lXext -lXi -lXmu -lm
+LIBS = -L/usr/X11R6/lib -lglut -lGLU -lGL -lX11 -lXext -lm
# NOTE2: Use thes libs for cygwin