Applied patch [ 1212020 ] MediaCtrl DirectShow drawing and sample

[wxWidgets.git] / wxPython / samples / embedded / makefile.unx

diff --git a/wxPython/samples/embedded/makefile.unx b/wxPython/samples/embedded/makefile.unx
index df4f369f9effeabe2e08a50a92e403cdd8e6db4b..01fda2bb5e359a07c2bfe430c32c1fc0868c68d1 100644 (file)
--- a/wxPython/samples/embedded/makefile.unx
+++ b/wxPython/samples/embedded/makefile.unx
@@ -12,20 +12,23 @@
 PROGRAM = embedded
 OBJECTS = $(PROGRAM).o
 
 PROGRAM = embedded
 OBJECTS = $(PROGRAM).o
 

-EXTRAINC=-I../../src -I/usr/include/python2.2
-EXTRALIB=-L/usr/lib/python2.2/config -lpython2.2
-CXX = $(shell wx-config --cxx)
+WX_CFG = wx-config
+PYVER = 2.4
+
+EXTRAINC=-I../../include -I/usr/include/python$(PYVER)
+EXTRALIB=-L/usr/lib/python$(PYVER)/config -lpython$(PYVER)
+CXX = $(shell $(WX_CFG) --cxx)

 
 
 .SUFFIXES:     .o .cpp
 
 .cpp.o :
 
 
 .SUFFIXES:     .o .cpp
 
 .cpp.o :

-       $(CXX) -c `wx-config --cxxflags` $(EXTRAINC) -o $@ $<
+       $(CXX) -c -g `$(WX_CFG) --cxxflags` $(EXTRAINC) -o $@ $<

 
 all:    $(PROGRAM)
 
 $(PROGRAM):    $(OBJECTS)
 
 all:    $(PROGRAM)
 
 $(PROGRAM):    $(OBJECTS)

-       $(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs` $(EXTRALIB)
+       $(CXX) -g -o $(PROGRAM) $(OBJECTS) `$(WX_CFG) --libs` $(EXTRALIB)

 
 clean:
        rm -f *.o $(PROGRAM)
 
 clean:
        rm -f *.o $(PROGRAM)