makefile.unx's now default to OpenGL, not Mesa

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9929 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/opengl/cube/makefile.unx b/samples/opengl/cube/makefile.unx
index afa6121f6f2dbd46fd04c0b6f1682b95d01e311a..f40497b3e5e0a5b4e95c49aba8a4f13b18312a6b 100644 (file)
--- a/samples/opengl/cube/makefile.unx
+++ b/samples/opengl/cube/makefile.unx
@@ -9,6 +9,10 @@
 #
 # Makefile for cube example (UNIX).
 
 #
 # Makefile for cube example (UNIX).
 

+OPENGL_LIBS=-lGL -lGLU
+#if you have old Mesa, try this:
+#OPENGL_LIBS=-lMesaGL -lMesaGLU
+

 PROGRAM=cube
 
 CC = gcc
 PROGRAM=cube
 
 CC = gcc


@@ -25,7 +29,7 @@ OBJECTS = $(PROGRAM).o
 all:    $(PROGRAM)
 
 $(PROGRAM):    $(OBJECTS)
 all:    $(PROGRAM)
 
 $(PROGRAM):    $(OBJECTS)

-       $(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs` -lwx_gtk_gl -lMesaGL -lMesaGLU
+       $(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs` -lwx_gtk_gl $(OPENGL_LIBS)

 
 clean: 
        rm -f *.o $(PROGRAM)
 
 clean: 
        rm -f *.o $(PROGRAM)

diff --git a/samples/opengl/isosurf/makefile.unx b/samples/opengl/isosurf/makefile.unx
index fbb993eb4c4d3f930d67e9239c7c6fa7ade8fd6c..86c4c5a6a4643040dc2baabfd2bf28749ac5c472 100644 (file)
--- a/samples/opengl/isosurf/makefile.unx
+++ b/samples/opengl/isosurf/makefile.unx
@@ -9,6 +9,10 @@
 #
 # Makefile for isosurf example (UNIX).
 
 #
 # Makefile for isosurf example (UNIX).
 

+OPENGL_LIBS=-lGL -lGLU
+#if you have old Mesa, try this:
+#OPENGL_LIBS=-lMesaGL -lMesaGLU
+

 PROGRAM=isosurf
 
 CC = gcc
 PROGRAM=isosurf
 
 CC = gcc


@@ -25,7 +29,7 @@ OBJECTS = $(PROGRAM).o
 all: $(PROGRAM) isosurf.dat
 
 $(PROGRAM):    $(OBJECTS)
 all: $(PROGRAM) isosurf.dat
 
 $(PROGRAM):    $(OBJECTS)

-       $(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs` -lwx_gtk_gl -lMesaGL -lMesaGLU
+       $(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs` -lwx_gtk_gl $(OPENGL_LIBS)

 
 clean: 
        rm -f *.o $(PROGRAM)
 
 clean: 
        rm -f *.o $(PROGRAM)

diff --git a/samples/opengl/penguin/makefile.unx b/samples/opengl/penguin/makefile.unx
index 2add0896b3053967a63bda0deee4683344906ff8..aaea80b74bf4e74eaba8f7b749cd288cd57b3977 100644 (file)
--- a/samples/opengl/penguin/makefile.unx
+++ b/samples/opengl/penguin/makefile.unx
@@ -7,13 +7,17 @@
 #
 # Makefile for penguin example (UNIX).
 
 #
 # Makefile for penguin example (UNIX).
 

+OPENGL_LIBS=-lGL -lGLU
+#if you have old Mesa, try this:
+#OPENGL_LIBS=-lMesaGL -lMesaGLU
+

 CPP = g++
 CC = gcc
 
 Penguin: penguin.o trackball.o lw.o
        $(CPP) -o Penguin \
        penguin.o trackball.o lw.o \
 CPP = g++
 CC = gcc
 
 Penguin: penguin.o trackball.o lw.o
        $(CPP) -o Penguin \
        penguin.o trackball.o lw.o \

-       `wx-config --libs` -lwx_gtk_gl -lMesaGL -lMesaGLU
+       `wx-config --libs` -lwx_gtk_gl $(OPENGL_LIBS)

 
 penguin.o: penguin.cpp
        $(CPP) `wx-config --cflags` -I../../gtk -c penguin.cpp
 
 penguin.o: penguin.cpp
        $(CPP) `wx-config --cflags` -I../../gtk -c penguin.cpp