Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some tweaks for wxGTK

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@620 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
1998-08-22 19:51:18 +00:00
parent b6a158b04e
commit f57d793249
6 changed files with 73 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
utils/wxPython/src/Makefile.pre.in
View File

@@ -177,6 +177,16 @@ INSTALL= $(LIBPL)/install-sh -c
# Also, making them read-only seems to be a good idea...
INSTALL_SHARED= ${INSTALL} -m 555
#---------------------------------------------------
# Possibly change some definintions for C++
ifdef MY_LDSHARED
LDSHARED=$(MY_LDSHARED)
endif
ifdef MY_LINKCC
LINKCC=$(MY_LINKCC)
endif
# === Fixed rules ===
# Default target. This builds shared libraries only
@@ -198,7 +208,7 @@ $(TARGET): $(ADDOBJS) lib.a $(PYTHONLIBS) Makefile $(BASELIB)
#------------------------------------------------------------------------
#------------------------------------------------------------------------
# This is a defaul version of the install target for wxPython. It just
# This is a default version of the install target for wxPython. It just
# redirects to wxInstall below...
install: wxInstall
@@ -314,9 +324,6 @@ distclean: clobber
# Custom rules and dependencies added for wxPython
#
ifdef MY_LDSHARED
LDSHARED=$(MY_LDSHARED)
endif
SWIGFLAGS=-c++ -shadow -python -dnone -D__WXGTK__

36
utils/wxPython/src/Setup.in
View File

@@ -1,6 +1,10 @@
# 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++
@@ -10,19 +14,29 @@ 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. Fo rexample:
MY_LDSHARED=$(CCC) -shared
# C driver. For example:
#MY_LDSHARED=$(CCC) -shared
MY_LINKCC=$(CCC) --verbose
## Pick one of these, or set your own
#TARGETDIR=$(BINLIBDEST)/site-packages/wxPython
## 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=..
wxpc wxp.cpp helpers.cpp windows.cpp events.cpp misc.cpp gdi.cpp \
mdi.cpp controls.cpp controls2.cpp windows2.cpp cmndlgs.cpp \
-I. -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
#TARGETDIR=$(BINLIBDEST)/site-packages/wxPython
wxpc wxp.cpp helpers.cpp windows.cpp events.cpp misc.cpp gdi.cpp \
mdi.cpp controls.cpp controls2.cpp windows2.cpp cmndlgs.cpp \
# CFLAGS
-I. -I$(WXWIN)/include -I/usr/local/lib/glib/include -I$(WXWIN)/src \
-I/usr/X/include -DSWIG_GLOBAL -D__WXGTK__ \
# 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

4
utils/wxPython/src/gtk/wxp.cpp
View File

@@ -33,8 +33,8 @@
* and things like that.
*
* $Log$
* Revision 1.1 1998/08/19 00:10:01 RD
* GTK version of the SWIG-generated files
* Revision 1.2 1998/08/22 19:50:56 RD
* some tweaks for wxGTK
*
************************************************************************/

4
utils/wxPython/src/gtk/wxp.py
View File

@@ -1372,8 +1372,8 @@ class wxApp(wxPyApp):
#----------------------------------------------------------------------------
#
# $Log$
# Revision 1.1 1998/08/19 00:10:03 RD
# GTK version of the SWIG-generated files
# Revision 1.2 1998/08/22 19:50:58 RD
# some tweaks for wxGTK
#
# Revision 1.2 1998/08/18 19:48:12 RD
# more wxGTK compatibility things.