Added missing | symbol

[wxWidgets.git] / utils / wxPython / src / Setup.in

diff --git a/utils/wxPython/src/Setup.in b/utils/wxPython/src/Setup.in
index 89f075dff974917e20617df760a2bdc02f86d5ba..079d0b8b031f799920ad2742aa0e43f084c8d66e 100644 (file)
--- a/utils/wxPython/src/Setup.in
+++ b/utils/wxPython/src/Setup.in
@@ -1,21 +1,44 @@
-# This file gives the details of what is needed to uild this extension
+# This file gives the details of what is needed to build this extension
 # module so the Makefile can be created.
 
+###
+### This file should be created by configure.  Currently it is tweaked by hand.
+###
+
 *shared*
 
 CCC=c++
 WXWIN=../../..
 GENCODEDIR=gtk
+srcdir=$(GENCODEDIR)
 
-## Pick one of these, or set your own
-#TARGETDIR=$(BINLIBDEST)/site-packages/wxPython
-TARGETDIR=..
+# Depending on how your Python was built, you may have to set this
+# value to use the C++ driver to link with instead of the default
+# C driver.  For example:
+MY_LDSHARED=$(CCC) -shared
+
+# Same as above, but for statically linking Python and wxPython together,
+# in other words, if you comment out the *shared* above.  If this is the
+# case then you should ensure that the main() function is Python's, not
+# wxWindows'.  You can rebuild $(WXWIN)/src/gtk/app.cpp with NOMAIN defined
+# to force this...
+MY_LINKCC=$(CCC)
 
-wxpc  wxp.cpp helpers.cpp windows.cpp events.cpp misc.cpp gdi.cpp \
-      mdi.cpp controls.cpp controls2.cpp windows2.cpp cmndlgs.cpp \
-      -I$(WXWIN)/include -I/usr/lib/glib/include -I$(WXWIN)/src   \
-#      -D__WXDEBUG__  -ldmalloc                \
-      -DSWIG_GLOBAL -D__WXGTK__ -L$(WXWIN)/lib/Linux -lwx_gtk     \
-      -L/usr/X11R6/lib -lgtk -lgdk -lglib -lXext -lX11
+
+## Pick one of these, or set your own.  This is where the
+## wxPython module should be installed.  It should be a
+## subdirectory named wxPython.
+TARGETDIR=..
+#TARGETDIR=$(BINLIBDEST)/site-packages/wxPython
 
 
+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 \
+       # CFLAGS
+       -I. -I$(WXWIN)/include -I/usr/lib/glib/include -I$(WXWIN)/src \
+       -I/usr/X11R6/include -DSWIG_GLOBAL -D__WXGTK__ \
+       #-D__WXDEBUG__ \
+       # LFLAGS
+       -L$(WXWIN)/lib/Linux -L/usr/X11R6/lib \
+       -lwx_gtk2 -lgtk -lgdk -lglib -lXext -lX11