replaced "CC = gcc" and even stranger "CPP = gcc -g" (huh?) with
"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:
@@ -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)
|
||||
|
Reference in New Issue
Block a user