Mercurial > mxe-octave
annotate src/qtbase.mk @ 4735:4cea16af20b4
qt5: update to v5.11.0, add support pcre2
* src/qtbase.mk: update version, checksum
* src/qtimageformats.mk: update checksum
* src/qtisvg.mk: update checksum
* src/qttools.mk: update checksum
* src/qtbase-1-fixes.patch, src/qttools-1.patch: update patch from mxe.cc
* src/pcre2.mk: new file
* index.html: add pcre2
* src/sqlite.mk: enable column metadata
author | John Donoghue |
---|---|
date | Fri, 22 Jun 2018 08:28:05 -0400 |
parents | de2eedecd6ba |
children | 206f76f1b59c |
rev | line source |
---|---|
4504
0743a56dd468
qtbase: Use bundled doubleconversion library.
John W. Eaton <jwe@octave.org>
parents:
4501
diff
changeset
|
1 # This file is part of MXE. |
4222 | 2 # See index.html for further information. |
3 | |
4 PKG := qtbase | |
5 $(PKG)_IGNORE := | |
4735 | 6 $(PKG)_VERSION := 5.11.0 |
7 $(PKG)_CHECKSUM := 277bfe3ebbead8096f6a16416db522179404d41e | |
8 $(PKG)_SUBDIR := $(PKG)-everywhere-src-$($(PKG)_VERSION) | |
9 $(PKG)_FILE := $(PKG)-everywhere-src-$($(PKG)_VERSION).tar.xz | |
10 $(PKG)_URL := http://download.qt.io/official_releases/qt/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE) | |
11 $(PKG)_DEPS := dbus double-conversion freetds freetype fontconfig jpeg libjbig libpng libproxy pcre2 postgresql sqlite zlib | |
4532
2ef6a1cbd7df
qtbase: disable icu on w32 systems
John W. Eaton <jwe@octave.org>
parents:
4526
diff
changeset
|
12 |
2ef6a1cbd7df
qtbase: disable icu on w32 systems
John W. Eaton <jwe@octave.org>
parents:
4526
diff
changeset
|
13 $(PKG)_CONFIGURE_CROSS_COMPILE_OPTION := |
2ef6a1cbd7df
qtbase: disable icu on w32 systems
John W. Eaton <jwe@octave.org>
parents:
4526
diff
changeset
|
14 $(PKG)_CONFIGURE_DATABASE_OPTION := |
2ef6a1cbd7df
qtbase: disable icu on w32 systems
John W. Eaton <jwe@octave.org>
parents:
4526
diff
changeset
|
15 $(PKG)_CONFIGURE_ENV := |
2ef6a1cbd7df
qtbase: disable icu on w32 systems
John W. Eaton <jwe@octave.org>
parents:
4526
diff
changeset
|
16 $(PKG)_CONFIGURE_INCLUDE_OPTION := |
2ef6a1cbd7df
qtbase: disable icu on w32 systems
John W. Eaton <jwe@octave.org>
parents:
4526
diff
changeset
|
17 $(PKG)_CONFIGURE_LIBPATH_OPTION := |
2ef6a1cbd7df
qtbase: disable icu on w32 systems
John W. Eaton <jwe@octave.org>
parents:
4526
diff
changeset
|
18 $(PKG)_CONFIGURE_PLATFORM_OPTION := |
2ef6a1cbd7df
qtbase: disable icu on w32 systems
John W. Eaton <jwe@octave.org>
parents:
4526
diff
changeset
|
19 $(PKG)_CONFIGURE_OPTS := |
2ef6a1cbd7df
qtbase: disable icu on w32 systems
John W. Eaton <jwe@octave.org>
parents:
4526
diff
changeset
|
20 |
4487
7b73612f57b9
qtbase: Optionally depend on X11 and fontconfig libraries.
John W. Eaton <jwe@octave.org>
parents:
4485
diff
changeset
|
21 ifeq ($(USE_SYSTEM_FONTCONFIG),no) |
7b73612f57b9
qtbase: Optionally depend on X11 and fontconfig libraries.
John W. Eaton <jwe@octave.org>
parents:
4485
diff
changeset
|
22 $(PKG)_FONTCONFIG := fontconfig |
7b73612f57b9
qtbase: Optionally depend on X11 and fontconfig libraries.
John W. Eaton <jwe@octave.org>
parents:
4485
diff
changeset
|
23 endif |
4496
903796b2fcb6
fltk, gl2ps, xcursor, x11, qtbase: Fix dependencies.
John W. Eaton <jwe@octave.org>
parents:
4487
diff
changeset
|
24 ifeq ($(USE_SYSTEM_OPENGL),no) |
903796b2fcb6
fltk, gl2ps, xcursor, x11, qtbase: Fix dependencies.
John W. Eaton <jwe@octave.org>
parents:
4487
diff
changeset
|
25 $(PKG)_DEPS += mesa |
903796b2fcb6
fltk, gl2ps, xcursor, x11, qtbase: Fix dependencies.
John W. Eaton <jwe@octave.org>
parents:
4487
diff
changeset
|
26 endif |
4532
2ef6a1cbd7df
qtbase: disable icu on w32 systems
John W. Eaton <jwe@octave.org>
parents:
4526
diff
changeset
|
27 ifeq ($(MXE_WINDOWS_BUILD),yes) |
2ef6a1cbd7df
qtbase: disable icu on w32 systems
John W. Eaton <jwe@octave.org>
parents:
4526
diff
changeset
|
28 ifeq ($(ENABLE_WINDOWS64),yes) |
2ef6a1cbd7df
qtbase: disable icu on w32 systems
John W. Eaton <jwe@octave.org>
parents:
4526
diff
changeset
|
29 $(PKG)_DEPS += icu4c |
2ef6a1cbd7df
qtbase: disable icu on w32 systems
John W. Eaton <jwe@octave.org>
parents:
4526
diff
changeset
|
30 $(PKG)_CONFIGURE_OPTS += -icu |
2ef6a1cbd7df
qtbase: disable icu on w32 systems
John W. Eaton <jwe@octave.org>
parents:
4526
diff
changeset
|
31 else |
2ef6a1cbd7df
qtbase: disable icu on w32 systems
John W. Eaton <jwe@octave.org>
parents:
4526
diff
changeset
|
32 $(PKG)_CONFIGURE_OPTS += -no-icu |
2ef6a1cbd7df
qtbase: disable icu on w32 systems
John W. Eaton <jwe@octave.org>
parents:
4526
diff
changeset
|
33 endif |
2ef6a1cbd7df
qtbase: disable icu on w32 systems
John W. Eaton <jwe@octave.org>
parents:
4526
diff
changeset
|
34 else |
2ef6a1cbd7df
qtbase: disable icu on w32 systems
John W. Eaton <jwe@octave.org>
parents:
4526
diff
changeset
|
35 $(PKG)_DEPS += icu4c |
2ef6a1cbd7df
qtbase: disable icu on w32 systems
John W. Eaton <jwe@octave.org>
parents:
4526
diff
changeset
|
36 $(PKG)_CONFIGURE_OPTS += -icu |
4487
7b73612f57b9
qtbase: Optionally depend on X11 and fontconfig libraries.
John W. Eaton <jwe@octave.org>
parents:
4485
diff
changeset
|
37 ifeq ($(USE_SYSTEM_X11_LIBS),no) |
4501 | 38 $(PKG)_DEPS += xdamage xdmcp xext xfixes xi xrender xt xxf86vm x11 xcb xcb-util xcb-util-cursor xcb-util-image xcb-util-keysyms xcb-util-renderutil xcb-util-wm |
4487
7b73612f57b9
qtbase: Optionally depend on X11 and fontconfig libraries.
John W. Eaton <jwe@octave.org>
parents:
4485
diff
changeset
|
39 endif |
7b73612f57b9
qtbase: Optionally depend on X11 and fontconfig libraries.
John W. Eaton <jwe@octave.org>
parents:
4485
diff
changeset
|
40 endif |
4222 | 41 |
42 define $(PKG)_UPDATE | |
4618
de2eedecd6ba
update broken PKG_UPDATE rules, handle missing update rules
John Donoghue
parents:
4532
diff
changeset
|
43 $(WGET) -q -O- http://download.qt-project.org/official_releases/qt/$(call SHORT_PKG_VERSION,$(PKG))/ | \ |
4222 | 44 $(SED) -n 's,.*href="\(5\.[0-9]\.[^/]*\)/".*,\1,p' | \ |
45 grep -iv -- '-rc' | \ | |
46 sort | | |
47 tail -1 | |
48 endef | |
49 | |
4485
86176b88d1f8
qtbase: Fix config include and prefix options for windows.
John W. Eaton <jwe@octave.org>
parents:
4484
diff
changeset
|
50 ifeq ($(MXE_WINDOWS_BUILD),yes) |
4518
c48b41efdcf4
qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents:
4508
diff
changeset
|
51 ## I haven't been able to change this to be just $(HOST_PREFIX), |
c48b41efdcf4
qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents:
4508
diff
changeset
|
52 ## though I would prefer to do that. If it is changed, then |
c48b41efdcf4
qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents:
4508
diff
changeset
|
53 ## there are a number of other places that will need to be adjusted. |
c48b41efdcf4
qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents:
4508
diff
changeset
|
54 ## --jwe |
4485
86176b88d1f8
qtbase: Fix config include and prefix options for windows.
John W. Eaton <jwe@octave.org>
parents:
4484
diff
changeset
|
55 $(PKG)_CONFIGURE_PREFIX_OPTION := -prefix '$(HOST_PREFIX)/qt5' |
4498
f47df619cd1d
qtbase: don't strip, only disable xcb on windows.
John W. Eaton <jwe@octave.org>
parents:
4496
diff
changeset
|
56 $(PKG)_CONFIGURE_OPTS += -no-xcb |
4485
86176b88d1f8
qtbase: Fix config include and prefix options for windows.
John W. Eaton <jwe@octave.org>
parents:
4484
diff
changeset
|
57 else |
86176b88d1f8
qtbase: Fix config include and prefix options for windows.
John W. Eaton <jwe@octave.org>
parents:
4484
diff
changeset
|
58 $(PKG)_CONFIGURE_PREFIX_OPTION := -prefix '$(HOST_PREFIX)' |
86176b88d1f8
qtbase: Fix config include and prefix options for windows.
John W. Eaton <jwe@octave.org>
parents:
4484
diff
changeset
|
59 $(PKG)_CONFIGURE_INCLUDE_OPTION += -I '$(HOST_INCDIR)/freetype2' |
4498
f47df619cd1d
qtbase: don't strip, only disable xcb on windows.
John W. Eaton <jwe@octave.org>
parents:
4496
diff
changeset
|
60 $(PKG)_CONFIGURE_OPTS += -qpa xcb -xcb |
4485
86176b88d1f8
qtbase: Fix config include and prefix options for windows.
John W. Eaton <jwe@octave.org>
parents:
4484
diff
changeset
|
61 endif |
86176b88d1f8
qtbase: Fix config include and prefix options for windows.
John W. Eaton <jwe@octave.org>
parents:
4484
diff
changeset
|
62 |
4484
0d0e6c8015af
qtbase.mk: Use proper platform option for cross and native windows builds.
John W. Eaton <jwe@octave.org>
parents:
4482
diff
changeset
|
63 ## These are needed whether cross compiling or not. |
0d0e6c8015af
qtbase.mk: Use proper platform option for cross and native windows builds.
John W. Eaton <jwe@octave.org>
parents:
4482
diff
changeset
|
64 ifeq ($(MXE_WINDOWS_BUILD),yes) |
0d0e6c8015af
qtbase.mk: Use proper platform option for cross and native windows builds.
John W. Eaton <jwe@octave.org>
parents:
4482
diff
changeset
|
65 $(PKG)_CONFIGURE_ENV := PSQL_LIBS="-lpq -lsecur32 -lws2_32" |
0d0e6c8015af
qtbase.mk: Use proper platform option for cross and native windows builds.
John W. Eaton <jwe@octave.org>
parents:
4482
diff
changeset
|
66 $(PKG)_CONFIGURE_DATABASE_OPTION += \ |
0d0e6c8015af
qtbase.mk: Use proper platform option for cross and native windows builds.
John W. Eaton <jwe@octave.org>
parents:
4482
diff
changeset
|
67 -system-sqlite -plugin-sql-sqlite -plugin-sql-odbc -plugin-sql-psql |
0d0e6c8015af
qtbase.mk: Use proper platform option for cross and native windows builds.
John W. Eaton <jwe@octave.org>
parents:
4482
diff
changeset
|
68 else |
0d0e6c8015af
qtbase.mk: Use proper platform option for cross and native windows builds.
John W. Eaton <jwe@octave.org>
parents:
4482
diff
changeset
|
69 $(PKG)_CONFIGURE_DATABASE_OPTION += -system-sqlite |
0d0e6c8015af
qtbase.mk: Use proper platform option for cross and native windows builds.
John W. Eaton <jwe@octave.org>
parents:
4482
diff
changeset
|
70 endif |
0d0e6c8015af
qtbase.mk: Use proper platform option for cross and native windows builds.
John W. Eaton <jwe@octave.org>
parents:
4482
diff
changeset
|
71 |
4482
57600c0c6bdf
allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents:
4310
diff
changeset
|
72 ifeq ($(MXE_NATIVE_BUILD),yes) |
57600c0c6bdf
allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents:
4310
diff
changeset
|
73 $(PKG)_CONFIGURE_INCLUDE_OPTION += -I '$(HOST_INCDIR)' |
57600c0c6bdf
allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents:
4310
diff
changeset
|
74 $(PKG)_CONFIGURE_LIBPATH_OPTION += -L '$(HOST_LIBDIR)' |
57600c0c6bdf
allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents:
4310
diff
changeset
|
75 ifeq ($(MXE_USE_LIB64_DIRECTORY),yes) |
57600c0c6bdf
allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents:
4310
diff
changeset
|
76 $(PKG)_CONFIGURE_LIBPATH_OPTION += -L '$(HOST_LIB64DIR)' |
57600c0c6bdf
allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents:
4310
diff
changeset
|
77 endif |
57600c0c6bdf
allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents:
4310
diff
changeset
|
78 $(PKG)_CONFIGURE_INCLUDE_OPTION += -I '$(HOST_INCDIR)/dbus-1.0' |
57600c0c6bdf
allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents:
4310
diff
changeset
|
79 $(PKG)_CONFIGURE_INCLUDE_OPTION += -I '$(HOST_LIBDIR)/dbus-1.0/include' |
4484
0d0e6c8015af
qtbase.mk: Use proper platform option for cross and native windows builds.
John W. Eaton <jwe@octave.org>
parents:
4482
diff
changeset
|
80 ifeq ($(MXE_WINDOWS_BUILD),yes) |
0d0e6c8015af
qtbase.mk: Use proper platform option for cross and native windows builds.
John W. Eaton <jwe@octave.org>
parents:
4482
diff
changeset
|
81 $(PKG)_CONFIGURE_PLATFORM_OPTION := -platform win32-g++ |
0d0e6c8015af
qtbase.mk: Use proper platform option for cross and native windows builds.
John W. Eaton <jwe@octave.org>
parents:
4482
diff
changeset
|
82 endif |
4482
57600c0c6bdf
allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents:
4310
diff
changeset
|
83 else |
57600c0c6bdf
allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents:
4310
diff
changeset
|
84 $(PKG)_CONFIGURE_CROSS_COMPILE_OPTION := \ |
57600c0c6bdf
allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents:
4310
diff
changeset
|
85 -device-option CROSS_COMPILE=$(MXE_TOOL_PREFIX) |
4484
0d0e6c8015af
qtbase.mk: Use proper platform option for cross and native windows builds.
John W. Eaton <jwe@octave.org>
parents:
4482
diff
changeset
|
86 ifeq ($(MXE_WINDOWS_BUILD),yes) |
0d0e6c8015af
qtbase.mk: Use proper platform option for cross and native windows builds.
John W. Eaton <jwe@octave.org>
parents:
4482
diff
changeset
|
87 $(PKG)_CONFIGURE_PLATFORM_OPTION := -xplatform win32-g++ |
0d0e6c8015af
qtbase.mk: Use proper platform option for cross and native windows builds.
John W. Eaton <jwe@octave.org>
parents:
4482
diff
changeset
|
88 endif |
4482
57600c0c6bdf
allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents:
4310
diff
changeset
|
89 endif |
57600c0c6bdf
allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents:
4310
diff
changeset
|
90 |
4735 | 91 $(PKG)_CONFIGURE_ENV += \ |
92 PKG_CONFIG="$(MXE_PKG_CONFIG)" \ | |
93 PKG_CONFIG_SYSROOT_DIR="/" \ | |
94 PKG_CONFIG_LIBDIR="$(PKG_CONFIG_PATH)" | |
95 | |
4222 | 96 define $(PKG)_BUILD |
97 cd '$(1)' && \ | |
4482
57600c0c6bdf
allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents:
4310
diff
changeset
|
98 $($(PKG)_CONFIGURE_ENV) \ |
4222 | 99 ./configure \ |
4482
57600c0c6bdf
allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents:
4310
diff
changeset
|
100 $($(PKG)_CONFIGURE_INCLUDE_OPTION) \ |
57600c0c6bdf
allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents:
4310
diff
changeset
|
101 $($(PKG)_CONFIGURE_LIBPATH_OPTION) \ |
4498
f47df619cd1d
qtbase: don't strip, only disable xcb on windows.
John W. Eaton <jwe@octave.org>
parents:
4496
diff
changeset
|
102 -no-strip \ |
4222 | 103 -opensource \ |
104 -c++std c++11 \ | |
105 -confirm-license \ | |
4482
57600c0c6bdf
allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents:
4310
diff
changeset
|
106 $($(PKG)_CONFIGURE_PLATFORM_OPTION) \ |
57600c0c6bdf
allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents:
4310
diff
changeset
|
107 $($(PKG)_CONFIGURE_CROSS_COMPILE_OPTION) \ |
4222 | 108 -device-option PKG_CONFIG='$(MXE_PKG_CONFIG)' \ |
4735 | 109 -pkg-config \ |
4222 | 110 -force-pkg-config \ |
111 -no-use-gold-linker \ | |
112 -shared \ | |
4485
86176b88d1f8
qtbase: Fix config include and prefix options for windows.
John W. Eaton <jwe@octave.org>
parents:
4484
diff
changeset
|
113 $($(PKG)_CONFIGURE_PREFIX_OPTION) \ |
4222 | 114 -hostprefix '$(BUILD_TOOLS_PREFIX)' \ |
115 -opengl desktop \ | |
116 -no-glib \ | |
117 -accessibility \ | |
118 -nomake examples \ | |
119 -nomake tests \ | |
4482
57600c0c6bdf
allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents:
4310
diff
changeset
|
120 $($(PKG)_CONFIGURE_DATABASE_OPTION) \ |
4222 | 121 -system-zlib \ |
122 -system-libpng \ | |
123 -system-libjpeg \ | |
124 -system-sqlite \ | |
125 -fontconfig \ | |
126 -system-freetype \ | |
127 -system-pcre \ | |
4526 | 128 -system-doubleconversion \ |
4222 | 129 -no-openssl \ |
130 -dbus-linked \ | |
4525 | 131 -libproxy \ |
4498
f47df619cd1d
qtbase: don't strip, only disable xcb on windows.
John W. Eaton <jwe@octave.org>
parents:
4496
diff
changeset
|
132 -no-pch \ |
4222 | 133 -v \ |
134 $($(PKG)_CONFIGURE_OPTS) | |
135 | |
136 $(MAKE) -C '$(1)' -j '$(JOBS)' | |
137 $(MAKE) -C '$(1)' -j 1 install | |
138 | |
4518
c48b41efdcf4
qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents:
4508
diff
changeset
|
139 if [ $(MXE_WINDOWS_BUILD) = yes ]; then \ |
c48b41efdcf4
qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents:
4508
diff
changeset
|
140 $(INSTALL) -d '$(HOST_BINDIR)'; \ |
c48b41efdcf4
qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents:
4508
diff
changeset
|
141 mv '$(HOST_PREFIX)'/qt5/bin/Qt5Concurrentd.dll '$(HOST_BINDIR)'/Qt5Concurrentd.dll; \ |
c48b41efdcf4
qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents:
4508
diff
changeset
|
142 mv '$(HOST_PREFIX)'/qt5/bin/Qt5Concurrent.dll '$(HOST_BINDIR)'/Qt5Concurrent.dll; \ |
c48b41efdcf4
qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents:
4508
diff
changeset
|
143 mv '$(HOST_PREFIX)'/qt5/bin/Qt5Cored.dll '$(HOST_BINDIR)'/Qt5Cored.dll; \ |
c48b41efdcf4
qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents:
4508
diff
changeset
|
144 mv '$(HOST_PREFIX)'/qt5/bin/Qt5Core.dll '$(HOST_BINDIR)'/Qt5Core.dll; \ |
c48b41efdcf4
qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents:
4508
diff
changeset
|
145 mv '$(HOST_PREFIX)'/qt5/bin/Qt5DBusd.dll '$(HOST_BINDIR)'/Qt5DBusd.dll; \ |
c48b41efdcf4
qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents:
4508
diff
changeset
|
146 mv '$(HOST_PREFIX)'/qt5/bin/Qt5DBus.dll '$(HOST_BINDIR)'/Qt5DBus.dll; \ |
c48b41efdcf4
qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents:
4508
diff
changeset
|
147 mv '$(HOST_PREFIX)'/qt5/bin/Qt5Guid.dll '$(HOST_BINDIR)'/Qt5Guid.dll; \ |
c48b41efdcf4
qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents:
4508
diff
changeset
|
148 mv '$(HOST_PREFIX)'/qt5/bin/Qt5Gui.dll '$(HOST_BINDIR)'/Qt5Gui.dll; \ |
c48b41efdcf4
qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents:
4508
diff
changeset
|
149 mv '$(HOST_PREFIX)'/qt5/bin/Qt5Networkd.dll '$(HOST_BINDIR)'/Qt5Networkd.dll; \ |
c48b41efdcf4
qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents:
4508
diff
changeset
|
150 mv '$(HOST_PREFIX)'/qt5/bin/Qt5Network.dll '$(HOST_BINDIR)'/Qt5Network.dll; \ |
c48b41efdcf4
qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents:
4508
diff
changeset
|
151 mv '$(HOST_PREFIX)'/qt5/bin/Qt5OpenGLd.dll '$(HOST_BINDIR)'/Qt5OpenGLd.dll; \ |
c48b41efdcf4
qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents:
4508
diff
changeset
|
152 mv '$(HOST_PREFIX)'/qt5/bin/Qt5OpenGL.dll '$(HOST_BINDIR)'/Qt5OpenGL.dll; \ |
c48b41efdcf4
qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents:
4508
diff
changeset
|
153 mv '$(HOST_PREFIX)'/qt5/bin/Qt5PrintSupportd.dll '$(HOST_BINDIR)'/Qt5PrintSupportd.dll; \ |
c48b41efdcf4
qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents:
4508
diff
changeset
|
154 mv '$(HOST_PREFIX)'/qt5/bin/Qt5PrintSupport.dll '$(HOST_BINDIR)'/Qt5PrintSupport.dll; \ |
c48b41efdcf4
qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents:
4508
diff
changeset
|
155 mv '$(HOST_PREFIX)'/qt5/bin/Qt5Sqld.dll '$(HOST_BINDIR)'/Qt5Sqld.dll; \ |
c48b41efdcf4
qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents:
4508
diff
changeset
|
156 mv '$(HOST_PREFIX)'/qt5/bin/Qt5Sql.dll '$(HOST_BINDIR)'/Qt5Sql.dll; \ |
c48b41efdcf4
qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents:
4508
diff
changeset
|
157 mv '$(HOST_PREFIX)'/qt5/bin/Qt5Testd.dll '$(HOST_BINDIR)'/Qt5Testd.dll; \ |
c48b41efdcf4
qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents:
4508
diff
changeset
|
158 mv '$(HOST_PREFIX)'/qt5/bin/Qt5Test.dll '$(HOST_BINDIR)'/Qt5Test.dll; \ |
c48b41efdcf4
qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents:
4508
diff
changeset
|
159 mv '$(HOST_PREFIX)'/qt5/bin/Qt5Widgetsd.dll '$(HOST_BINDIR)'/Qt5Widgetsd.dll; \ |
c48b41efdcf4
qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents:
4508
diff
changeset
|
160 mv '$(HOST_PREFIX)'/qt5/bin/Qt5Widgets.dll '$(HOST_BINDIR)'/Qt5Widgets.dll; \ |
c48b41efdcf4
qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents:
4508
diff
changeset
|
161 mv '$(HOST_PREFIX)'/qt5/bin/Qt5Xmld.dll '$(HOST_BINDIR)'/Qt5Xmld.dll; \ |
c48b41efdcf4
qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents:
4508
diff
changeset
|
162 mv '$(HOST_PREFIX)'/qt5/bin/Qt5Xml.dll '$(HOST_BINDIR)'/Qt5Xml.dll; \ |
c48b41efdcf4
qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents:
4508
diff
changeset
|
163 fi |
c48b41efdcf4
qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents:
4508
diff
changeset
|
164 |
4482
57600c0c6bdf
allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents:
4310
diff
changeset
|
165 if [ "$(MXE_NATIVE_BUILD)" = "no" ]; then \ |
57600c0c6bdf
allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents:
4310
diff
changeset
|
166 ln -sf '$(BUILD_TOOLS_PREFIX)/bin/qmake' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)'qmake-qt5; \ |
57600c0c6bdf
allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents:
4310
diff
changeset
|
167 ln -sf '$(BUILD_TOOLS_PREFIX)/bin/moc' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)'moc; \ |
57600c0c6bdf
allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents:
4310
diff
changeset
|
168 ln -sf '$(BUILD_TOOLS_PREFIX)/bin/uic' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)'uic; \ |
57600c0c6bdf
allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents:
4310
diff
changeset
|
169 ln -sf '$(BUILD_TOOLS_PREFIX)/bin/rcc' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)'rcc; \ |
57600c0c6bdf
allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents:
4310
diff
changeset
|
170 ln -sf '$(BUILD_TOOLS_PREFIX)/bin/lrelease' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)'lrelease; \ |
4222 | 171 fi |
172 | |
173 endef |