Commit Graph

27 Commits

Author SHA1 Message Date
Gilles Depeyrot
ad80f0d194 removed MAKE variable which is set by make, otherwise it recursive makes do
not work when make is in fact gmake (or some other name)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12694 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-25 19:19:27 +00:00
Ron Lee
00c813596e make --static flag act on --cppflags too.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12365 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-09 05:24:36 +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
Gilles Depeyrot
b53e38fed5 changed ar options to reduce build verbosity
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12242 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-31 23:21:25 +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
7e67ed0df4 moved wxINSTALL_PREFIX from CPPFLAGS to setup.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11336 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-08 23:46:39 +00:00
Vadim Zeitlin
a3cb1afc37 1. next attempt to fix RH 7.1 build
2. CPPFLAGS are the flags for cpp, not for c++ compiler!


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11330 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-08 22:52:53 +00:00
Gilles Depeyrot
2f51a9ecc5 Added Mac OS X resource file handling:
- rez wxMac library resources into a rsrc file in the lib directory
  - derez the previous rsrc file into an ascii file in the lib directory
  - rez the ascii file into the executables as needed
  - mark executables with application creator code APPL
Compiling the resources into a file in the lib directory avoids dependencies
on the wxMac resource sources when creating executables. However, decompiling
and recompiling could be avoided if resource merging worked (ResMerger?).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-01 19:40:09 +00:00
Vadim Zeitlin
7d88e2447e applied patch 419155 (OLE x-compilation with mingw)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-26 16:17:14 +00:00
Bryan Petty
f6bcfd974e merged 2.2 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-07-15 19:51:35 +00:00
Vadim Zeitlin
8461a0598c removed -Icontrib from src/make.env, use APPEXTRADEFS for such things instead
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6699 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-14 17:09:45 +00:00
Vadim Zeitlin
3283290881 patch from Paul Gammans <paul.gammans@brunel.ac.uk> for cross compiling for MSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6559 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-09 20:18:59 +00:00
Vadim Zeitlin
d76bb2182d APPEXTRALIBS added to LDLIBS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6494 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-07 09:15:35 +00:00
Vadim Zeitlin
e006f096ad attempt at fixing LDFLAGS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6286 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-25 15:32:24 +00:00
Vadim Zeitlin
caa2c79b45 -fpermissive is now returned by wx-config -cflags if the library was compiled
with it


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-05 17:11:09 +00:00
Robert Roebling
64d78265d0 EXTRA_LIBS vs. EXTRALIBS change.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5244 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-04 20:14:54 +00:00
Vadim Zeitlin
e2b8b0662c fixes for wxINSTALL_PREFIX definition
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5077 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-12-23 14:21:56 +00:00
Vadim Zeitlin
b12915c104 1. wxBase compiles under BeOS
2. several bugs corrected in wxTextCtrl::Load/SaveFile (wxMSW)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5068 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-12-22 21:09:32 +00:00
Karsten Ballüder
d9b77fb236 Added missing CPPFLAGS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4297 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-11-02 14:41:28 +00:00
Karsten Ballüder
3e469ea37f Added wxINSTALL_PREFIX define to makefile and made dcpsg.cpp use it to
find the correct location of AFM files.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-11-02 12:36:14 +00:00
Harco de Hilster
80d895cd3f Fixes for smoother cross compilation;
- added parser.o to msw objects in unx.t
- made sure 'lexer.c' is included in parser.y when cross compiling wxMSW
- added optional program extention PROGRAM_EXT set by configure, so that
  makeprog.env can create .exe files
- a few additions to setup.h.in (wxUSE_OWNER_DRAWN for wxMSW, hack to fix
a clash with __WINDOWS__ define in wx/deps.h


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3442 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-08-22 22:43:58 +00:00
Robert Roebling
8a5137d74a More makefiles
Corrected two thing in wxDialogBase (empty lines) and
    msgdlg (wrong flags)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3376 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-08-13 19:39:15 +00:00
Robert Roebling
a8efa9e391 More smaple makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3374 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-08-13 18:54:54 +00:00
Karsten Ballüder
66635d688c fixes for make install
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-08-13 18:22:25 +00:00
Robert Roebling
a4aad9613a Started "make dist"
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3367 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-08-13 10:33:08 +00:00
Robert Roebling
48b1d0ff4f New makefile updates.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3349 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-08-11 17:40:09 +00:00
Robert Roebling
9635832dbd Forgot one.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3340 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-08-10 20:09:45 +00:00