Commit Graph

87 Commits

Author SHA1 Message Date
Vadim Zeitlin
1dfc18a004 Link with ws2_32.lib rather than obsolete wsock32.lib
Winsock 2 provided by ws2_32.lib is available since 1994, it should be
fine to use it even for wx in 2021.

See #15562.
2021-04-18 22:13:45 +02:00
Vadim Zeitlin
426a0ed527 Remove HAVE_W32API_H definition and checks
All still supported versions of MinGW/Cygwin provide w32api.h file, so
there is no need to test for it.

This allows to simplify the code, but also remove the definition of
HAVE_W32API_H from bake- and makefiles and this, in turn, allows to get
rid of extra flags in MinGW format entirely, as we don't support gcc
2.95 for which they were originally needed neither.
2020-10-20 01:47:47 +02:00
Vadim Zeitlin
3ffa651a34 Move wxAdv library contents into wxCore
This basically removes the "adv" library, even though it's still
preserved for compatibility with user make/project files referring to
it.

It is done because the distinction between "adv" and "core" was never
really clear (e.g. why wxTreeCtrl was in core but wxTreeListCtrl in
adv?) and it prevented some core classes from using adv ones.
2018-08-27 21:13:04 +02:00
Bryan Petty
ed173ed91e Use HTTPS with Trac links. 2017-07-04 13:15:14 -06:00
Vadim Zeitlin
aa970c3da3 Remove all mentions of msevc4prj from bakefiles
Neither eVC nor wxWinCE port it was used for are supported any longer, so
simplify the bakefiles by removing the checks for it.
2015-10-07 18:14:55 +02:00
Tobias Taschner
8282c1be0f Remove Windows CE support
Windows CE doesn't seem to be supported by Microsoft any longer. Last CE
release was in early 2013 and the PocketPC and Smartphone targets supported by
wxWidgets are long gone.

The build files where already removed in an earlier cleanup this commit
removes all files, every #ifdef and all documentation regarding the Windows CE
support.

Closes https://github.com/wxWidgets/wxWidgets/pull/81
2015-09-23 00:52:30 +02:00
Bryan Petty
cf5b3021c6 Don't link shlwapi directly.
For MSVC use #pragma comment to link shlwapi, and for MinGW use dynamic
loading of this library.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77635 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-10 14:57:06 +00:00
Bryan Petty
952a6eabf4 Update bakefiles and VS2010+ project file.
Author: Chaobin Zhang

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-10 14:55:48 +00:00
Vadim Zeitlin
15f255cebb Remove support for Digital Mars compiler.
This compilers is not being developed any longer since many years, drop
support for it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76547 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-16 13:01:23 +00:00
Vadim Zeitlin
49b8d79c87 Remove (Open)Watcom support.
This compiler is not being developed since several years and almost certainly
can't be used to build the current wxWidgets sources anyhow, so remove all
support for it, including a lot of extremely ugly workarounds for its bugs
with template functions.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-16 13:01:06 +00:00
Vadim Zeitlin
01f9accd19 Remove wxPM, wxWidgets port to OS/2.
This port is not used and is not being worked on, so remove it to reduce the
amount of the code which needs to be updated for every global change.

Also remove tests for VisualAge compiler which isn't used since ages.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76533 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-15 23:56:58 +00:00
Vadim Zeitlin
f4b80e5337 Remove MSVC6 support.
Don't support this compiler any more, this allows to get rid of tons of
MSVC6-specific workarounds, in particular we can now use Bind() and natural
template functions calls in the library code.

Also remove MSVC6 project and solution files and don't generate them when
bakefile_gen is ran any more (removing the remaining occurrences of msvc6prj
from the bakefiles results in weird bake-time errors, so it's simpler to just
leave them there).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-15 22:32:17 +00:00
Vadim Zeitlin
4de86c0b26 Update version to 3.1.0.
And regenerate everything.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75261 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-11-21 13:47:05 +00:00
Vadim Zeitlin
c5a00fab56 Update the version in bakefile presets to 3.0 too.
Also mention this file in the list of files to update when changing the
version.

Closes #15577.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74992 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-10-13 10:30:13 +00:00
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
0e1f8ea4a3 Remove wxMGL port.
The company behind MGL toolkit (SciTech) doesn't exist since several years and
this port is not used by anybody, so remove it to ease maintenance burden.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70353 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-15 14:46:41 +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
Steve Lamerton
467d261e9d Rename web library to webview.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-19 10:45:16 +00:00
Steve Lamerton
cfcf1d6ee3 Application of the most recent wxWebView patch, the only changes were so tab to space conversions. Please note this probably won't compile.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@67698 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-04 15:40:00 +00:00
Dimitri Schoolwerth
4c51a665c6 Fixed various typos.
Applied patch by snowleopard2 fixing a bunch of typos such as misspellings and double words in the documentation. Combined the patch with some local queued typos waiting to be committed as well as adding new typo fixes inspired by the patch.

Function names with American spelling were not changed nor was third-party code touched. The only code changes involve some changes in strings that are translated ("Can not" -> "Cannot").

Closes #13063 (again).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-22 14:17:38 +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
7b9cb2d1ef Avoid defining COMPILER_PREFIX for autoconf format.
This fixes a fatal bakefile error due to undefined COMPILER variable when
using wx presets with autoconf backend introduced in r62458.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62998 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-12-27 19:40:22 +00:00
Francesco Montorsi
124a5e3e6a update wxpresets for new osx_carbon and osx_cocoa names provided by the wx-config --selected_config command
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-22 15:44:30 +00:00
Václav Slavík
84cd6e0c68 added COMPILER_PREFIX support to wxpresets
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-19 13:57:25 +00:00
Vadim Zeitlin
41084d1604 Define COMPILER_PREFIX as COMPILER if it's not defined.
Temporary fix after the changes of r62323 which broke generation of makefiles
using wx presets unless they explicitly defined COMPILER_PREFIX: define
COMPILER_PREFIX as COMPILER by default.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62456 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-19 08:59:33 +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
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
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
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
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