Mercurial > mxe-octave

comparison src/qt.mk @ 3031:951da75fd09c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
improve handling of cross tool prefix
author John W. Eaton <jwe@octave.org>
date Sun, 09 Jun 2013 09:48:08 -0400
parents b6c7244a2f66
children 622b49d8b178
comparison
equal deleted inserted replaced
3030:0d67b4c363cd 3031:951da75fd09c
9 $(PKG)_URL := http://releases.qt-project.org/qt4/source/$($(PKG)_FILE) 9 $(PKG)_URL := http://releases.qt-project.org/qt4/source/$($(PKG)_FILE)
10 ifeq ($(MXE_SYSTEM),mingw) 10 ifeq ($(MXE_SYSTEM),mingw)
11 $(PKG)_DEPS := gcc libodbc++ postgresql freetds openssl zlib libpng jpeg libmng tiff sqlite dbus 11 $(PKG)_DEPS := gcc libodbc++ postgresql freetds openssl zlib libpng jpeg libmng tiff sqlite dbus
12 12
13 $(PKG)_CONFIGURE_ENV := \ 13 $(PKG)_CONFIGURE_ENV := \
14 OPENSSL_LIBS="`'$(TARGET)-pkg-config' --libs-only-l openssl`" \ 14 OPENSSL_LIBS="`'$(MXE_PKG_CONFIG)' --libs-only-l openssl`" \
15 PSQL_LIBS="-lpq -lsecur32 `'$(TARGET)-pkg-config' --libs-only-l openssl` -lws2_32" \ 15 PSQL_LIBS="-lpq -lsecur32 `'$(MXE_PKG_CONFIG)' --libs-only-l openssl` -lws2_32" \
16 SYBASE_LIBS="-lsybdb `'$(TARGET)-pkg-config' --libs-only-l gnutls` -liconv -lws2_32" 16 SYBASE_LIBS="-lsybdb `'$(MXE_PKG_CONFIG)' --libs-only-l gnutls` -liconv -lws2_32"
17 else 17 else
18 $(PKG)_DEPS := gcc postgresql freetds openssl zlib libpng jpeg libmng tiff sqlite dbus 18 $(PKG)_DEPS := gcc postgresql freetds openssl zlib libpng jpeg libmng tiff sqlite dbus
19 19
20 $(PKG)_CONFIGURE_ENV := \ 20 $(PKG)_CONFIGURE_ENV := \
21 CPPFLAGS='$(HOST_INCDIR)/dbus-1.0' \ 21 CPPFLAGS='$(HOST_INCDIR)/dbus-1.0' \
48 $($(PKG)_CONFIGURE_INCLUDE_OPTION) \ 48 $($(PKG)_CONFIGURE_INCLUDE_OPTION) \
49 -opensource \ 49 -opensource \
50 -confirm-license \ 50 -confirm-license \
51 -fast \ 51 -fast \
52 $($(PKG)_CONFIGURE_PLATFORM_OPTION) \ 52 $($(PKG)_CONFIGURE_PLATFORM_OPTION) \
53 -device-option CROSS_COMPILE=$(TARGET)- \ 53 -device-option CROSS_COMPILE=$(MXE_TOOL_PREFIX) \
54 -device-option PKG_CONFIG='$(TARGET)-pkg-config' \ 54 -device-option PKG_CONFIG='$(MXE_PKG_CONFIG)' \
55 -force-pkg-config \ 55 -force-pkg-config \
56 -release \ 56 -release \
57 -exceptions \ 57 -exceptions \
58 -shared \ 58 -shared \
59 -prefix '$(HOST_PREFIX)' \ 59 -prefix '$(HOST_PREFIX)' \
85 -no-sse2 -no-ssse3 \ 85 -no-sse2 -no-ssse3 \
86 -v 86 -v
87 87
88 $(MAKE) -C '$(1)' -j '$(JOBS)' 88 $(MAKE) -C '$(1)' -j '$(JOBS)'
89 $(MAKE) -C '$(1)' -j 1 install 89 $(MAKE) -C '$(1)' -j 1 install
90 $(LN_SF) '$(HOST_BINDIR)/moc' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-moc' 90 $(LN_SF) '$(HOST_BINDIR)/moc' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)moc'
91 $(LN_SF) '$(HOST_BINDIR)/rcc' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-roc' 91 $(LN_SF) '$(HOST_BINDIR)/rcc' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)roc'
92 $(LN_SF) '$(HOST_BINDIR)/uic' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-uic' 92 $(LN_SF) '$(HOST_BINDIR)/uic' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)uic'
93 $(LN_SF) '$(HOST_BINDIR)/qmake' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-qmake' 93 $(LN_SF) '$(HOST_BINDIR)/qmake' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)qmake'
94 94
95 # cd '$(1)/tools/assistant' && '$(1)/bin/qmake' assistant.pro 95 # cd '$(1)/tools/assistant' && '$(1)/bin/qmake' assistant.pro
96 # $(MAKE) -C '$(1)/tools/assistant' -j '$(JOBS)' install 96 # $(MAKE) -C '$(1)/tools/assistant' -j '$(JOBS)' install
97 97
98 # cd '$(1)/tools/designer' && '$(1)/bin/qmake' designer.pro 98 # cd '$(1)/tools/designer' && '$(1)/bin/qmake' designer.pro
102 # cd '$(1)/tools/qdbus' && '$(1)/bin/qmake' qdbus.pro 102 # cd '$(1)/tools/qdbus' && '$(1)/bin/qmake' qdbus.pro
103 # $(MAKE) -C '$(1)/tools/qdbus' -j '$(JOBS)' install 103 # $(MAKE) -C '$(1)/tools/qdbus' -j '$(JOBS)' install
104 104
105 # lrelease (from linguist) needed by octave for GUI build 105 # lrelease (from linguist) needed by octave for GUI build
106 $(MAKE) -C '$(1)/tools/linguist/lrelease' -j '$(JOBS)' install 106 $(MAKE) -C '$(1)/tools/linguist/lrelease' -j '$(JOBS)' install
107 $(LN_SF) '$(HOST_BINDIR)/lrelease' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-lrelease' 107 $(LN_SF) '$(HOST_BINDIR)/lrelease' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)lrelease'
108 108
109 # mkdir '$(1)/test-qt' 109 # mkdir '$(1)/test-qt'
110 # cd '$(1)/test-qt' && '$(TARGET)-qmake' '$(PWD)/$(2).pro' 110 # cd '$(1)/test-qt' && '$(MXE_QMAKE)' '$(PWD)/$(2).pro'
111 # $(MAKE) -C '$(1)/test-qt' -j '$(JOBS)' 111 # $(MAKE) -C '$(1)/test-qt' -j '$(JOBS)'
112 # $(INSTALL) -m755 '$(1)/test-qt/release/test-qt.exe' '$(HOST_BINDIR)' 112 # $(INSTALL) -m755 '$(1)/test-qt/release/test-qt.exe' '$(HOST_BINDIR)'
113 endef 113 endef