Mercurial > mxe-octave

comparison src/qt.mk @ 3145:fae248a5b181

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Qt: generalize the use of pkg-config to get dbus compilation flags
author Michael Goffioul <michael.goffioul@gmail.com>
date Mon, 15 Jul 2013 21:29:42 -0400
parents d24828818d36
children 11f8ec654cd4
comparison
equal deleted inserted replaced
3144:433d1bb3cafb 3145:fae248a5b181
10 $(PKG)_DEPS := openssl zlib libpng jpeg libmng tiff dbus 10 $(PKG)_DEPS := openssl zlib libpng jpeg libmng tiff dbus
11 11
12 $(PKG)_CONFIGURE_CMD := 12 $(PKG)_CONFIGURE_CMD :=
13 $(PKG)_CONFIGURE_CROSS_COMPILE_OPTION := 13 $(PKG)_CONFIGURE_CROSS_COMPILE_OPTION :=
14 $(PKG)_CONFIGURE_DATABASE_OPTION := 14 $(PKG)_CONFIGURE_DATABASE_OPTION :=
15 $(PKG)_CONFIGURE_ENV := 15 $(PKG)_CONFIGURE_ENV := PKG_CONFIG_PATH='$(HOST_PREFIX)/lib/pkgconfig'
16 $(PKG)_CONFIGURE_EXTRA_OPTION := 16 $(PKG)_CONFIGURE_EXTRA_OPTION :=
17 $(PKG)_CONFIGURE_INCLUDE_OPTION := 17 $(PKG)_CONFIGURE_INCLUDE_OPTION :=
18 $(PKG)_CONFIGURE_LIBPATH_OPTION := 18 $(PKG)_CONFIGURE_LIBPATH_OPTION :=
19 $(PKG)_CONFIGURE_PLATFORM_OPTION := 19 $(PKG)_CONFIGURE_PLATFORM_OPTION :=
20 $(PKG)_PREFIX := '$(HOST_PREFIX)' 20 $(PKG)_PREFIX := '$(HOST_PREFIX)'
21 $(PKG)_MKSPECS := '$($(PKG)_PREFIX)' 21 $(PKG)_MKSPECS := '$($(PKG)_PREFIX)'
22 22
23 ifneq ($(filter mingw msvc,$(MXE_SYSTEM)),) 23 ifneq ($(filter mingw msvc,$(MXE_SYSTEM)),)
24 ifeq ($(MXE_NATIVE_BUILD),yes) 24 ifeq ($(MXE_NATIVE_BUILD),yes)
25 $(PKG)_CONFIGURE_ENV := \
26 PKG_CONFIG_PATH='$(HOST_PREFIX)/lib/pkgconfig'
27
28 ifeq ($(MXE_SYSTEM),msvc) 25 ifeq ($(MXE_SYSTEM),msvc)
29 # NMAKE is perturbed by the values of MAKE and MAKEFLAGS defined by GNU 26 # NMAKE is perturbed by the values of MAKE and MAKEFLAGS defined by GNU
30 # make. These need to be unset even when running configure script, as 27 # make. These need to be unset even when running configure script, as
31 # this will run NMAKE to compile QMAKE. 28 # this will run NMAKE to compile QMAKE.
32 $(PKG)_CONFIGURE_ENV += MAKE= MAKEFLAGS= 29 $(PKG)_CONFIGURE_ENV += MAKE= MAKEFLAGS=
38 SYBASE_LIBS="-lsybdb `'$(MXE_PKG_CONFIG)' --libs-only-l gnutls` -liconv -lws2_32" 35 SYBASE_LIBS="-lsybdb `'$(MXE_PKG_CONFIG)' --libs-only-l gnutls` -liconv -lws2_32"
39 endif 36 endif
40 # compile-in generic ODBC driver under Windows 37 # compile-in generic ODBC driver under Windows
41 $(PKG)_CONFIGURE_DATABASE_OPTION += -plugin-sql-odbc 38 $(PKG)_CONFIGURE_DATABASE_OPTION += -plugin-sql-odbc
42 else 39 else
43 $(PKG)_CONFIGURE_ENV := \ 40 $(PKG)_CONFIGURE_ENV += \
44 CPPFLAGS='$(HOST_INCDIR)/dbus-1.0' \
45 LDFLAGS='-Wl,-rpath-link,$(HOST_LIBDIR) -L$(HOST_LIBDIR)' 41 LDFLAGS='-Wl,-rpath-link,$(HOST_LIBDIR) -L$(HOST_LIBDIR)'
46 endif 42 endif
47 43
48 ifeq ($(MXE_NATIVE_BUILD),yes) 44 ifeq ($(MXE_NATIVE_BUILD),yes)
49 $(PKG)_CONFIGURE_INCLUDE_OPTION += -I '$(HOST_INCDIR)' 45 $(PKG)_CONFIGURE_INCLUDE_OPTION += -I '$(HOST_INCDIR)'
70 endif 66 endif
71 # OPENSSL_LIBS needs to be specified here, specifying it as environment 67 # OPENSSL_LIBS needs to be specified here, specifying it as environment
72 # variables *before* "configure.exe" doesn't work. Also compile-in D-BUS 68 # variables *before* "configure.exe" doesn't work. Also compile-in D-BUS
73 # support, for what it's worth... 69 # support, for what it's worth...
74 $(PKG)_CONFIGURE_EXTRA_OPTION += \ 70 $(PKG)_CONFIGURE_EXTRA_OPTION += \
75 -openssl-linked \ 71 OPENSSL_LIBS="`PKG_CONFIG_PATH='$(HOST_PREFIX)/lib/pkgconfig' '$(MXE_PKG_CONFIG)' --libs-only-l openssl`"
76 OPENSSL_LIBS="`PKG_CONFIG_PATH='$(HOST_PREFIX)/lib/pkgconfig' '$(MXE_PKG_CONFIG)' --libs-only-l openssl`" \
77 -dbus-linked
78 else 72 else
79 $(PKG)_CONFIGURE_CMD := configure 73 $(PKG)_CONFIGURE_CMD := configure
80 $(PKG)_CONFIGURE_EXTRA_OPTION := \ 74 $(PKG)_CONFIGURE_EXTRA_OPTION := \
81 -prefix-install \ 75 -prefix-install \
82 -make libs \ 76 -make libs \
83 -openssl-linked \
84 -no-glib \ 77 -no-glib \
85 -no-gstreamer \ 78 -no-gstreamer \
86 -no-reduce-exports \ 79 -no-reduce-exports \
87 -no-ssse3 \ 80 -no-ssse3 \
88 -no-rpath \ 81 -no-rpath \
89 -device-option PKG_CONFIG='$(MXE_PKG_CONFIG)' \ 82 -device-option PKG_CONFIG='$(MXE_PKG_CONFIG)' \
90 -force-pkg-config \ 83 -force-pkg-config \
91 -dbus-linked \
92 -v 84 -v
93 85
94 ifeq ($(MXE_SYSTEM),mingw) 86 ifeq ($(MXE_SYSTEM),mingw)
95 $(PKG)_CONFIGURE_CROSS_COMPILE_OPTION := \ 87 $(PKG)_CONFIGURE_CROSS_COMPILE_OPTION := \
96 -device-option CROSS_COMPILE=$(MXE_TOOL_PREFIX) 88 -device-option CROSS_COMPILE=$(MXE_TOOL_PREFIX)
113 ./$($(PKG)_CONFIGURE_CMD) \ 105 ./$($(PKG)_CONFIGURE_CMD) \
114 $($(PKG)_CONFIGURE_INCLUDE_OPTION) \ 106 $($(PKG)_CONFIGURE_INCLUDE_OPTION) \
115 $($(PKG)_CONFIGURE_LIBPATH_OPTION) \ 107 $($(PKG)_CONFIGURE_LIBPATH_OPTION) \
116 -opensource \ 108 -opensource \
117 -confirm-license \ 109 -confirm-license \
110 -dbus-linked \
118 -fast \ 111 -fast \
119 $($(PKG)_CONFIGURE_PLATFORM_OPTION) \ 112 $($(PKG)_CONFIGURE_PLATFORM_OPTION) \
120 $($(PKG)_CONFIGURE_CROSS_COMPILE_OPTION) \ 113 $($(PKG)_CONFIGURE_CROSS_COMPILE_OPTION) \
121 $($(PKG)_CONFIGURE_EXTRA_OPTION) \ 114 $($(PKG)_CONFIGURE_EXTRA_OPTION) \
122 -release \ 115 -release \
124 -shared \ 117 -shared \
125 -prefix $($(PKG)_PREFIX) \ 118 -prefix $($(PKG)_PREFIX) \
126 -script \ 119 -script \
127 -no-iconv \ 120 -no-iconv \
128 -opengl desktop \ 121 -opengl desktop \
122 -openssl-linked \
129 -no-webkit \ 123 -no-webkit \
130 -no-phonon \ 124 -no-phonon \
131 -no-phonon-backend \ 125 -no-phonon-backend \
132 -accessibility \ 126 -accessibility \
133 -nomake demos \ 127 -nomake demos \