Commit Graph

2766 Commits

Author SHA1 Message Date
Vadim Zeitlin
413fdfbfa4 Merge branch 'cmake-c++11-stl' of git://github.com/MaartenBent/wxWidgets
CMake: Improve STL checks, improve C++17/20 support.

See https://github.com/wxWidgets/wxWidgets/pull/1782

Closes #18718.
2020-04-12 16:37:57 +02:00
Maarten Bent
c96014db27 CMake: install toucan.png with widgets sample
It is used on the StaticBitmap page.
2020-04-10 00:51:17 +02:00
Paul Cornett
d3c60b9524 Update gtk-3.0.m4 from gtk+-3.24.17 2020-04-09 09:39:32 -07:00
Maarten Bent
4122511e76 CMake: Add c++20 option, enable setting c++ version for MSVC
MSVC supports setting the CMAKE_CXX_STANDARD since VS2015 update 2.
2020-04-08 22:13:52 +02:00
Maarten Bent
3c4c4ee273 CMake: Only test stl for c++ versions before 11 2020-04-07 19:28:46 +02:00
Maarten Bent
5c2d186132 CMake: Add variable to indicate if c++11 or later is enabled
Use it in macOS checks.
2020-04-07 19:28:46 +02:00
Maarten Bent
c8209a5111 CMake: Set wxBUILD_CXX_STANDARD globally instead of only on targets
This way the tests in setup.cmake will use the correct c++ version.
2020-04-07 19:09:58 +02:00
Vadim Zeitlin
706c8e8ad6 Merge branch 'disable-native-animation'
Allow the generic animation classes to be used on all platforms.

See https://github.com/wxWidgets/wxWidgets/pull/1768
2020-04-07 00:40:45 +02:00
Vadim Zeitlin
c6a4cc80fe Merge branch 'pmdpi-build' of git://github.com/MaartenBent/wxWidgets
Improve DPI aware builds with .vc and .vcproj files.

See https://github.com/wxWidgets/wxWidgets/pull/1769
2020-03-28 14:10:17 +01:00
Maarten Bent
343bd89b63 Rebake after changes 2020-03-27 23:15:03 +01:00
Maarten Bent
3978733a37 CMake: Enable DPI awareness options for demos 2020-03-27 23:11:00 +01:00
Maarten Bent
820234340f Remove unnecessary arguments for nmake in AppVeyor script 2020-03-27 23:11:00 +01:00
Maarten Bent
f1a017539a Generate an error when the CPU parameter is not specified and cannot be determined
See #18640
2020-03-27 23:11:00 +01:00
Maarten Bent
284b25ce02 Automatically detect if target architecture is x64 in .vc file
This allows a successful build even if the user omits specifying CPU=X64.

See #18640
2020-03-27 23:11:00 +01:00
Maarten Bent
3c53fbb94b Add DPI manifest only for MSVS 2015 and later in .vc file
Prevent errors and warnings when embedding the manifest.

Check if environment variable VISUALSTUDIOVERSION (set by VS developer command
prompt) is 14.0, 15.0 or 16.0.

See #18665
2020-03-27 23:10:56 +01:00
Maarten Bent
5767a906eb Disable embedding manifest via linker in .vcproj files
This causes errors (<=2010) and warnings (<=2012) with older VS versions.

See #18665
2020-03-26 22:51:38 +01:00
Robin Dunn
1fa74df7f4 Remove --disable-nativeanimation and wxUSE_NATIVE_ANIMATIONCTRL 2020-03-25 14:03:28 -07:00
Vadim Zeitlin
2c7924dd2e Remove the now unused UNIV_PLATFORM_{SRC,HDR} variables
They used to contain animation-related files, but are empty now and can
be simply removed.
2020-03-25 13:58:57 +01:00
Vadim Zeitlin
842e185f3b Move generic files to common sources/headers in the right place
This corresponds to the changes already manually done in
build/bakefiles/files.bkl but is now done in the right file and so also
for CMake-based build system.
2020-03-25 13:57:39 +01:00
Vadim Zeitlin
c7084c8868 Rerun bakefile after wxAnimationCtrl-related changes 2020-03-25 12:22:45 +01:00
Vadim Zeitlin
636729bd34 Update CMake version of setup.h header too
This is the result of running build/update-setup-h too.
2020-03-25 12:20:47 +01:00
Vadim Zeitlin
99f79b4495 Revert "Run bakefile"
This reverts commit fea3d52505.
2020-03-25 02:59:07 +01:00
Robin Dunn
fea3d52505 Run bakefile 2020-03-24 14:51:51 -07:00
Robin Dunn
86fbadb52e Move generic animate files to GUI_CMN 2020-03-24 13:36:55 -07:00
Vadim Zeitlin
98206975f5 Run compilation failures tests on Travis
"failtest" target is not built by default and it's not trivial to change
this, as it needs to be built before anything else (and not in parallel
with it, as otherwise object files created while building the tests
could be removed), so just build it manually before building the tests
themselves in Travis CI builds (or at least those of them using
configure and make).
2020-03-24 00:02:38 +01:00
Maarten Bent
811f916dae Reduce Xcode output in Travis CI CMake build
This should fix builds that terminate due to: job exceeded the maximum
log length and generally make Xcode build logs more readable and useful.

Closes https://github.com/wxWidgets/wxWidgets/pull/1747
2020-02-29 15:47:30 +01:00
Vadim Zeitlin
eb7b84f781 Fix build of plugin libraries after recent *FLAGS changes
Since ec091c9f2b building plugin libraries
such as webkit2_ext and sound_sdl was broken, as they didn't use the
correct CPPFLAGS any longer.

Fix this by explicitly inheriting from "common_settings" template which
adds the use of WX_CPPFLAGS etc now.
2020-02-19 22:11:20 +01:00
Vadim Zeitlin
89229b7090 Move src/msw/ole/access.cpp to low-level MSW sources
This file should be used even in wxUniv builds.

This fixes linking of wxCore when using wxUniv/MSW.
2020-02-17 19:49:38 +01:00
Maarten Bent
016061311a CMake: Add wxBUILD_FLAVOUR option
It is similar to --with-flavour option from configure.

Mark some build options as advanced.
2020-02-16 21:33:44 +01:00
Maarten Bent
4196c67b72 CMake: Create wx-config for MinGW builds
Use the same output folder for setup.h and wx-config as configure does.
2020-02-16 16:35:24 +01:00
Maarten Bent
10abcc0f78 CMake: Improve consistency in names of output files
Match the filenames used by configure (gcc, clang) and the visual studio
solutions. The biggest difference is that wxARCH_SUFFIX (e.g. _64) is not
included in the dll names, and the position of the version number in the
libraries.
2020-02-12 22:30:32 +01:00
Vadim Zeitlin
7db9b707b2 Ensure that include paths to 3rd party libraries come first
Rearrange wx_{lib,dll} templates definitions to put 3rd party include
paths in the beginning, before WX_CPPFLAGS inherited from wx_{lib,dll}_b
template, so that our own 3rd party libraries headers are found before
the system ones, if we're using built-in versions of the libraries.
2020-02-11 23:19:31 +01:00
Vadim Zeitlin
1250eac850 Don't use GUI 3rd party libraries for non-GUI libraries
Don't use include paths for jpeg, png and tiff libraries when building
non-GUI projects, such as base, net or xml, and don't make these
libraries depend on the GUI 3rd party libraries neither.

No real changes, just simplify things a bit.
2020-02-11 23:19:31 +01:00
Vadim Zeitlin
ec091c9f2b Don't override CFLAGS etc in configure-generated makefile
CPPFLAGS, CFLAGS, CXXFLAGS and LDFLAGS are supposed to be under
user-control and putting configure-determined options in them broke
something as simple as running "make CXXFLAGS=-Wno-some-extra-warning"
because this overrode the CXXFLAGS set by configure and required for
build.

Improve this by using WX_*FLAGS in the generated makefile and leaving
the user-controlled FLAGS alone. This is still not ideal as running
"configure CFLAGS=-DFOO" and then "make CFLAGS=-DBAR" will define both
FOO and BAR, as configure copies CFLAGS to WX_CFLAGS, and so setting it
on make command line won't override it, as it should, but this should be
a much more rare and also much less severe problem, so we should be able
to live with it for now.

Normally this commit shouldn't result in any user-visible changes, i.e.
it shouldn't break any previously working scenarios and only make some
previously broken ones work.
2020-02-11 23:19:31 +01:00
flederwiesel
0073b54f8e Pass CPPFLAGS to cpp when generating rcdefs.h
Honour user-defined CPPFLAGS when creating rcdefs.h, this notably fixes
generating the file with wrong architecture when cross-compiling from 64
to 32 bits with CPPFLAGS=-m32.

Closes #17844.
2020-02-02 00:13:55 +01:00
Vadim Zeitlin
f6b79fdf8f Rebake gcc makefiles accidentally modified in this branch
Undo the changes due to the use of different version of bakefile 0.x.
2020-01-22 03:24:57 +01:00
Maarten Bent
ce968d0ecb
Enable building without wxUSE_WEBVIEW_IE 2020-01-17 09:37:12 +01:00
Tobias Taschner
9f6beb00c2
Restore %(AdditionalIncludeDirectories) in wx_webview.vcxproj 2020-01-16 10:55:22 +01:00
Tobias Taschner
41f4a21736
Apply suggestions from code review
Co-Authored-By: Maarten <MaartenBent@users.noreply.github.com>
2020-01-16 10:15:11 +01:00
Tobias Taschner
21cc8a4e49
Update setup.h files 2020-01-15 15:58:30 +01:00
Tobias Taschner
f919b6e2f5
Rename from webview_edgec to webview_edge 2020-01-11 14:47:47 +01:00
Tobias Taschner
f2196abca3
Add wxWebViewEdgeChromium to other build systems 2020-01-10 22:22:30 +01:00
Tobias Taschner
6750d30102
Load WebView2Loader.dll dynamically 2020-01-10 22:22:29 +01:00
Markus Pingel
6a99e7e273
Add wxWebView Edge (Chromium) implementation
This backend requires WebView2 SDK and enables usage of Edge (Chromium)
on Windows 7 and newer
2020-01-10 22:22:28 +01:00
Tobias Taschner
1afeaa324d
Added new build option wxUSE_WEBVIEW_EDGE 2020-01-10 21:42:18 +01:00
AliKet
c09db9c23d Add native wxSearchCtrl for GTK+ port 2020-01-07 03:15:35 +01:00
Vadim Zeitlin
028afa194a Add wxUSE_NATIVE_DATAVIEWCTRL build option
It defaults to 1, but can be set to 0 to force using the generic version
of the control even under GTK or Mac, where the native version is used
by default.

This can, unfortunately, be useful to work around various but multiple
native control limitations.
2019-12-15 16:23:47 +01:00
Maarten Bent
083f4b3c32 Rename manifests to use underscores 2019-12-13 21:44:26 +01:00
Vadim Zeitlin
7b36d72b44 Merge branch 'vc-pmdpi' of https://github.com/MaartenBent/wxWidgets
Add DPI Awareness option to nmake makefiles and MSVC projects.

See https://github.com/wxWidgets/wxWidgets/pull/1664
2019-12-03 02:29:25 +01:00
Maarten Bent
e36cdaddfd Specify CPU parameter for AppVeyor nmake builds
Don't use DPI aware manifest with VC9.
Build minimal samples with msbuild and nmake.
2019-12-01 00:06:44 +01:00