minimal now works in Unicode mode

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

diff --git a/utils/wxPython/src/Setup.in b/utils/wxPython/src/Setup.in
index 935dea032bf383f44008324a36d6df6c896d404b..079d0b8b031f799920ad2742aa0e43f084c8d66e 100644 (file)
--- a/utils/wxPython/src/Setup.in
+++ b/utils/wxPython/src/Setup.in
@@ -15,8 +15,14 @@ srcdir=$(GENCODEDIR)
 # 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:
 # 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
-MY_LINKCC=$(CCC) --verbose
+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)

 
 
 ## Pick one of these, or set your own.  This is where the
 
 
 ## Pick one of these, or set your own.  This is where the


@@ -26,17 +32,13 @@ TARGETDIR=..
 #TARGETDIR=$(BINLIBDEST)/site-packages/wxPython
 
 
 #TARGETDIR=$(BINLIBDEST)/site-packages/wxPython
 
 

-wxpc   wxp.cpp helpers.cpp windows.cpp events.cpp misc.cpp gdi.cpp \
+wxc    wx.cpp helpers.cpp windows.cpp events.cpp misc.cpp gdi.cpp \

        mdi.cpp controls.cpp controls2.cpp windows2.cpp cmndlgs.cpp \
        mdi.cpp controls.cpp controls2.cpp windows2.cpp cmndlgs.cpp \

+       frames.cpp stattool.cpp utils.cpp windows3.cpp \

        # CFLAGS
        # CFLAGS

-       -I. -I$(WXWIN)/include -I/usr/local/lib/glib/include -I$(WXWIN)/src \
-       -I/usr/X/include -DSWIG_GLOBAL -D__WXGTK__ \
+       -I. -I$(WXWIN)/include -I/usr/lib/glib/include -I$(WXWIN)/src \
+       -I/usr/X11R6/include -DSWIG_GLOBAL -D__WXGTK__ \
+       #-D__WXDEBUG__ \

        # LFLAGS
        # LFLAGS

-       -L$(WXWIN)/lib/solaris2.6 -L/usr/X/lib \
-       -L/usr/local/lib/gcc-lib/sparc-sun-solaris2.6/2.8.1 \
-       -lwx_gtk -lgtk -lgdk -lglib -lXext -lX11 -lstdc++ -lgcc
-
-
-
-
-
+       -L$(WXWIN)/lib/Linux -L/usr/X11R6/lib \
+       -lwx_gtk2 -lgtk -lgdk -lglib -lXext -lX11