[m-rev.] diff: update opengl samples

[Julien Fischer]

Estimated hours taken: 0.1
Branches: main

Update the OpenGL samples to conform with recent standard library
changes.

extras/graphics/samples/gears/gears.m:
extras/graphics/samples/maze/maze.m:
extras/graphics/samples/maze/globals.m:
	Conform to recent library changes.

extras/graphics/mercury_glut/Mmakefile:
extras/graphics/mercury_opengl/Mmakefile:
extras/graphics/samples/gears/Mmakefile:
extras/graphics/samples/maze/Mmakefile:
	Update the list of X libraries required by Mesa.

Julien.

Index: mercury_glut/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/graphics/mercury_glut/Mmakefile,v
retrieving revision 1.1
diff -u -r1.1 Mmakefile
--- mercury_glut/Mmakefile	17 May 2004 08:28:51 -0000	1.1
+++ mercury_glut/Mmakefile	30 Mar 2006 02:45:51 -0000
@@ -13,7 +13,7 @@
 # The following libraries are for X on Linux (Debian) using Mesa.

 # Libaries required by X windows.
-X_LIBS = -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -L/usr/X11R6/lib
+X_LIBS = -lX11 -lXext -lXt -lXi -lSM -lICE -L/usr/X11R6/lib

 # Libraries required by OpenGL.
 GL_LIBS = -lGL -LGL
Index: mercury_opengl/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/graphics/mercury_opengl/Mmakefile,v
retrieving revision 1.5
diff -u -r1.5 Mmakefile
--- mercury_opengl/Mmakefile	1 Dec 2004 01:45:30 -0000	1.5
+++ mercury_opengl/Mmakefile	30 Mar 2006 02:46:28 -0000
@@ -11,7 +11,7 @@

 # Specify what libraries we need to link against for OpenGL on this system.
 # (The following works on Debian with mesa as the OpenGL implementation).
-GL_LIBS = -lGL -lGLU -L/usr/X11R6/lib -lX11 -lXi -lXmu -lXt -lICE -lXext -lSM
+GL_LIBS = -lGL -lGLU -L/usr/X11R6/lib -lX11 -lXi -lXt -lICE -lXext -lSM

 # Don't issue a warning because mercury_opengl doesn't export anything.
 MCFLAGS-mercury_opengl = --no-warn-nothing-exported
Index: samples/gears/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/graphics/samples/gears/Mmakefile,v
retrieving revision 1.1
diff -u -r1.1 Mmakefile
--- samples/gears/Mmakefile	14 Jun 2004 11:34:06 -0000	1.1
+++ samples/gears/Mmakefile	30 Mar 2006 02:47:29 -0000
@@ -8,7 +8,7 @@
 MGNUCFLAGS = --pic-reg -I$(MERCURY_OPENGL_DIR) -I$(MERCURY_GLUT_DIR)
 EXTRA_MLFLAGS = -shared

-EXTRA_MLLIBS = -lGLU -lglut -lGL -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXi \
+EXTRA_MLLIBS = -lGLU -lglut -lGL -L/usr/X11R6/lib -lX11 -lXext -lXi \
 	 -lpthread -ldl -lm

 VPATH = $(MERCURY_OPENGL_DIR):$(MERCURY_GLUT_DIR):$(MMAKE_VPATH)
Index: samples/gears/gears.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/graphics/samples/gears/gears.m,v
retrieving revision 1.5
diff -u -r1.5 gears.m
--- samples/gears/gears.m	10 Oct 2005 04:41:05 -0000	1.5
+++ samples/gears/gears.m	30 Mar 2006 02:47:13 -0000
@@ -36,7 +36,7 @@
 :- import_module int.
 :- import_module list.
 :- import_module math.
-:- import_module std_util.
+:- import_module maybe.
 :- import_module string.

 %-----------------------------------------------------------------------------%
Index: samples/maze/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/graphics/samples/maze/Mmakefile,v
retrieving revision 1.7
diff -u -r1.7 Mmakefile
--- samples/maze/Mmakefile	20 Jan 2005 04:50:22 -0000	1.7
+++ samples/maze/Mmakefile	30 Mar 2006 02:49:16 -0000
@@ -9,7 +9,7 @@
 MGNUCFLAGS = --pic-reg -I$(MERCURY_OPENGL_DIR) -I$(MERCURY_GLUT_DIR)
 EXTRA_MLFLAGS = -shared

-EXTRA_MLLIBS = -lGLU -lglut -lGL -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXi \
+EXTRA_MLLIBS = -lGLU -lglut -lGL -L/usr/X11R6/lib -lX11 -lXext -lXi \
 	 -lpthread -ldl -lm

 VPATH = $(MERCURY_OPENGL_DIR):$(MERCURY_GLUT_DIR):$(MMAKE_VPATH)
Index: samples/maze/globals.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/graphics/samples/maze/globals.m,v
retrieving revision 1.5
diff -u -r1.5 globals.m
--- samples/maze/globals.m	29 Jun 2005 05:21:45 -0000	1.5
+++ samples/maze/globals.m	30 Mar 2006 02:47:57 -0000
@@ -29,7 +29,7 @@

 :- import_module map.
 :- import_module require.
-:- import_module std_util.
+:- import_module univ.

 %-----------------------------------------------------------------------------%

Index: samples/maze/maze.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/graphics/samples/maze/maze.m,v
retrieving revision 1.6
diff -u -r1.6 maze.m
--- samples/maze/maze.m	6 Oct 2005 09:25:23 -0000	1.6
+++ samples/maze/maze.m	30 Mar 2006 02:49:03 -0000
@@ -48,10 +48,11 @@
 :- import_module list.
 :- import_module map.
 :- import_module math.
+:- import_module pair.
 :- import_module random.
 :- import_module require.
 :- import_module set.
-:- import_module std_util.
+:- import_module solutions.
 :- import_module string.

 %-----------------------------------------------------------------------------%
@@ -87,10 +88,10 @@
 		getopt.lookup_int_option(Opts, height, YMax),
 		getopt.lookup_int_option(Opts, seed, Seed),
 		globals.set("Size", float(XMax), !IO),
-		std_util.solutions(
+		solutions(
 			(pred(X::out) is nondet :- between(0, XMax - 1, X)),
 			XIndexs),
-		std_util.solutions(
+		solutions(
 			(pred(Y::out) is nondet :- between(0, YMax - 1, Y)),
 			YIndexes),
 		random.init(Seed, Rnd0),
@@ -395,7 +396,7 @@
 			X1 >= 0, X1 < FarX,
 			Y1 >= 0, Y1 < FarY
 	),
-	std_util.solutions(Pred, Adjs0),
+	solutions(Pred, Adjs0),
 	shuffle(20, Adjs0, Adjs, !Rnd).

 :- pred knock_out_wall(pos::in, pos::in, maze::in, maze::out) is det.

--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------