Commit Graph

68 Commits

Author SHA1 Message Date
Maarten Bent
343bd89b63 Rebake after changes 2020-03-27 23:15:03 +01:00
Maarten Bent
a72c9b6dbc Run autoconf and rebake after adding wxUSE_DPI_AWARE_MANIFEST 2019-10-30 00:02:08 +01:00
Vadim Zeitlin
f69dbaa1ae Introduce MSW ARM64 support
This is a preliminary ARM64 platform support for wxWidgets at "it
compiles" stage. This will allow building and testing wxWidgets based
apps for oncoming Windows 10 ARM64.

Requirements:
- Visual Studio 2017 Update 4 or later with Visual C++ compilers and
  libraries for ARM64 component installed

Building:
1. Open command prompt.
2. Change directory to build\msw subfolder.
3. Run "C:\Program Files (x86)\Microsoft Visual
   Studio\2017\Community\VC\Auxiliary\Build\vcvarsamd64_arm64.bat" once.
4. Use `nmake TARGET_CPU=ARM64 ...` to build required flavor of wxWidget
   libraries.

Notes:
1. Building of *.sln/*.vcxproj files does not support ARM64 yet. This
   requires to hardcode Windows SDK to 10.0.15063.0 or later in
   *.vcxproj files, which would render them non-compilable in older
   Visual Studio versions. Microsoft is aware of this issue and is
   planning a fix in the next version of Visual Studio.
2. wxmsw31ud_gl.dll does not build yet. Awaiting Microsoft to deliver
   missing opengl32.lib for ARM64. Please, specify USE_OPENGL=0.

Closes https://github.com/wxWidgets/wxWidgets/pull/923
2018-09-17 22:34:32 +02:00
Vadim Zeitlin
e70fc11ef1 Replace CppUnit with Catch for unit tests
Drop the legacy CppUnit testing framework used for the unit tests.
Replacing it with Catch has the advantage of not requiring CppUnit
libraries to be installed on the system in order to be able to run
tests (Catch is header-only and a copy of it is now included in the
main repository itself) and, in the future, of being able to write
the tests in a much more natural way.

For now, however, avoid changing the existing tests code as much as
[reasonably] possible to avoid introducing bugs in them and provide
the CppUnit compatibility macros in the new wx/catch_cppunit.h header
which allow to preserve the 99% of the existing code unchanged. Some
of the required changes are:

 - Decompose asserts using "a && b" conditions into multiple asserts
   checking "a" and "b" independently. This would have been better
   even with CppUnit (to know which part of condition exactly failed)
   and is required with Catch.

 - Use extra parentheses around such conditions when they can't be
   easily decomposed in the arrays test, due to the use of macros.
   This is not ideal from the point of view of messages given when
   the tests fail but will do for now.

 - Rewrite asserts using "a || b" as a combination of condition
   checks and assert macros. Again, this is better anyhow, and is
   required with Catch. Incidentally, this allowed to fix a bug in
   the "exec" unit test which didn't leave enough time for the new
   process to be launched before trying to kill it.

 - Remove multiple CPPUNIT_TEST_SUITE_NAMED_REGISTRATION() macros,
   our emulation of this macro can be used only once.

 - Provide string conversions using Catch-specific StringMaker for
   a couple of types.

 - Replace custom wxImage comparison with a Catch-specific matcher
   class.

 - Remove most of test running logic from test.cpp, in particular don't
   parse command line ourselves any longer but use Catch built-in
   command line parser. This is a source of a minor regression:
   previously, both "Foo" and "FooTestCase" could be used as the name of
   the test to run, but now only the latter is accepted.
2017-11-02 01:53:16 +01:00
Vadim Zeitlin
0d394eec9c Update to bakefile 0.2.11 and rebake everything
The main/only change in this version is the removal of automatic rules
using old Carbon Rez/DeRez/SetFile tools.
2017-10-21 17:42:30 +02:00
Vadim Zeitlin
3c59f46b64 Convert even more CRLF files to use LF in the git repository.
Somehow more files appear as modified now, after fixing "all" of them in the
previous commit. Convert these files as well. Will there be more in the next
clone?
2015-03-19 21:15:11 +01: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
f901941933 Make TOOLKIT variable constant in MSW makefiles.
This fixes duplicate lines defining rules for generic files for more than one
port in the makefiles.

Closes #14979.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74406 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-06 11:59:35 +00:00
Václav Slavík
4863951a5f Line endings fixes in bakefile-generated files.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73573 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-02-28 14:29:00 +00:00
Vadim Zeitlin
d48f13a168 Allow building wxGTK under Windows with MSVC.
Replace a few more __WXMSW__ tests with __WINDOWS__ ones and modify bakefiles
to allow specifying the toolkit to be built in wxMSW makefiles.

Closes #13902.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-28 16:03:03 +00:00
Vadim Zeitlin
e27f554012 Use the same console event loop in wxBase and wxCore in wxMSW.
Refactor the console event loop code into separate files to untangle it from
the GUI version and ensure that it doesn't depend on the GUI at all. It can
now be defined in the base library and simply reused by the core one.

This also makes the console event loop usable for other ports under Windows,
e.g. wxGTK.

Closes #14426.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72008 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-10 23:52:00 +00:00
Vadim Zeitlin
235a997f9a Use "_x64" instead of "amd64" for x64 MSW makefile builds.
Still accept "amd64" as a valid TARGET_CPU value but also accept, and
encourage people to use, "x64".

Add a new section about the build system changes to the change log and added a
mini-TOC to it to make navigating it a bit easier and show what changes are
there at a glance.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71978 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-07 13:27:59 +00:00
Steve Lamerton
92b4653a62 Rebake trunk after wxWebView merge and add missing project files for the wxWebView library.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-11 10:12:19 +00:00
Vadim Zeitlin
00eef16d51 Rebake everything using bakefile 0.2.9.
Update configure and bakefile.m4 for the new version too.

Also add the missing makefiles and projects for the XTI sample.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-03 15:02:45 +00:00
Václav Slavík
b796194b15 Regenerated makefiles after removing USE_GDIPLUS.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63925 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-09 14:14:26 +00:00
Vadim Zeitlin
002374070e Move wx/evtloop.h from GUI_CMN_HDR to BASE_CMN_HDR in files.bkl.
And rebake.

Now that wxEventLoop can be used in wxBase as well, we need this file to be
installed as part of wxBase too.

Closes #11617.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63239 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-01-24 01:00:20 +00:00
Vadim Zeitlin
41c89b9107 Define _CRT_SECURE_NO_WARNINGS when building 3rd party libs with MSVC.
Avoid dozens of warnings about "unsafe" use of the standard C library
functions in 3rd party code which are harmless and which we don't care about
in any case.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62752 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-12-01 00:42:19 +00:00
Kevin Ollivier
f82b7036e8 Rebake after last commit.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62682 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-11-18 19:22:58 +00:00
Vadim Zeitlin
eaae3ee7d7 No changes, just regenerated with bakefile 0.2.8.
There are no changes in this file except for the version of bakefile in the
header comment.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62575 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-11-09 01:57:33 +00:00
Vadim Zeitlin
7880889720 Rebake everything using bakefile 0.2.7.
Also updated aclocal inputs and regenerated configure.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-22 16:53:10 +00:00
Kevin Ollivier
d5e7ffcf7a Make sure all Bakefile formats that use CRLF line feeds are set to use CRLF in SVN.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62327 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-08 04:07:02 +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
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
Chris Elliott
95ff11c4bb update bakefile to 0.2.6
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-04-24 10:36:24 +00:00
Francesco Montorsi
f0cd5e2422 revert changes erroneously committed (sorry)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-08 22:33:08 +00:00
Francesco Montorsi
d1bceb1af9 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58778 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 2009-02-08 22:25:33 +00:00
Vadim Zeitlin
506e9b7ed2 rebaked using bakefile 0.2.5
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-10-27 16:40:51 +00:00
Vadim Zeitlin
8ece421c6c rebaked makefiles with 0.2.4
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-10-08 15:44:49 +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
6e0fbb3dbf regenerated makefiles with bkl-0.2.3
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51346 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-23 12:13:07 +00:00
Vadim Zeitlin
d03e4efda6 undid accidental change to this file in r50704
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50811 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-12-18 16:39:52 +00:00
Vadim Zeitlin
e2fc40b478 PalmOS 6 compilation fixes (patch 1849757)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50704 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-12-15 01:25:56 +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
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
0db8bb5866 removed wx/wave.h which was deprecated since 2.4
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44628 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-07 11:55:36 +00:00
Robin Dunn
3756fd25b9 Rebaked after addition of mediactrl_qt.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43100 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-11-06 01:14:04 +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
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
Włodzimierz Skiba
40989e46b8 [ 1473731 ] 'wxColourBase and wxString <-> wxColour implementation' with minor modifications and rebaked build files.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38888 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-24 14:52:23 +00:00
Włodzimierz Skiba
8785360429 Rebuild build files so all night/Tinderbox/Coverity builds could sleep well.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38137 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-16 08:19:57 +00:00
Vadim Zeitlin
0604740afd regenerated make/project files after applying mediactrl patch (1427775)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37464 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-10 20:02:55 +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
1ac453272c set USE_QA to 1 for consistency with the IDE builds (closes 1419152)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-05 12:39:19 +00:00
Vadim Zeitlin
dbcca2fa1f added xrc/xh_grid.{h|cpp} and regenerated makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-29 01:19:22 +00:00
Michael Wetherell
ab6ea1ac2f Regenerate the msvc makefiles after TARGET_CPU option added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35910 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-16 20:35:41 +00:00
Julian Smart
0d90d6ea7a Rebake for 2.6.2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-28 12:48:14 +00:00