Commit Graph

15 Commits

Author SHA1 Message Date
Vadim Zeitlin
2b5f62a0b2 merged 2.4 branch into the trunk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-04 14:11:26 +00:00
Vadim Zeitlin
50b4dd1c95 don't include headers which were excluded for wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17202 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-09-15 18:15:56 +00:00
Robert Roebling
49f7215796 Updates to tmake for X11. Damn lock in CVS.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14082 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-02-09 18:43:37 +00:00
Václav Slavík
0f04dbf324 generated makefiles no longer contain information about when they were generated
(you can still get this information from CVS/Entries and there will be fewer bogus revisions)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13975 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-02-02 23:15:23 +00:00
Vadim Zeitlin
4eb1fe9da6 fixed wxUniv/GTK linking by getting rid of GENERICOBJS and putting them into GUIOBJS/GUI_LOWLEVEL_OBJS instead
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-06 16:31:31 +00:00
Ron Lee
3a922bb4bd More build system polishing.. mostly. Some stuff ported over from
recent changes to the 2.2 branch.

Rationalised the autoconf scripts again, removed lots of stuff that
shouldn't be there anymore and pounded the rest into an even tighter
furball. (There's more work to be done here, but we're getting there..)

Implemented the library naming scheme outlined in tn0012.txt -- introduced
'toolchain' and 'widget set' into the autoconf scripts, obsoleted the
top level wx/setup.h and much of the mess associated with it.

More changes for cross compiling and 2.3 debs.

s/burnt_name/soname/g ; s/CC/CXX/g ; s/CCC/CC/g ;  Just because it's Right.
(Thanks Vadim for already doing *FLAGS..)

Fixed libfl Makefile to actually work.

Removed *_DEPS from tmake templates, in every case they can be determined
from the relevant *_OBJS

Added BASE_MSW_OBJS, a couple of missing #includes, some missing files to
the 'dist' targets, and fixed some compile warnings.

Changed setup.py to use wx-config --gl-libs instead of hard coded constants.

 Modified Files:
 	Makefile.in configure configure.in setup.h.in wx-config.in
 	wxBase.spec wxGTK.spec wxMotif.spec
 	contrib/include/wx/applet/window.h contrib/src/Makefile.in
 	contrib/src/applet/appletwindow.cpp contrib/src/fl/Makefile.in
 	debian/changelog debian/control.in debian/libwxbase-dbg.dirs
 	debian/libwxbase-dbg.links debian/libwxbase-dbg.postinst
 	debian/libwxbase-dbg.prerm debian/libwxbase-dev.dirs
 	debian/libwxbase-dev.files debian/libwxbase-dev.links
 	debian/libwxbase-dev.postinst debian/libwxbase-dev.prerm
 	debian/libwxgtk-dbg.dirs debian/libwxgtk-dbg.links
 	debian/libwxgtk-dbg.postinst debian/libwxgtk-dbg.prerm
 	debian/libwxgtk-dev.dirs debian/libwxgtk-dev.files
 	debian/libwxgtk-dev.links debian/libwxgtk-dev.postinst
 	debian/libwxgtk-dev.prerm debian/rules
 	distrib/msw/tmake/base.t distrib/msw/tmake/gtk.t
 	distrib/msw/tmake/mgl.t distrib/msw/tmake/motif.t
 	distrib/msw/tmake/msw.t distrib/msw/tmake/os2.t
 	distrib/msw/tmake/univ.t docs/motif/install.txt
 	include/wx/msw/private.h include/wx/os2/SETUP.H
 	include/wx/os2/SETUP0.H samples/ipc/Makefile.in
 	samples/sockets/Makefile.in src/files.lst src/make.env.in
 	src/makelib.env.in src/makeprog.env.in src/common/strconv.cpp
 	src/gtk/files.lst src/mgl/files.lst src/motif/files.lst
 	src/msw/files.lst src/msw/gsocket.c src/msw/gsockmsw.c
 	src/msw/toplevel.cpp src/msw/utils.cpp src/os2/files.lst
 	src/univ/files.lst wxPython/setup.py
 Added Files:
 	debian/libwxbase-msw-dev.dirs debian/libwxbase-msw-dev.links
 	debian/libwxbase-msw-dev.postinst
 	debian/libwxbase-msw-dev.prerm debian/libwxmsw-dev.dirs
 	debian/libwxmsw-dev.links debian/libwxmsw-dev.postinst
 	debian/libwxmsw-dev.prerm debian/wxwin-doc.doc-base
 	debian/wxwin-headers-msw.dirs
 Removed Files:
 	debian/wxwin-doc.doc-base.in include/wx/setup.h


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-28 07:00:13 +00:00
Vadim Zeitlin
1e6feb95a7 first pass of wxUniv merge - nothing works, most parts don't even compile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-26 20:59:19 +00:00
Vadim Zeitlin
7529690de8 don't include unnecessary headers in the distribution
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9843 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-22 16:12:34 +00:00
Vadim Zeitlin
422107f900 removed OGL files from wxGTK build, fixed configure for wxBase
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6405 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-03 10:46:23 +00:00
Robert Roebling
bdad4e7e02 Various changes due to OGL and glcanvas having changed
position.

  Had to butcher Vadims system header patch.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6387 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-01 20:27:16 +00:00
Robert Roebling
103aab2664 Various corrections to makefiles, RPMs etc.
Corrected overoptimised window style and colour code.
  More best visual changes.
  Minor typos in docs.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-01 16:37:28 +00:00
Vadim Zeitlin
2224580a41 1. configre/makefiles changes
a) wxBase compilation/installation/dist works, added wxBase.spec
 b) list of files is include by Makefile.in, not embedded into it
 c) configure runs "subconfigures" for samples/demos/utils
2. wxTokenizer class from Gregory Pietsch


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-31 18:26:16 +00:00
Robert Roebling
8e877c195b New makefiles for GTK and Motif, using configure but not
libtool and automake.
  Numerous Motif crash fixes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-08-10 20:08:24 +00:00
Robert Roebling
9b61f868b5 Compile fixes and typos corrected.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3197 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-07-29 13:43:08 +00:00
Robert Roebling
631fd4122a Makefile changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-07-29 12:51:29 +00:00