From 514d2dbb87879c233f9a9f11ecc932ba48cd438c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 15 Sep 2002 20:16:46 +0000 Subject: [PATCH] compile the C files using C compiler, not C++ one, otherwise the sample doesn't link git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17208 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/opengl/penguin/makefile.unx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/samples/opengl/penguin/makefile.unx b/samples/opengl/penguin/makefile.unx index 778d905184..bc26127d08 100644 --- a/samples/opengl/penguin/makefile.unx +++ b/samples/opengl/penguin/makefile.unx @@ -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