Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9929 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-04-29 17:57:22 +00:00
parent 30954328be
commit d969af82fc
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
samples/opengl/cube/makefile.unx
View File

@@ -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 PROGRAM=cube
CC = gcc CC = gcc
@@ -25,7 +29,7 @@ OBJECTS = $(PROGRAM).o
all: $(PROGRAM) all: $(PROGRAM)
$(PROGRAM): $(OBJECTS) $(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: clean:
rm -f *.o $(PROGRAM) rm -f *.o $(PROGRAM)

6
samples/opengl/isosurf/makefile.unx
View File

@@ -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 PROGRAM=isosurf
CC = gcc CC = gcc
@@ -25,7 +29,7 @@ OBJECTS = $(PROGRAM).o
all: $(PROGRAM) isosurf.dat all: $(PROGRAM) isosurf.dat
$(PROGRAM): $(OBJECTS) $(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: clean:
rm -f *.o $(PROGRAM) rm -f *.o $(PROGRAM)

6
samples/opengl/penguin/makefile.unx
View File

@@ -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++ CPP = g++
CC = gcc CC = gcc
Penguin: penguin.o trackball.o lw.o Penguin: penguin.o trackball.o lw.o
$(CPP) -o Penguin \ $(CPP) -o Penguin \
penguin.o trackball.o lw.o \ 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 penguin.o: penguin.cpp
$(CPP) `wx-config --cflags` -I../../gtk -c penguin.cpp $(CPP) `wx-config --cflags` -I../../gtk -c penguin.cpp