Commit Graph

1811 Commits

Author SHA1 Message Date
Vadim Zeitlin
b85d4fc758 Don't check macOS symbols when building for iOS in configure
We should probably check __IPHONE_OS_VERSION_MIN_REQUIRED and maybe
MAX_ALLOWED too, but for now just don't give an error in wxiOS builds.
2020-07-05 23:46:34 +02:00
Vadim Zeitlin
232e8677b1 Enforce using C++11 under macOS in configure
There is no reason not to turn it on there, as all compilers/compiler
versions supported under this platform support C++11 too.
2020-07-05 19:50:24 +02:00
Vadim Zeitlin
c01747555f Remove explicit libc++ option, it is the default anyhow now
No supported version still use libstdc++ by default, so remove the
useless option.
2020-07-05 19:37:15 +02:00
Vadim Zeitlin
19dc182b48 Replace Mac OS X with macOS in configure
Use the new Apple OS name in the user-visible messages.
2020-07-05 19:36:29 +02:00
Vadim Zeitlin
94fc2ca6d8 Check minimum macOS version in configure too
Targeting anything less than 10.10 is not supported any longer, so check
for this and also update --with-macosx-version-min description in help
to mention it.
2020-07-05 19:34:27 +02:00
Vadim Zeitlin
a4f9e207dc Make macOS configure error messages even more precise
Mention the configure options to use to correct the problem explicitly.

Also restore the use AC_MSG_FAILURE() instead of AC_MSG_ERROR(), this
was originally correct and just the calls to exit() were unnecessary.
2020-07-05 19:29:26 +02:00
Vadim Zeitlin
9b02dbf8b2 Correct minimum supported Xcode version, it's 7.2.1, not 7.3
This correction is important because 7.2 can be used under macOS 10.10,
unlike 7.3.
2020-07-05 19:15:50 +02:00
Vadim Zeitlin
101a693bc2 Add check for 10.11 SDK to configure
Verify that we're using a supported version of SDK and further improve
the error message if building a test program fails to mention that Xcode
7.3 or later is required.
2020-07-05 18:21:58 +02:00
Vadim Zeitlin
bbf1953051 Improve error messages if configure build test fails under macOS
Telling people to try using a different SDK was rather confusing if they
didn't specify any SDK in the first place and not very helpful if the
problem was due to specifying an incompatible minimum OS version, so fix
both problems at once by using the appropriate error message depending
on the configure options actually used.
2020-07-05 18:16:00 +02:00
Vadim Zeitlin
01ac922431 Use 10.10 as minimum macOS version by default in configure
Just bump the default to 10.10 from the old 10.9.
2020-07-05 18:12:33 +02:00
Vadim Zeitlin
103daf60d4 Don't remove multiple -arch flags from configure flags neither
The changes of 273e2e7343 (Remove duplicated flags from
{C,CPP,CXX,LD}FLAGS in configure, 2020-02-12) took care to leave
multiple -framework flags in LDFLAGS because removing them would be
wrong, but we also need to avoid removing -arch flags, that can possibly
appear multiple times (when using universal binaries) as well.

Change dedup_flags() itself to keep a list of exceptions to pass through
without checking that they're unique. If this list becomes longer in the
future, we could use an array and use "$0 in array" instead of multiple
"==" checks, but for now keep things simple.
2020-07-01 18:45:11 +02:00
Vadim Zeitlin
d7c6dc6235 Default to building wxOSX, not wxiOS, under Apple ARM platforms
Now that desktop Macs using ARM exist, we should default to building the
normal, macOS-targeting, port on them and not wxiOS any more.

This is a backwards incompatible change, but it shouldn't affect many
people, so should hopefully be fine.
2020-07-01 18:33:48 +02:00
Vadim Zeitlin
f66199222e Remove obsolete code using sleep() in wxMicroSleep() for BeOS
This code never worked (as proved by the conversion in it which was
wrong by a factor of 1e12) and should never be needed anyhow.

Simplify configure and give an error, not warning, if neither
nanosleep() nor usleep() are available, as otherwise we'd just get a
build error later when compiling utilsunx.cpp later.
2020-06-26 18:49:32 +02:00
Ian McInerney
b7600b0b1b Ensure jbig support is disabled for builtin libtiff 2020-06-17 23:14:01 +01:00
Ian McInerney
10a958562d Fix configure for builtin libtiff
We need to ensure the configure arguments to disable features
are passed in immediately before calling, because the builtin
is the fallback if the system library is not found.

Fixes #18791
2020-06-17 22:46:48 +01:00
Vadim Zeitlin
a087d7c8da Merge branch 'fix-stc-ime' of https://github.com/wangqr/wxWidgets
Fix position of IME in wxSTC in wxMSW.

See https://github.com/wxWidgets/wxWidgets/pull/1852
2020-05-25 01:33:00 +02:00
Vadim Zeitlin
7a82a0bbf5 Assume dlerror() function is always available when dlopen() is
Remove separate checks for dlerror() which don't seem to be needed under
any platform any longer.

No real changes, just slim down configure/CMake a tiny bit.
2020-05-15 00:00:06 +02:00
Vadim Zeitlin
fea8c608b1 Remove checks for shl_load() from configure/CMake
This function is not used any more since e289eb07e1 (Get rid of
non-POSIX code for loading dynlibs on *nix, 2020-05-13), so don't check
for it and don't defined the corresponding HAVE_SHL_LOAD symbol.
2020-05-14 23:59:38 +02:00
wangqr
59370f36c8 Add imm32.lib to wxStyledTextCtrl in configure.in 2020-05-11 15:11:21 -04:00
Paul Cornett
44ba9d1d07 Change default GTK version for configure from 2 to 3 2020-04-19 21:59:16 -07:00
Vadim Zeitlin
0fe1146b19 Cache the result of inotify check in configure
Wrap AC_LINK_IFELSE() in AC_CACHE_CHECK() to skip it if the result is
already cached.
2020-04-15 18:04:56 +02:00
Oliver Kiddle
1eaa510c05 Check usability of inotify before selecting it
A libinotify compatibility library exists for BSD systems. If this
was installed, configure would find sys/inotify.h but the build
would fail to link unless the library was added to the link line.
By also checking for inotify_init() this problem can be avoided.

Given that there is native support for kqueue, there is no need
to handle linking with libinotify.
2020-04-15 17:28:09 +02:00
Vadim Zeitlin
482426f4fc Use correct toolkit name in wxUniv error message in configure
$TOOLKIT refers to the underlying toolkit, while the error message
should really indicate that the missing functionality is in wxUniv.
2020-02-17 19:29:26 +01:00
Vadim Zeitlin
273e2e7343 Remove duplicated flags from {C,CPP,CXX,LD}FLAGS in configure
This results in much shorter compilation lines and hence much shorter
build logs, which makes examining them simpler.

There should be no real changes, as we should never use duplicated
options intentionally.
2020-02-12 04:12:04 +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
Vadim Zeitlin
13b0981eb9 Get rid of WXCONFIG_ONLY_CPPFLAGS variable in configure
This variable was set and used exactly once, so just remove it to
simplify things.

No real changes.
2020-02-11 23:19:30 +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
Vadim Zeitlin
29db4e7d83 Remove extraneous parenthesis in --without-libjbig help message
No real changes, this is purely cosmetic.
2019-11-17 23:50:54 +01:00
Vadim Zeitlin
91dc325ca9 Don't disable wxGraphicsContext if Cairo not available under Mac
This breaks Mac build by default and shouldn't be done. In fact, Cairo
should be used only optionally under MSW and Mac, where it's not always
needed, so add a new configure option to request it.
2019-11-17 23:49:21 +01:00
Artur Wieczorek
3ca6e04d61 Allow building library with Cairo under wxOSX
Enable checking for Cairo in the configure script.
2019-11-17 22:14:38 +01:00
Vadim Zeitlin
db846f15ab Disable wxMediaCtrl and wxWebView when OLE is disabled in wxMSW
Avoid errors in wx/msw/chkconf.h during compilation by proactively
turning these options off in configure if wxUSE_OLE==0.
2019-11-15 17:09:43 +01:00
Vadim Zeitlin
37d8b6018c Remove test for ole2.h from configure
This is unnecessary, this header should always be available, so it was a
waste of time to check for it at best and, actually, this broke the
Cygwin build under AppVeyor as configure didn't find the header somehow,
even if compiling the code using it works perfectly well.
2019-11-15 17:06:17 +01:00
Vadim Zeitlin
02314de0ee Suppress spurious "unsupported DPI awareness" configure messages
If --with-dpi option is not specified at all, wxWITH_DPI_MANIFEST
remains empty, so take this value into account explicitly.
2019-11-01 15:39:52 +01:00
Vadim Zeitlin
be83879733 Merge branch 'always-use-wchar_t'
Remove obsolete wxUSE_WCHAR_T option, it must be always 1.

See https://github.com/wxWidgets/wxWidgets/pull/1624
2019-11-01 14:32:42 +01:00
Vadim Zeitlin
d7a640933d Remove wxUSE_WCHAR_T, it must always be 1 anyhow
This is not really an option as building requires it to be 1, so don't
make it one in setup.h/configure/cmake and just hardcode it as 1 for
compatibility.

Closes #18558.
2019-10-31 02:16:19 +01:00
Vadim Zeitlin
349e73994b Merge branch 'dpi-awareness-option' of https://github.com/MaartenBent/wxWidgets
Add wxUSE_DPI_AWARE_MANIFEST option allowing to choose to use a manifest
specifying per-monitor DPI awareness.

See https://github.com/wxWidgets/wxWidgets/pull/1622
2019-10-30 21:25:45 +01:00
Maarten Bent
cdf1226573 Add DPI Awareness option to configure and bakefile
Add option --with-dpi=[none,system,per-monitor] to configure the dpi awareness
on Windows.

Support DPI Awareness in makefile.gcc and makefile.bcc.

The default DPI awareness is set to per-monitor.
2019-10-29 23:49:51 +01:00
Vadim Zeitlin
0a02f4c190 Increment version number to 3.1.4
Done by running misc/scripts/inc_release, manually updating version.bkl,
rebaking and rerunning autoconf.

Also a header for the next version to the change log.
2019-10-28 14:11:00 +01:00
Vadim Zeitlin
fc711f869f Remove obsolete wxUSE_IOSTREAMH option
This is always 0 for any still supported compiler, so remove the option
and configure checks for it.

Still define it as 0 for compatibility, just in case it's used outside
of the library.
2019-10-21 20:46:21 +02:00
Vadim Zeitlin
4e5095e5a5 Fix WebKit detection in configure under Mac after the last commit
The last commit accidentally removed not only the checks, but also the
actions executed when the check was successful -- restore the former
while still removing the latter.
2019-10-08 16:13:54 +02:00
Vadim Zeitlin
b8fbecc261 Remove configure tests for WebView headers under Mac
They shouldn't be necessary, as these headers should be always available
on all supported macOS versions, and they fail when using 10.15 SDK
which doesn't include Carbon headers at all any more.
2019-10-08 15:06:01 +02:00
Vadim Zeitlin
906fc891c8 Disable LZMA support when --disable-sys-libs is used
It seems better to disable LZMA rather than silently building the
binaries depending on an external library when we were explicitly
requested not to do it.
2019-06-27 16:18:20 +02:00
Vadim Zeitlin
fbd645b2dd Use C99 to compile Expat sources under Unix
Expat requires C99 and doesn't compile without the appropriate command
line option at least under Solaris as <stdbool.h> is not available
without it there.

Closes https://github.com/wxWidgets/wxWidgets/pull/1250

Closes #18352.
2019-03-14 12:39:53 +01:00
Vadim Zeitlin
606659d27c De-TAB-ify configure
No real changes, just remove the hard TABs.
2019-02-03 22:52:43 +01:00
Vadim Zeitlin
b1057cad05 Also disable SDL under macOS for configure-based builds
SDL-based wxSound backend doesn't currently compile under macOS and is
probably not very useful there anyhow.
2019-02-03 22:51:10 +01:00
Vadim Zeitlin
7226a8f4df Use 10.9 SDK by default in configure under macOS
On modern macOS systems, libstdc++ headers are not installed by default
any more and using 10.7 SDK requires them, so running configure fails
out of the box.

Avoid this by defaulting to the earliest SDK version which works even
under 10.14.
2019-01-16 14:51:08 +01:00
Vadim Zeitlin
b9fe8ca10c Try to use pkg-config for detecting libtiff in configure
This is more reliable than checking whether we can link with the library
manually and may work even if it's installed in a non-standard location.

It also allows the user to specify PKG_CONFIG_PATH='pkg-config --static'
when running configure to link with all transitional dependencies when
linking statically.

Closes https://github.com/wxWidgets/wxWidgets/pull/1073

See #18293.
2018-12-13 03:53:44 +01:00
Vadim Zeitlin
e1185d8bf0 Increment version number to 3.1.3
Done by running misc/scripts/inc_release, manually updating version.bkl,
rebaking and rerunning autoconf.
2018-12-10 19:06:18 +01:00
Maarten Bent
ec4b71afa0 Update tiff submodule
Add the new files to the build system. Disable support for webp and zstd
because we do not want to depend on external libraries.
2018-11-17 19:08:40 +01:00
Vadim Zeitlin
ef2b015e39 Export CC and similar variables for sub-configure scripts
This is especially important under macOS where we modify CC, CPP and CXX
to use the specified SDK, and it's important to compile the code of 3rd
party libtiff and expat libraries using the same SDK, but also matters
for the other platforms when using non-default CC and CXX values.

By exporting these values we ensure that tiff and expat use the same
compilers and flags as the main libraries linking with them.
2018-10-20 22:58:48 +02:00