Commit graph

46 commits

Author SHA1 Message Date
Vadim Zeitlin
3f66f6a5b3 Remove all lines containing cvs/svn "$Id$" keyword.
This keyword is not expanded by Git which means it's not replaced with the
correct revision value in the releases made using git-based scripts and it's
confusing to have lines with unexpanded "$Id$" in the released files. As
expanding them with Git is not that simple (it could be done with git archive
and export-subst attribute) and there are not many benefits in having them in
the first place, just remove all these lines.

If nothing else, this will make an eventual transition to Git simpler.

Closes #14487.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-26 16:02:46 +00:00
Vadim Zeitlin
97981439aa Replace "_amd64" with "_x64" in a few more places.
Fix bakefile presets and MSVC-specific setup.h.

Also document TARGET_CPU=X64 instead of AMD64.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71979 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-07 15:36:58 +00:00
Vadim Zeitlin
0d2a693bbd Add support for webview library to MSW bakefile presets.
The webview library wasn't linked in correctly when using MSW bakefile
presets. Fix this by adding the corresponding <sys-lib> for it (this needs to
be done for MSW only, under Unix it's handled by wx-config).

Closes #13789.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70063 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-20 13:27:59 +00:00
Francesco Montorsi
694b7ca407 define TARGET_CPU (as a variable) also for formats using MSVS_PLATFORM; this allows a simpler logic in the following tests (and in the user bakefiles)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-03-05 20:51:42 +00:00
Francesco Montorsi
617bcbe241 add 64bit support to those formats which I could test and which support 64bit build modes (msvc, msvs2005prj and msvs2008prj) by adding a TARGET_CPU option similar to what wxWidgets bakefiles do (note the absence of the WX_ prefix since it does not make sense to have a wx-specific architecture); this additional feature allows correct inclusion of the vc_[amd64|ia64]_[lib|dll] path when building a wx-based project on Windows.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63608 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-03-03 00:35:44 +00:00
Vadim Zeitlin
226ac45fc3 Honour COMPILER_PREFIX in wx presets too.
If a non-default COMPILER_PREFIX was specified when building wxWidgets, we
should also be able to use the same prefix when building applications using
this build, so use COMPILER_PREFIX instead of just COMPILER in the project/
makefiles generated using wx presets.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62323 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-07 10:50:45 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
Václav Slavík
e943ebd8b5 previous commit didn't work with bkl-0.1.8, fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34664 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-06-15 22:30:01 +00:00
Václav Slavík
965122c49f basic eVC support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34663 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-06-15 22:17:53 +00:00
Václav Slavík
c7ca49e407 fixed typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34653 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-06-14 18:46:49 +00:00
Václav Slavík
861a4cb2b0 removed debugging code checked in by mistake
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34652 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-06-14 18:25:03 +00:00
Václav Slavík
1ed52f8caa call release builds 'Release'; don't define options if they are already defined by user's bkl code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-06-14 18:11:15 +00:00
Julian Smart
3103e8a97e Typo correction patch [ 1208110 ] Lots of typo corrections
Olly Betts


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-31 09:20:43 +00:00
Kevin Ollivier
21dc40ed32 ODBC library is part of base, so make sure the dependency is set accordingly.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34023 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-11 21:29:28 +00:00
Václav Slavík
4c1672f728 use wx-2.6, not 2.5, by default
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-27 19:08:15 +00:00
Václav Slavík
bb51876f6c fixed wrong order of libraries in the output
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33330 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-04 20:25:38 +00:00
Václav Slavík
9322030046 made options defaults configurable
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-04 11:04:45 +00:00
Włodzimierz Skiba
438eb6502b Fix for accessing environment variable with Watcom format.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32981 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-03-22 12:59:41 +00:00
Václav Slavík
c07e76fae4 added wx-lib template for building static libs (no linking)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31622 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-01-28 22:25:08 +00:00
Václav Slavík
6cab647638 fixed linking against 3rd party libs in Unicode build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-01-28 22:11:00 +00:00
Václav Slavík
83c7f6a7ac added bakefile presets for creation of user makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31612 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-01-27 22:47:37 +00:00