Mercurial > mxe-octave

annotate src/wxwidgets-1-fixes.patch @ 6113:24e29dcb2e64

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Qt5: Update to version 5.15.3. * src/qtbase.mk: Update version and checksum. * src/qtbase-2-gcc11.patch: Remove hunks from patch that have been applied upstream. * src/qtimageformats.mk, src/qtsvg.mk, src/qttools.mk, src/qttranslationse.mk: Update checksum.
author Markus Mützel <markus.muetzel@gmx.de>
date Sat, 05 Mar 2022 10:59:53 +0100
parents beb523b00504
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5592
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
1 This file is part of MXE. See LICENSE.md for licensing information.
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
2
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
3 Contains ad hoc patches for cross building.
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
4
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
5 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
6 From: darealshinji <djcj@gmx.de>
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
7 Date: Fri, 26 May 2017 09:33:22 +0200
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
8 Subject: [PATCH 1/2] make it possible to install DLLs into $(libdir)/../bin
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
9
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
10
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
11 diff --git a/Makefile.in b/Makefile.in
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
12 index 1111111..2222222 100644
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
13 --- a/Makefile.in
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
14 +++ b/Makefile.in
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
15 @@ -15523,7 +15523,7 @@ distclean: clean
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
16 @COND_MONOLITHIC_1_SHARED_1@install_monodll: $(__monodll___depname)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
17 @COND_MONOLITHIC_1_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
18 @COND_MONOLITHIC_1_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
19 -@COND_MONOLITHIC_1_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
20 +@COND_MONOLITHIC_1_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
21 @COND_MONOLITHIC_1_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__monodll___so_symlinks_inst_cmd))
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
22
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
23 @COND_MONOLITHIC_1_SHARED_1@uninstall_monodll:
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
24 @@ -15558,7 +15558,7 @@ distclean: clean
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
25 @COND_MONOLITHIC_0_SHARED_1@install_basedll: $(__basedll___depname)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
26 @COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
27 @COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
28 -@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
29 +@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
30 @COND_MONOLITHIC_0_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__basedll___so_symlinks_inst_cmd))
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
31
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
32 @COND_MONOLITHIC_0_SHARED_1@uninstall_basedll:
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
33 @@ -15595,7 +15595,7 @@ distclean: clean
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
34 @COND_MONOLITHIC_0_SHARED_1@install_netdll: $(__netdll___depname)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
35 @COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
36 @COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
37 -@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
38 +@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
39 @COND_MONOLITHIC_0_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__netdll___so_symlinks_inst_cmd))
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
40
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
41 @COND_MONOLITHIC_0_SHARED_1@uninstall_netdll:
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
42 @@ -15632,7 +15632,7 @@ distclean: clean
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
43 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@install_coredll: $(__coredll___depname)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
44 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
45 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
46 -@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
47 +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
48 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ (cd $(DESTDIR)$(libdir) ; $(__coredll___so_symlinks_inst_cmd))
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
49
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
50 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@uninstall_coredll:
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
51 @@ -15669,7 +15669,7 @@ distclean: clean
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
52 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@install_advdll: $(__advdll___depname)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
53 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
54 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
55 -@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
56 +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
57 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ (cd $(DESTDIR)$(libdir) ; $(__advdll___so_symlinks_inst_cmd))
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
58
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
59 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@uninstall_advdll:
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
60 @@ -15706,7 +15706,7 @@ distclean: clean
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
61 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@install_mediadll: $(__mediadll___depname)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
62 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
63 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
64 -@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
65 +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
66 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ (cd $(DESTDIR)$(libdir) ; $(__mediadll___so_symlinks_inst_cmd))
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
67
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
68 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@uninstall_mediadll:
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
69 @@ -15743,7 +15743,7 @@ distclean: clean
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
70 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@install_htmldll: $(__htmldll___depname)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
71 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
72 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
73 -@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
74 +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
75 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ (cd $(DESTDIR)$(libdir) ; $(__htmldll___so_symlinks_inst_cmd))
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
76
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
77 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@uninstall_htmldll:
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
78 @@ -15780,7 +15780,7 @@ distclean: clean
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
79 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@install_webviewdll: $(__webviewdll___depname)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
80 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
81 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
82 -@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
83 +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
84 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@ (cd $(DESTDIR)$(libdir) ; $(__webviewdll___so_symlinks_inst_cmd))
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
85
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
86 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@uninstall_webviewdll:
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
87 @@ -15817,7 +15817,7 @@ distclean: clean
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
88 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@install_qadll: $(__qadll___depname)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
89 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
90 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
91 -@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
92 +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
93 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ (cd $(DESTDIR)$(libdir) ; $(__qadll___so_symlinks_inst_cmd))
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
94
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
95 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@uninstall_qadll:
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
96 @@ -15854,7 +15854,7 @@ distclean: clean
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
97 @COND_MONOLITHIC_0_SHARED_1@install_xmldll: $(__xmldll___depname)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
98 @COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
99 @COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
100 -@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
101 +@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
102 @COND_MONOLITHIC_0_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__xmldll___so_symlinks_inst_cmd))
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
103
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
104 @COND_MONOLITHIC_0_SHARED_1@uninstall_xmldll:
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
105 @@ -15891,7 +15891,7 @@ distclean: clean
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
106 @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@install_xrcdll: $(__xrcdll___depname)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
107 @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
108 @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
109 -@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
110 +@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
111 @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ (cd $(DESTDIR)$(libdir) ; $(__xrcdll___so_symlinks_inst_cmd))
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
112
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
113 @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@uninstall_xrcdll:
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
114 @@ -15928,7 +15928,7 @@ distclean: clean
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
115 @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@install_auidll: $(__auidll___depname)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
116 @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
117 @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
118 -@COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
119 +@COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
120 @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ (cd $(DESTDIR)$(libdir) ; $(__auidll___so_symlinks_inst_cmd))
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
121
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
122 @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@uninstall_auidll:
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
123 @@ -15965,7 +15965,7 @@ distclean: clean
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
124 @COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@install_ribbondll: $(__ribbondll___depname)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
125 @COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
126 @COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
127 -@COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
128 +@COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
129 @COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@ (cd $(DESTDIR)$(libdir) ; $(__ribbondll___so_symlinks_inst_cmd))
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
130
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
131 @COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@uninstall_ribbondll:
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
132 @@ -16002,7 +16002,7 @@ distclean: clean
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
133 @COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@install_propgriddll: $(__propgriddll___depname)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
134 @COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
135 @COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
136 -@COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
137 +@COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
138 @COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@ (cd $(DESTDIR)$(libdir) ; $(__propgriddll___so_symlinks_inst_cmd))
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
139
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
140 @COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@uninstall_propgriddll:
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
141 @@ -16039,7 +16039,7 @@ distclean: clean
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
142 @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@install_richtextdll: $(__richtextdll___depname)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
143 @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
144 @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
145 -@COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
146 +@COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
147 @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@ (cd $(DESTDIR)$(libdir) ; $(__richtextdll___so_symlinks_inst_cmd))
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
148
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
149 @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@uninstall_richtextdll:
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
150 @@ -16076,7 +16076,7 @@ distclean: clean
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
151 @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@install_stcdll: $(__stcdll___depname)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
152 @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
153 @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
154 -@COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
155 +@COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
156 @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ (cd $(DESTDIR)$(libdir) ; $(__stcdll___so_symlinks_inst_cmd))
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
157
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
158 @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@uninstall_stcdll:
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
159 @@ -16113,7 +16113,7 @@ distclean: clean
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
160 @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@install_gldll: $(__gldll___depname)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
161 @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
162 @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
163 -@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
164 +@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
165 @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ (cd $(DESTDIR)$(libdir) ; $(__gldll___so_symlinks_inst_cmd))
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
166
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
167 @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@uninstall_gldll:
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
168
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
169 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
170 From: Maarten Bent <MaartenBent@users.noreply.github.com>
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
171 Date: Thu, 16 Aug 2018 20:08:56 +0200
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
172 Subject: [PATCH 2/2] Fix c++11-narrowing error when using clang on Windows
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
173
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
174 Case value 0xfffffd9f results in the following error:
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
175 error: case value evaluates to 4294966687, which cannot be narrowed to type
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
176 'DISPID' (aka 'long') [-Wc++11-narrowing]
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
177
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
178 diff --git a/src/msw/mediactrl_am.cpp b/src/msw/mediactrl_am.cpp
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
179 index 1111111..2222222 100644
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
180 --- a/src/msw/mediactrl_am.cpp
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
181 +++ b/src/msw/mediactrl_am.cpp
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
182 @@ -2179,7 +2179,9 @@ void wxAMMediaBackend::Move(int WXUNUSED(x), int WXUNUSED(y),
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
183 //---------------------------------------------------------------------------
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
184 void wxAMMediaEvtHandler::OnActiveX(wxActiveXEvent& event)
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
185 {
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
186 - switch(event.GetDispatchId())
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
187 + // cast to unsigned long to fix narrowing error with case 0xfffffd9f
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
188 + // when using clang
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
189 + switch (static_cast<unsigned long>(event.GetDispatchId()))
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
190 {
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
191 #ifndef __WXWINCE__
beb523b00504 Add wxwidgets-1-fixes.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
192 case 0x00000001: // statechange in IActiveMovie