Commit Graph

68 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
046e85ca80 Remove WX_DEBUG option from Unix wx presets, it's not needed any more.
It doesn't make sense to select debug or release build of wxWidgets any more
as they are now compatible under Unix. Under Windows the option is still
needed but it selects the build using debug (or not) version of the CRT rather
than the one built with __WXDEBUG__ defined.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61891 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-12 11:29:49 +00:00
Vadim Zeitlin
9a83f86094 Globally replace _T() with wxT().
Standardize on using a single macro across all wxWidgets sources and solve the name clash with Sun CC standard headers (see #10660).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-07-23 20:30:22 +00:00
Vadim Zeitlin
e5405b6b21 added new wx-config --query-xxx options and use them in (Unix) bakefile presets instead of parsing --selected-config output to fix the use of presets when cross-compiling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61026 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-12 17:26:11 +00:00
Vadim Zeitlin
1146927789 use ldlibs, not ldflags, for wx-config --libs output in gnu format as well as in autoconf one to ensure that the libraries appear at the end of the linker command line
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59297 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-03 19:20:44 +00:00
Francesco Montorsi
491c42d00f fix description of wxconsole template; add description for wxgui template
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-05 17:25:13 +00:00
Francesco Montorsi
0e0134acea make WX_UNICODE default to 1 since ASCII build is now deprecated!
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57079 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-02 22:02:32 +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
Václav Slavík
b0267bdc2c added <xrc-file> tag to wxpresets
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-23 20:31:16 +00:00
Francesco Montorsi
e0b7c2b713 use WXLIBPOSTFIX inside the define-*-name tags so to make the generated makefiles much shorter.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51664 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-02-11 21:01:06 +00:00
Francesco Montorsi
b8524670d9 Gl library is not part of the monolithic library even when MONOLITHIC=1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51298 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-20 12:34:30 +00:00
Václav Slavík
92a93d4659 added 'wxgui' template to make writing makefiles for gui apps a bit easier
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-12-13 00:58:56 +00:00
Vadim Zeitlin
0d61c16786 no real changes, just updated bakefile URL and fixed some spelling errors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50239 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-25 13:01:28 +00:00
Václav Slavík
43daffe5a4 added never_empty hint on WX_DIR option
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-14 10:13:03 +00:00
Francesco Montorsi
7fb02ea7d6 fix some typos/imprecisions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49938 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-13 21:10:26 +00:00
Francesco Montorsi
001c002122 allow wxpresets to be used with xcode2 format (even if it's not fully functional yet)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49937 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-13 21:09:33 +00:00
Kevin Ollivier
b357d84136 Use ldflags instead of ldlibs, because wx-config --libs mixes libs and ldflags, and being able to specify order of ldflags is important. (e.g. on Leopard, if any other *-config script adds -L/usr/lib to the linker flags, wx will link against the system-provided wx.) (2.9 port)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-10 19:33:10 +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
Vadim Zeitlin
5458b18a18 fix from Francesco for the latest version of wxPresets
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-07-08 23:11:55 +00:00
Vadim Zeitlin
a78a8f7fd5 make test_for_selected_wxbuild target optional (patch 1696363)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-08 21:45:11 +00:00
Robin Dunn
cf63f3d3ae More patches from FM to clean up after moving contribs. Also removes
use of wxUSE_RESOURCES


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-06 21:08:30 +00:00
Robin Dunn
18cea8715a Patch from FM with more bakefile tweaks and etc.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45260 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-05 18:26:59 +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
Vadim Zeitlin
a6e13ce4f3 added <set-wxlike> tag (patch 1691429)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45166 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-30 18:48:22 +00:00
Vadim Zeitlin
5a5f4ba417 rename wxlike-libdirname to just wxlike-dirname (patch 1685279)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45012 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-22 02:56:15 +00:00
Vadim Zeitlin
c4106e3b2f last fixes from patch 1604462: fix wxlike-libdirname and change WX_VERSION_DEFAULT to have 2 digits, not 3
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44758 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-11 02:37:57 +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
Vadim Zeitlin
e606c82297 use force=1 with default-value tags (part of patch 1604462)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-10 17:30:31 +00:00
Vadim Zeitlin
d65cbb3788 require bakefile 0.2.2 and not 0.2.1 and do it for all platforms (part of patch 1604462)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44729 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-10 17:29:14 +00:00
Robin Dunn
7fd3acaf54 Set version number
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44386 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-02-06 19:58:27 +00:00
Kevin Ollivier
e602dae828 Committing patch #1604462, which improves autoconf support, adds a wxbase template, allows components to have names which match wx lib naming, etc.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44359 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-02-05 01:15:02 +00:00
Robin Dunn
4dd1256aa3 Set default version to "28"
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-11-11 19:53:54 +00:00
Václav Slavík
591a46d420 added support for the 'richtext' library
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41871 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-10 09:54:26 +00:00
Václav Slavík
342d6309bb added support for AUI library
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-10 09:50:26 +00:00
Vadim Zeitlin
67533115f9 renamed RESCOMP to WINDRES due to bakefile changes (patch 1372332)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-26 12:12:18 +00:00
Vadim Zeitlin
dd5cb4b197 define WX_DIR as WXWIN env var for Unix and not only Win32
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-16 15:47:11 +00:00
Vadim Zeitlin
c81032a760 allow specifying non default libraries for gnu output format (patch 1469464)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38756 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-16 15:42:00 +00:00
Václav Slavík
369e0d0575 made WX_CONFIG default configurable
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38435 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-29 16:48:46 +00:00
Vadim Zeitlin
d195f10fe3 don't use -- inside XML comments, this is not allowed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38434 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-29 16:30:29 +00:00
Julian Smart
692ebda6c7 Applied patch [ 1372332 ] Support for WX_RESCOMP to allow MSYS+wx-config to work
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-11 14:51:45 +00:00
Kevin Ollivier
f814ff336e Finishing up Monolithic build support, and proper generation of more wx library names under multilib builds.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37679 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-23 06:59:40 +00:00
Kevin Ollivier
b41b09e285 Documenting WX_MONOLITHIC build option.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37501 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-11 18:41:11 +00:00
Vadim Zeitlin
ad6f7122f6 support monolithic build using wxpresets (patch 1360289)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37472 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-10 21:13:41 +00:00
Włodzimierz Skiba
a20169a49a wxpresets adjustement to dmars format.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36626 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-02 15:06:45 +00:00
Julian Smart
650372cf91 Applied patch [ 1305650 ] ODBC32.lib is not included for borland by wxpresets
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-24 17:09:43 +00:00
Vadim Zeitlin
01cca03e20 change fallback default for wx version to 27
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35805 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-06 09:08:27 +00:00
Vadim Zeitlin
9864ef3b5c fix for library order when using wx-dependent libraries (part of patch 1303724)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 11:21:48 +00:00
Vadim Zeitlin
61a15bac86 don't put odbc lib twice in the generated makefile (part of patch 1303833)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35674 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 11:19:39 +00:00
Václav Slavík
ee196d6480 some 3rd party libs are not buildable under eVC, don't link against them
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-06-16 18:40:20 +00:00
Vadim Zeitlin
6af800ff6d initial attempt to make it work for eVC (WinCE) as well
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34667 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-06-16 00:18:22 +00:00