merged 2.4 branch into the trunk

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-12-04 14:11:26 +00:00
parent 59a944cb63
commit 2b5f62a0b2
1057 changed files with 37805 additions and 24034 deletions

View File

@@ -11,22 +11,22 @@ OPENGL_LIBS=-lGL -lGLU
#if you have old Mesa, try this:
#OPENGL_LIBS=-lMesaGL -lMesaGLU
CPP = g++
CC = $(shell wx-config --cc)
CXX = $(shell wx-config --cxx)
Penguin: penguin.o trackball.o lw.o
$(CPP) -o Penguin \
$(CXX) -o Penguin \
penguin.o trackball.o lw.o \
`wx-config --libs` -lwx_gtk_gl $(OPENGL_LIBS)
penguin.o: penguin.cpp
$(CPP) `wx-config --cxxflags` -I../../gtk -c penguin.cpp
$(CXX) `wx-config --cxxflags` -I../../gtk -c penguin.cpp
lw.o: lw.cpp
$(CPP) `wx-config --cxxflags` -I../../gtk -c lw.cpp
$(CXX) `wx-config --cxxflags` -I../../gtk -c lw.cpp
trackball.o: trackball.c
$(CXX) `wx-config --cxxflags` -I../../gtk -c trackball.c
$(CC) `wx-config --cflags` -I../../gtk -c trackball.c
clean:
rm -f *.o Penguin