Commit Graph

93 Commits

Author SHA1 Message Date
Peter Cawley
3c3ead1d15 Merged GSOC Ribbon work from SOC2009_RIBBON branch into trunk.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-16 12:06:02 +00:00
Vadim Zeitlin
c6684d425d Use "d" suffix according to DEBUG_RUNTIME_LIBS, not DEBUG_FLAG.
The "d" suffix is now only used under Windows and indicates that we link with
debug CRT version.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61887 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-12 11:29:11 +00:00
Vadim Zeitlin
0c4311ca1e Enable debug information in release builds for msvc makefiles too.
Debug information was enabled for release builds for MSVC project files but
not the makefiles which was inconsistent, correct this.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-04 16:21:05 +00:00
Vadim Zeitlin
671683c445 enable OpenGL library build by default under Windows too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-05-31 12:55:11 +00:00
Kevin Ollivier
19beefa6f3 On Mac, ensure that the library path and dependencies point to the right location whether or not the library is installed.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-15 16:07:56 +00:00
Francesco Montorsi
516cf181f8 add the -headerpad_max_install_names option to the screenshotgen utility to fix the buildbot builds on MacOSX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-29 12:11:48 +00:00
Vadim Zeitlin
7da8bfe30d add VC9 project files (closes #9960)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56164 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-10-08 16:42:00 +00:00
Vadim Zeitlin
1c4293cb91 added wxPropertyGrid from Jaakko Salli (#9934)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-12 20:57:41 +00:00
Vadim Zeitlin
00b20999de set TOOLKIT to WINCE for VC8 builds targeting pocketpc2003
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52059 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-02-24 23:06:58 +00:00
Václav Slavík
2275c73268 updated bakefiles to take advantage of Bakefile 0.2.3 (now required)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-23 12:04:13 +00:00
Václav Slavík
cc8953a695 fixed generating of makefiles that don't include common.bkl and so didn't have IS_MSVC_PRJ defined
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50716 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-12-15 11:20:59 +00:00
Václav Slavík
24dfe91709 removed ANSI configs from VisualC++ project files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50237 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-25 11:14:40 +00:00
Václav Slavík
2f8711edd0 removed gstreamer dependency from all libraries except for wxMedia, not only from wxBase
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50116 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-20 22:35:40 +00:00
Václav Slavík
7a4fa5692d Added support for Visual C++ 2003 project files (still disabled until Bakefile 0.2.3 release
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50065 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-18 21:54:54 +00:00
Vadim Zeitlin
1e6b2edfc8 remove ODBC and DBgrid libraries
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-10-23 13:40:27 +00:00
Václav Slavík
4fc1c0f091 made wxUSE_UNICODE=1 the default
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-06-22 12:34:38 +00:00
Václav Slavík
b1b592ad75 don't compile Scintilla sources with -Wall
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45471 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-14 19:05:45 +00:00
Robin Dunn
54429bb380 Bakefile and other changes for new locations of STC and wxSVGFileDC.
Remove old files in contrib.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-05 06:27:23 +00:00
Václav Slavík
18bab03e69 removed C++BuilderX project files, they are broken, not used by anybody and the product is dead
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44742 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-10 19:25:51 +00:00
Václav Slavík
1ff18f49b9 added support for Bakefile's upcoming msvs2005prj format (not enabled by default yet, would fail with the latest released version otherwise)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44186 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-10 14:03:23 +00:00
Václav Slavík
6589dc98a0 don't use top_builddir so that configure.in works with autoconf 2.5x as well as 2.60+
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43039 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-11-04 17:08:49 +00:00
Robin Dunn
2713e62971 Add USE_GDIPLUS option that will control (for the makefile builds) if
the gdiplus.lib library is added to the link, and whether
wxUSE_GRAPHICS_CONTEXT should be defined.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-05 22:45:17 +00:00
Julian Smart
3b2cb4316b Moved wxRichTextCtrl to its own library
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39882 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-29 07:16:39 +00:00
Włodzimierz Skiba
32a5229008 USE_AUI build fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39649 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-09 15:37:10 +00:00
Julian Smart
50acee04cd Initial commit of wxAUI
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39589 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-06 13:12:07 +00:00
Václav Slavík
b1e411d9f5 fixed bug: option's default value must be among the list of allowed values -- removing <values> list to fix this
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-23 15:59:20 +00:00
Vadim Zeitlin
b1ac62dda7 fixed USE_QA_DEFAULT usage (bug 1431952)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-15 14:57:41 +00:00
Vadim Zeitlin
557002cf81 Ryan's cumulative wxActiveX and media control patch (1427775)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37461 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-10 19:37:40 +00:00
Vadim Zeitlin
cf9b63b38a regenerated all makefiles with bakefile 0.2.0; removed REZ option from config.bkl as it's now defined by bakefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-10 19:27:51 +00:00
Vadim Zeitlin
aae7e12e1d set USE_QA to 1 for VC builds only by default (real fix for bug 1419152)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-05 16:09:54 +00:00
Włodzimierz Skiba
7ee1ea9d99 Static build for wxMGL/DOS and little readme.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37113 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-24 20:23:16 +00:00
Włodzimierz Skiba
43b0b6bc59 wxMGL bakefiled for OpenWatcom (needs bakefiles from CVS but compatible with bkl 0.1.9.X for other ports.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-08 23:58:18 +00:00
Vadim Zeitlin
8c17c7a633 define REZ option (fixes problem with rebaking wx.bkl for autoconf format)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36279 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-29 01:17:18 +00:00
Michael Wetherell
c8d5853155 Add rcdefs.h and support for automatic manifests on Windows
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36133 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-08 22:49:46 +00:00
Michael Wetherell
4c4863dbe7 Bake fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36132 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-08 22:24:35 +00:00
Włodzimierz Skiba
b8af111fa5 wxMGL revitalised with OpenWatcom.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36042 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-31 17:00:43 +00:00
Michael Wetherell
e40b74ba83 Add CPU_TARGET option to msvc makefiles for targeting AMD64 and IA64
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-16 20:25:10 +00:00
Julian Smart
bc858dcfaa Restored monolithic build for eVC++ 4
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-06 12:15:08 +00:00
Vadim Zeitlin
5bcb84f804 disable RTTI and exceptions by default for wxWinCE/eVC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35118 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-05 23:13:33 +00:00
Włodzimierz Skiba
1dba7b4c69 wxOS2 with Open Watcom: correct PCH usage, missing headers, warning fixes, source cleaning and other Watcom adjustements.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34904 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-21 17:30:41 +00:00
Václav Slavík
8c249a5994 reverted DEBUG_INFO change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33721 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-17 19:08:34 +00:00
Václav Slavík
9d33d6b82c DEBUG_RUNTIME_LIBS depends on BUILD now, not DEBUG_INFO
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-16 13:14:35 +00:00
Vadim Zeitlin
61639efb66 added qa library (currently consisting of wxDebugReport and related classes only); moved debugrpt.* files there
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-03-21 00:11:06 +00:00
Vadim Zeitlin
c2efd89044 added USE_RTTI (instead of it being set by USE_EXCEPTIONS)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32245 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-20 14:14:08 +00:00
Václav Slavík
d1e5aa0793 added USE_THREADS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32244 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-20 13:22:24 +00:00
Robert Roebling
7fcba069d8 Added gprint.cpp to bakefiles.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30233 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-01 23:06:30 +00:00
Włodzimierz Skiba
f46a065c3b Free DMC does not distribute OpenGL support.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29842 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-14 17:05:29 +00:00
Ron Lee
589e20d03c Move the WX_FLAVOUR variables to be defined generally, not just for
autoconf builds, else the wince targets (at least) will complain.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29259 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-22 15:08:33 +00:00
Ron Lee
ceec2216bd wx-config2.6
Designed to be resiliant against future cut and paste coders.  Any
gnarly parts are black boxed away nicely to avoid accidents and have
integrated debugging support for trivial sanity checking in the event
of modification or trouble.  In this way the major operations are all
cleanly separated making any or all of them simply extensible, or
replaceable in the face of future needs.  Functions now all have api
descriptions.  If you rely on a function to act in some way, please
document it to safeguard yourself against inadvertant interface
changes by others.

Everything now runs top top to bottom, we don't try to output things
as fast as we can read them anymore, instead we read everything in,
sort over it just once without the need for 'just in case' temp's, and
then output whatever we were asked for only when we are sure we have
the correct answer.  Almost all key data aims to be constant past the
point of its initialisation so side effect creep and trouble with half
(re)initialised data should be significantly reduced in future.  In
almost every case it is easy and clean to simply delay initialisation
until all required input channels have been emptied.  If you like,
think of it as mostly being one big constructor, with a little
destructor at the end which outputs what you requested.  At core, it
is simply a generated config file -- with some user friendly logic for
extracting its data and finding related files.

Removed references to --gl-libs in --help.  It still exists, but if
its deprecated, no need to fill space in a compact help summary.  It
will remain documented (as deprecated) in the man page.

Removed references to arcane order rules for arguments.  Those
limitations don't exist anymore, though the options are backward
compatible in all other respects from the user pov.

Removed references to --inplace, it doesn't need to be in the summary
help either.  It also is still accepted as an option, but there is no
value in passing it, an uninstalled wx-config will automatically
behave correctly.  When you need --inplace, it will supply that
behaviour for you (but there is no harm in typing it your self in that
case).  If you do type it when you don't need it, bad things will
probably happen just like they always would have.

Along with items above, generally compressed --help text to fit on
even a traditional sized terminal without the need for paging.  If we
want more detailed help built in, it should be broken into separate
pages, and this would be a trivial extension.

Command line input is now controlled by a small generic parser.  You
define what options you want and what groups you want them in by
initialising them as lists.  It runs over all the input and fills
corresponding psuedo-hashes from it for you to use as you please
later.

Added a validator for it to check yes/no options.

Use posix extended regex instead of gnu 'basic' regex extensions,
grep -E is portable, if gmake is not a requirement, we surely can't
push gnu grep on people.

Made --list more user friendly.  It will now always list the current
wx-config if it matches the feature spec, though it will warn if that
config is not in the specified --prefix.  Alternate configs that match
(if any) are listed separately. An unqualified call to wx-config --list
will always return (at least) the config that was called.  We can never
have a 'hanging' wx-config shell with no real implementation to back
it up anymore so we can always return a sensible result for the user.
A wx-config anywhere can list (and hence use) the configs installed in
any (other) prefix.

Delegation.  Too big a topic to remark on in depth here, see the code
for a fuller description.  With everything being nicely constant and
aligned to the respective library build, then aside from delegation,
wx-config really is _just_ a config file (albeit with a layer of logic
around the constants), and each wx-config carries a set of defaults
which match perfectly the library build that it was generated with.
If you choose a set of features that it can match, it will answer all
your queries for them, if it cannot, it will seek to delegate to the
config that is most like itself, but which can supply all the features
you specified.  This should be completely compatible with any set of
options that returned a sensible result previously, and produce a
sensible result in many cases where previously the collating order
of your locale or the nuances of your filesystem operations would
decide which library it thought you wanted.

Sort duplicates out of the list of libraries and trickle shared
dependencies down the list to properly support static builds.

Added the inplace-config tweak for use in the build tree.  This works
like any other config, except it presets the default prefix to point
at the build dir instead of the configured prefix that will become the
default if this build is installed.  It provides the behaviour of
--inplace when $build_dir/wx-config is called without also specifying
a different --{exec-,}prefix or any feature flags that it is
incompatible with.  In that event, it will try to delegate as per the
normal rules.

The inplace wrapper is not installed with the primary config which
cleanly disables it for system installs.  It will be invalidated if
the build (or source) dir is moved, but will be revalidated if the
build tree is subseqently updated with ./config.status --recheck &&
config.status (which it probably would need to be to build anyway for
other reasons at present too)

Enabled full support for static builds again, promoted --static to a
full feature option.  Fixed --ld to return something for them too.

Added --flavour, similar to the existing --vendor, but for autoconf
builds.  These will probably want to be streamlined further.
Broadened the use of release and flavour labels to support better
concurrent installs.

Fix bit rot in make-dist due to new/deleted files.

Whittled down the number of obsolete and duplicated substitution
variables in configure.in, and lowercased some variables we no longer
export for substitution.  Use the autoconf macros to generate files
where we want them instead of making them someplace and then moving
them all about.  Remove extra files and symlinks added for the two
part wx-config version.

Removed the debian -contrib packages.  We'll use multi-lib support
to manage them from now on and indiviual libs can be split out along
functional lines if required.  This means the retained contribs will
now get __WXDEBUG__ versions packaged too.

Removed conflicts from almost packages except i18n and wxPython. All
packages now either update or install alongside any existing ones.

Added support for flavoured debs as well.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-21 17:16:29 +00:00
Václav Slavík
3849327bce moving XRC to the core
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29231 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-20 18:41:19 +00:00