Updated config.{guess,sub}
Backported fixes from Robert Millan for HURD/K*BSD. Fix broken linking of wxgtk_gl. Fix uninitialised var warning in wxrcedit/preview.cpp Updates for 2.4.2.5 .debs. Update wx-config.1 Fixed makefile.unx in opengl samples to use --gl-lib Removed #! from newevent.py git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@28560 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -9,10 +9,6 @@
|
||||
#
|
||||
# Makefile for cube example (UNIX).
|
||||
|
||||
OPENGL_LIBS=-lGL -lGLU
|
||||
#if you have old Mesa, try this:
|
||||
#OPENGL_LIBS=-lMesaGL -lMesaGLU
|
||||
|
||||
PROGRAM=cube
|
||||
|
||||
CXX = $(shell wx-config --cxx)
|
||||
@@ -29,7 +25,7 @@ OBJECTS = $(PROGRAM).o
|
||||
all: $(PROGRAM)
|
||||
|
||||
$(PROGRAM): $(OBJECTS)
|
||||
$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs` -lwx_gtk_gl $(OPENGL_LIBS)
|
||||
$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --gl-libs`
|
||||
|
||||
clean:
|
||||
rm -f *.o $(PROGRAM)
|
||||
|
Reference in New Issue
Block a user