Commit Graph

464 Commits

Author SHA1 Message Date
Ron Lee
63e7762e67 wxUSE_GTK must stay quoted..
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-08 12:25:49 +00:00
Ron Lee
3d63bc3a03 Rearrange the linker flags/libs code in preparation for better static/shared
support.  Added --static option to wx-config and removed most libs from
--libs output unless it is used.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12353 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-08 11:24:04 +00:00
Ron Lee
ba0e650ced oops
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12346 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-07 11:31:03 +00:00
Ron Lee
d48ad9bd84 More pesky "quotes" hiding in m4 macros.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-07 10:03:57 +00:00
Ron Lee
83dbe2eabb Put $(GENERICOBJECTS) back into configure.in for a while, there are still
other ports that depend on it.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12344 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-07 09:47:20 +00:00
Ron Lee
1d93af2fbf remove -lfoo.dll hack, it appears to be unnecessary after all.. don't ask.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-07 07:53:33 +00:00
Václav Slavík
223e7fbf29 beginnings of support for MGL shared library (it is crappy as hell in MGL, to begin with)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-06 23:54:15 +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
25d0687a6e Merged WXMSW_DLL_DEFINES and PICFLAGS, since they essentially do the same thing.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-06 05:44:09 +00:00
Ron Lee
41213f67af Brown paper bag fix to -lwx.dll in wx-config
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-06 02:36:39 +00:00
Ron Lee
2da4f89277 renamed (gcc) wxMSW import lib name yet again. *.dll.a should be the
final choice for a while I think.
Removed mostly useless ELF style version numbers from .dll -- it's not
an ELF lib so no point adding cruft we can't use.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-05 11:48:47 +00:00
Gilles Depeyrot
4b42290e0e corrected detection of wchar_t under Mac OS X/Darwin
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-04 19:30:34 +00:00
Gilles Depeyrot
eb99ae0b77 use 'cp -fp' instead of 'cp -p' to install programs/data under Mac OS X
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12303 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-04 13:59:15 +00:00
Ron Lee
978f1259ac Backed out misguided 'build both' patch.
Reshuffled library name code into a slightly neater stack.

Added separate shared and static msw builds to .debs  :(
that makes 13 builds of the core lib alone required to create
all packages now..  (anyone want to donate me a fast MP box :)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12301 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-04 01:29:54 +00:00
Gilles Depeyrot
b585338405 install apparently ignores -p option under Mac OS X, use cp -p instead
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12296 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-03 23:08:16 +00:00
Gilles Depeyrot
6054113a50 corrected install program for Mac OS X (use AC_PROG_INSTALL but add -p option
to INSTALL_PROGRAM and INSTALL_DATA in order to preserve modification dates)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-03 22:42:30 +00:00
Václav Slavík
ea7682f015 oops, configure defined _WIN_IE instead of _WIN32_IE for cross-compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12291 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-03 21:35:21 +00:00
Ron Lee
4fb788e466 Added static lib to shared build targets for wxMSW builds.
Added -dbg packages for msw-cross.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12286 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-03 13:00:52 +00:00
Ron Lee
d685354062 Tweaked config for weird static lib BSDism.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-03 11:29:05 +00:00
Ron Lee
77e1340840 Added separate import lib for msw .dlls
Removed useless mingw and cygwin options.
Fixed library naming for msw _gl and set 'unix' style names for cross
builds and 'windows' style for native builds.
Added $target to wx-config, and fixed lib/header dir exclusions.
Added -mwindows to wx-config output for gui libs.
Fixed wx-config to output import lib instead of dll for shared
msw builds.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12284 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-03 11:08:15 +00:00
Vadim Zeitlin
6f75447397 give an error and stop if OpenGL libs not found but --with-opengl was specified
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-02 15:45:07 +00:00
Gilles Depeyrot
a3df447d8b shortened configure warning messages to avoid exceeding 80 characters
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12236 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-31 22:18:22 +00:00
Mattia Barbon
f676c7ffd5 * make install now installs OLE headers on cygwin
* cygwin now uses the same naming conventions for libraries as the
  rest of wxMSW
* updated filelist.txt
* added code to filelist.t fo parse OLE headers
* all platforms using configure now have
  --enable-no_rtti, --enable-no_exceptions on by default


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12160 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-24 20:41:34 +00:00
Gilles Depeyrot
4f14bcd874 implemented --with-<lib> options (yes, no, sys, and builtin) for libjpeg,
libtiff, libpng, freetype, regex and zlib
default is sys which falls back to builtin if the system library is not found


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-23 21:03:32 +00:00
Robert Roebling
6fa882bd0a Correction for make install and wxMac static libs.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12143 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-21 23:01:11 +00:00
Stefan Neis
9829f27727 Added support for new style OS/2 autodetection.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12136 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-21 12:38:31 +00:00
Gilles Depeyrot
5d6c436536 removed corrected detection of wchar_t under Mac OS X (added in revision 1.355)
since there only seem to be stub functions (no wcslen available)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12100 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-19 21:13:06 +00:00
Vadim Zeitlin
af15babd51 typo fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12097 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-19 19:08:13 +00:00
Vadim Zeitlin
9952adac06 use statvfs() if statfs() is not available (Solaris)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-19 19:03:52 +00:00
Vadim Zeitlin
d714471b30 don't include X11 path before our own -I because on some systems (FreeBSD) wx headers are installed under /usr/X11R6/include
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12091 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-19 17:30:04 +00:00
Vadim Zeitlin
12232f37d1 fixed test for statfs() for BSD systems, not just MacOSX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-19 16:56:53 +00:00
Gilles Depeyrot
652d930d65 Use -h instead of -L to test for link
-h is documented as obsolete under Mac OS X but works
  -L is obsolete under Solaris8
Will need to fix this when -h no longer works under Mac OS X


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12039 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-17 11:26:30 +00:00
Robert Roebling
e23081dec8 Further fixes for wx-config and MacOS X.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12006 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-15 15:40:44 +00:00
Robert Roebling
2baaf735f4 Added Rez support to wx-config for MacOS X
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12004 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-15 10:06:24 +00:00
Ron Lee
7cf43d5ef9 Merged IA64 build fixes from 2.2 (this will undoubtably need to be tested
before we can claim 2.3 works on that platform)
Updated config{guess,sub}


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11978 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-14 00:20:37 +00:00
Gilles Depeyrot
13c0541d3c Added flat Carbon and MoreFiles headers to compile flags
Added MoreFiles to wxMac toolkit VPATH
Removed check for strings.h for wxMac (conflict with flat Carbon headers)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-13 12:26:50 +00:00
Gilles Depeyrot
683dccdaeb provide option to disable use of precompiled headers (Mac OS X)
this is useful for tinderboxes where the errors produced by the Apple
Developer Tools make it difficult to sort through the logs


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-10 21:47:12 +00:00
Ron Lee
a068364f32 removed obsolete samples/univ from SAMPLES_SUBDIRS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-03 01:33:24 +00:00
Ron Lee
fc26f4abde Diabled wxToggleButton for wxUNIVERSAL builds too.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-03 01:19:29 +00:00
Ron Lee
1a4f0015e4 diable MDI for wxUNIV builds for now.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-02 23:52:10 +00:00
Ron Lee
7b7a763758 Added UNIV_DIST target.
Fixed hp-hpux lib build targets.
Enabled cygwin cross compilation for 2.3 too.
Fixed SONAME_FLAGS for solaris.
Fixed PIC_FLAG for mingw.
Added first draft of wxUNIV debs.
Removed obsolete src/makeenvs/*


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-02 21:36:16 +00:00
Gilles Depeyrot
334f0d2c11 corrected VPATH for wxMotif toolkit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-02 17:03:50 +00:00
Gilles Depeyrot
077c564202 reverted unwanted change to -MMD compilation option in previous commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-02 15:54:21 +00:00
Gilles Depeyrot
d08b457ba8 corrected static library configuration for Darwin/Mac OS X
Mac OS X resource related corrections


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-02 15:48:50 +00:00
Vadim Zeitlin
d275c7eb84 added wxUSE_PALETTE and fixed compilation with it set to 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11749 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-30 22:06:39 +00:00
Vadim Zeitlin
b3e8d00ab0 1. made description of some options in configure [hopefully] more readable
2. got rid of --enable-wcsrtombs option, configure can find it out itself


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11715 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-28 13:34:12 +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
Václav Slavík
c981cbe951 configure now defines _WIN_IE if w32api is at least 1.1 (1.0 is not complete enough for wxWin)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11669 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-22 16:17:09 +00:00
Vadim Zeitlin
dd4f7467b2 fix for shared library build under SGI with native compiler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11654 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-20 19:28:20 +00:00
Vadim Zeitlin
55e80573e2 changes to shared library options code and to allow building them with Intel compiler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11636 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-18 18:17:11 +00:00