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

replaced "CC = gcc" and even stranger "CPP = gcc -g" (huh?) with

Browse Source 
"CXX = $(shell wx-config --cxx)" in all makefile.unx


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-11-28 18:10:15 +00:00
parent 0a3e82894a
commit a6f762a646
69 changed files with 218 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,7 +15,7 @@ OPENGL_LIBS=-lGL -lGLU
PROGRAM=cube
CC = gcc
CXX = $(shell wx-config --cxx)
OBJECTS = $(PROGRAM).o
@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
.SUFFIXES: .o .cpp
.cpp.o :
$(CC) -c `wx-config --cxxflags` -o $@ $<
$(CXX) -c `wx-config --cxxflags` -o $@ $<
all: $(PROGRAM)
$(PROGRAM): $(OBJECTS)
$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs` -lwx_gtk_gl $(OPENGL_LIBS)
$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs` -lwx_gtk_gl $(OPENGL_LIBS)
clean:
rm -f *.o $(PROGRAM)

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

@@ -15,7 +15,7 @@ OPENGL_LIBS=-lGL -lGLU
PROGRAM=isosurf
CC = gcc
CXX = $(shell wx-config --cxx)
OBJECTS = $(PROGRAM).o
@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
.SUFFIXES: .o .cpp
.cpp.o :
$(CC) -c `wx-config --cxxflags` -o $@ $<
$(CXX) -c `wx-config --cxxflags` -o $@ $<
all: $(PROGRAM) isosurf.dat
$(PROGRAM): $(OBJECTS)
$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs` -lwx_gtk_gl $(OPENGL_LIBS)
$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs` -lwx_gtk_gl $(OPENGL_LIBS)
clean:
rm -f *.o $(PROGRAM)

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

@@ -12,7 +12,7 @@ OPENGL_LIBS=-lGL -lGLU
#OPENGL_LIBS=-lMesaGL -lMesaGLU
CPP = g++
CC = gcc
CXX = $(shell wx-config --cxx)
Penguin: penguin.o trackball.o lw.o
$(CPP) -o Penguin \
@@ -26,7 +26,7 @@ lw.o: lw.cpp
$(CPP) `wx-config --cxxflags` -I../../gtk -c lw.cpp
trackball.o: trackball.c
$(CC) `wx-config --cxxflags` -I../../gtk -c trackball.c
$(CXX) `wx-config --cxxflags` -I../../gtk -c trackball.c
clean:
rm -f *.o Penguin