Commit Graph

2176 Commits

Author SHA1 Message Date
Stefan Csomor
b047233fe3 adding carbon option and sdk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76848 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-05 19:30:36 +00:00
Stefan Csomor
6fedbe036d typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-05 19:14:03 +00:00
Stefan Csomor
3c39de1e8a add sdk again
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76846 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-05 19:08:08 +00:00
Stefan Csomor
fa424608e1 change quoting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76845 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-05 19:04:57 +00:00
Stefan Csomor
c9d5751812 change quoting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-05 19:03:27 +00:00
Stefan Csomor
a83ae40967 adding flags, LDFLAGS need architecture as well
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76843 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-05 19:00:08 +00:00
Stefan Csomor
bb976fe04e next try
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76842 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-05 18:22:01 +00:00
Stefan Csomor
823606f42e next try
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-05 18:21:02 +00:00
Stefan Csomor
21de919394 next try
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-05 18:20:21 +00:00
Stefan Csomor
ceeba66331 xml error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76839 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-05 18:19:35 +00:00
Stefan Csomor
8452d8b56b switching attributes, spaces got eliminated to aggressively
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-05 18:17:34 +00:00
Stefan Csomor
5545427f42 adding builds for stable branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76837 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-05 16:44:56 +00:00
Stefan Csomor
8e72de187e attempt at using variables
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-05 16:13:07 +00:00
Stefan Csomor
22ee0cf589 clang and ccache warnings suppression also for .mm files, turn off other builds temporarily
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-05 15:15:24 +00:00
Stefan Csomor
3b9a328662 clang warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-05 14:37:11 +00:00
Stefan Csomor
fa6beb56ab trying to tune ccache and clang cooperation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76833 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-05 14:13:12 +00:00
Stefan Csomor
fa33a6b912 raising trunk SDK, removing Carbon build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76832 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-05 13:29:31 +00:00
Stefan Csomor
fe4253bab3 revert in case the buildbot problem was caused by this change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-05 10:16:45 +00:00
Stefan Csomor
2e65e9199b remove carbon build temporarily
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76830 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-05 10:14:32 +00:00
Vadim Zeitlin
202f62b4c4 Generate 64 bit configurations in MSVC 8/9 projects.
Update bakefile configuration to include x64 configurations into MSVS 2005 and
2008 projects (2003 doesn't support building in 64 bits, 2010 and later are
manually maintained and already have them) and rebake the projects.

Closes #13675.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-06-24 23:54:08 +00:00
Vadim Zeitlin
c9220befc7 Remove the old release making instructions and scripts.
Using git-based scripts seems to work well and the old scripts are not
maintained any more and having several ways of making releases is just
confusing, so leave only one set of scripts, the one actually used since
2.9.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-06-15 01:33:33 +00:00
Vadim Zeitlin
2594929d9f Move include/wx/unix/execute.h to include/wx/unix/private.
This header is private and is not supposed to be used from the outside the
library.

See #16325.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76683 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-06-11 14:55:08 +00:00
Vadim Zeitlin
6a66c5fbde Move wx/html/forcelnk.h back to wxHTML from wxBase headers.
This partially undoes r32570 which doesn't seem necessary any more as
wx/html/forcelnk.h is only used in wxHTML since the addition of wx/link.h soon
after that revision and having it in wxBase is completely unnecessary and just
looks strange.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76612 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-26 20:15:21 +00:00
Vadim Zeitlin
53a0ef75c1 Update MSVC 10+ projects with upmake.
Update the files used in MSVC 10, 11 and 12 projects from the master files
list.

The main change is the removal of all headers from the core project: it
doesn't seem to make sense to have all headers, even for the completely
unrelated projects, in it and it is easier to just have the core own headers.

The only other changes are the addition of a few headers (including the .cpp
files used as headers) to the base project and the removal of the files which
are never built (but still appear in auto-generated by bakefile projects
because they could have been used in wxUniv case) in the core project.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76611 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-26 20:15:14 +00:00
Vadim Zeitlin
271d1e4589 Add first draft version of upmake, tool for updating makefiles.
Start moving away from files.bkl as the primary source for the files -- and
away from bakefile itself as the make/project file generator -- by storing the
list of files in a new build/files file and provide a simple build/upmake
script for updating files.bkl and the manually maintained MSVC10+ projects
from this file contents.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76610 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-26 20:15:09 +00:00
Vadim Zeitlin
38f55079e5 Add missing wx/msw/webview_missing.h header to MSVC 10+ webview projects.
This file was present in auto-generated VC[789] projects but was forgotten in
the manually maintained ones, add it now.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76609 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-26 20:15:03 +00:00
Vadim Zeitlin
6d54670f1e Separate MSW resource files from the headers.
Use separate MSW_HDR and MSW_RSC variables instead of putting everything into
MSW_HDR: resources, such as .manifest, .bmp, .ico and .cur files, don't belong
to the headers.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76608 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-26 20:14:59 +00:00
Vadim Zeitlin
477fd425e4 No real changes, just use FOO_CMN_{SRC,HDR} for all libraries in files.bkl.
Make variable definitions consistent for all libraries: previously some of
them were decomposed in FOO_CMN_SRC and FOO_PLATFORM_SRC parts while others
just defined FOO_SRC directly and interpolated FOO_PLATFORM_SRC into it.

Use helper FOO_CMN_SRC for all of them now, as it will make it easier to
update them automatically (and the same thing for headers, i.e. HDR variables).

No changes to the generated project/make files.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-26 20:14:56 +00:00
Vadim Zeitlin
da422ea6a3 Minor cleanup in files.bkl.
Remove duplicate file.

Remove commented out variable assignments.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76606 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-26 20:14:52 +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
3a9237d78b Update wx/android/setup.h automatically from wx/setup_inc.h too.
Not sure if this file is actually used at all right now, but update it to
avoid discrepancies with the other setup[0].h.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76544 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-16 13:00:29 +00:00
Vadim Zeitlin
a7a2978fb1 Remove remaining MSVC6 workspace files.
See #15726.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-16 10:00:30 +00:00
Vadim Zeitlin
0d4ad161d5 Remove support for Win9x from wxMSW.
Most importantly, this allows us to remove all MSLU-related stuff.

Some functions which were previously loaded dynamically can now be just used
directly, too.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-16 02:33:40 +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
f8fb172d64 Remove non-existent wx/ownerdrawnbutton.h from MSVS projects.
This resulted in constant spurious rebuilds as this file doesn't exist, only
wx/msw/ownerdrawnbutton.h does.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76480 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-07 13:10:32 +00:00
Vadim Zeitlin
dc83267cbe Put files in the correct groups in MSVS manually maintained projects.
Don't show textmeasurecmn.cpp, textmeasure.cpp and xmlreshandler.cpp at the
top project level.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76479 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-07 13:10:29 +00:00
Vadim Zeitlin
3fd098960f Add LexRust.cxx to manually generated MSVS project files.
This should have been part of r76121, see #15742.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-07 13:10:12 +00:00
Vadim Zeitlin
84a934b456 Remove DebugInformationFormat options from MSVC 10+ projects.
This option is common to all projects and is defined in the global properties
file, so it doesn't need to be present in the projects themselves at all.

See #16236.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76476 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-07 13:10:06 +00:00
Vadim Zeitlin
4386f20f4f Generate debug information for all MSVC builds.
We want to have debug information even for the release builds as it doesn't
affect the binaries produced but greatly helps when debugging, so create PDB
for all release builds as well in the manually maintained MSVS files (this was
already the case for Win32 release builds but not x64 ones for some reason).

This also fixes the problem with "None" being an invalid value for
DebugInformationFormat with MSVC 10 as a side effect.

Closes #16236.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76475 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-07 13:09:55 +00:00
Vadim Zeitlin
0a3329546b Add wx/msw/ownerdrawnbutton.h to {make,project} files.
In particular, ensure that it's installed when using configure+make.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76467 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-06 11:44:14 +00:00
Vadim Zeitlin
e3979f5186 Bring MSVS 2010 projects in line with 2011 and 2012 ones.
The new projects are easier to customize as the build options can now be
specified in wx_vc10_local.props file. They also have correct dependencies and
avoid sharing violations when copying wx/setup.h.

Finally, they also use the correct names for the webview DLL, see #15820.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76448 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-04 22:12:27 +00:00
Vadim Zeitlin
6b12d12fe9 Fix property sheets names in MSVS 2013 custom build project.
It must be vc12, not vc11.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76439 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-02 14:19:59 +00:00
Vadim Zeitlin
0a62ce8c8e Add dependency of wxregex on wx/setup.h in MSVS projects.
Modified regex library code uses wx headers, so build _custom_build project
creating wx/setup.h before it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76438 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-02 14:19:56 +00:00
Vadim Zeitlin
bf793227d2 Extract setup.h copying into a separate project for MSVC11+.
This fixes problems with parallel builds in Visual Studio 2012 or 2013 IDE as
multiple projects may try to copy setup.h file at once, resulting in errors.

Use _custom_build project as a common dependency to ensure that the copy step
is done only once.

Closes #16177.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76419 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-04-27 22:41:59 +00:00
Stefan Csomor
ee0b6b465b recreated project files, see #16192
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76384 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-04-21 18:52:38 +00:00
Stefan Csomor
7354e1461e adding built-in zlib sources, see #16192
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76383 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-04-21 18:37:25 +00:00
Stefan Csomor
52b633eeea adapting xcode build templates and config file to built-in zlib sources, see #16192
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-04-21 18:31:48 +00:00
Paul Cornett
0e212a65eb Add a separate GTK-specific wxDisplay implementation.
This separates the GTK implementation from Unix/X11, except for the wxVideoMode
stuff, and _NET_WORKAREA when GTK < 3.4. wxDisplay and wxClientDisplayRect()
should now work as well as they can with Wayland.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76365 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-04-17 17:36:10 +00:00