renamed grid sample

[wxWidgets.git] / distrib / gtk / Setup

diff --git a/distrib/gtk/Setup b/distrib/gtk/Setup
index 2b29b59b2c7dcb8f20243aae3de96657b18f6ff5..ec11650375d39c07a57b1a0c10cdec2cfa23c569 100644 (file)
--- a/distrib/gtk/Setup
+++ b/distrib/gtk/Setup
@@ -11,7 +11,7 @@ CCC=g++
 WXWIN=~/wxWindows
 GENCODEDIR=gtk
 srcdir=$(GENCODEDIR)
 WXWIN=~/wxWindows
 GENCODEDIR=gtk
 srcdir=$(GENCODEDIR)

-WX_CONFIG_CFLAGS=`wx-config --cflags`
+WX_CONFIG_CFLAGS=`wx-config --cflags` `gtk-config --cflags`

 WX_CONFIG_LIBS=`wx-config --libs`
 
 # Depending on how your Python was built, you may have to set this
 WX_CONFIG_LIBS=`wx-config --libs`
 
 # Depending on how your Python was built, you may have to set this


@@ -34,9 +34,14 @@ MY_LINKCC=$(CCC)
 #TARGETDIR=$(BINLIBDEST)/site-packages/wxPython
 TARGETDIR=$(BINLIBDEST)/wxPython
 
 #TARGETDIR=$(BINLIBDEST)/site-packages/wxPython
 TARGETDIR=$(BINLIBDEST)/wxPython
 

-

 wxc    wx.cpp helpers.cpp windows.cpp events.cpp misc.cpp gdi.cpp \
        mdi.cpp controls.cpp controls2.cpp windows2.cpp cmndlgs.cpp \
 wxc    wx.cpp helpers.cpp windows.cpp events.cpp misc.cpp gdi.cpp \
        mdi.cpp controls.cpp controls2.cpp windows2.cpp cmndlgs.cpp \

-       frames.cpp stattool.cpp utils.cpp windows3.cpp \
-       -I. $(WX_CONFIG_CFLAGS) -DSWIG_GLOBAL
-       
+       frames.cpp stattool.cpp windows3.cpp image.cpp misc2.cpp \
+       utils.cpp printfw.cpp libpy.c libptr.c \
+       ## comment out the next line to disable wxGLCanvas
+       ##_glcanvas.cpp glcanvas.cpp -DWITH_GLCANVAS -lGL -lGLU \
+       -I. $(WX_CONFIG_CFLAGS) -I/usr/local/lib/glib/include \
+       -DSWIG_GLOBAL -DWXP_WITH_THREAD $(SEPARATE) -Xlinker $(WX_CONFIG_LIBS)
+
+
+