Mercurial > mxe-octave
comparison src/qscintilla.mk @ 3130:3c1afa2c8e43
[MSVC] enable qscintilla compilation
author | Michael Goffioul <michael.goffioul@gmail.com> |
---|---|
date | Thu, 11 Jul 2013 23:48:53 -0400 |
parents | 7f1d390cbd83 |
children | d14352d4ab8a |
comparison
equal
deleted
inserted
replaced
3129:d24828818d36 | 3130:3c1afa2c8e43 |
---|---|
16 | 16 |
17 ifneq ($(MXE_NATIVE_BUILD),yes) | 17 ifneq ($(MXE_NATIVE_BUILD),yes) |
18 ifeq ($(MXE_SYSTEM),mingw) | 18 ifeq ($(MXE_SYSTEM),mingw) |
19 $(PKG)_QMAKE_SPEC_OPTION := -spec '$(HOST_PREFIX)/mkspecs/win32-g++' | 19 $(PKG)_QMAKE_SPEC_OPTION := -spec '$(HOST_PREFIX)/mkspecs/win32-g++' |
20 endif | 20 endif |
21 ifeq ($(MXE_SYSTEM),msvc) | |
22 # FIXME: compute "2010" suffix dynamically | |
23 $(PKG)_QMAKE_SPEC_OPTION := -spec '$(HOST_LIBDIR)/qt4/mkspecs/win32-msvc2010' | |
24 endif | |
21 endif | 25 endif |
22 | 26 |
23 define $(PKG)_BUILD | 27 define $(PKG)_BUILD |
24 cd '$(1)/Qt4Qt5' && '$(HOST_BINDIR)/qmake' -makefile $($(PKG)_QMAKE_SPEC_OPTION) | 28 cd '$(1)/Qt4Qt5' && '$(HOST_BINDIR)/qmake' -makefile $($(PKG)_QMAKE_SPEC_OPTION) |
25 | 29 |
26 $(MAKE) -C '$(1)/Qt4Qt5' -j '$(JOBS)' | 30 if [ $(MXE_SYSTEM) = msvc ]; then \ |
27 $(MAKE) -C '$(1)/Qt4Qt5' -j 1 install | 31 cd '$(1)/Qt4Qt5' && \ |
28 if [ $(MXE_SYSTEM) = mingw ]; then \ | 32 env -u MAKE -u MAKEFLAGS nmake && \ |
29 $(INSTALL) -m755 '$(HOST_LIBDIR)/qscintilla2.dll' '$(HOST_BINDIR)/qscintilla2.dll'; \ | 33 env -u MAKE -u MAKEFLAGS nmake install; \ |
34 else \ | |
35 $(MAKE) -C '$(1)/Qt4Qt5' -j '$(JOBS)' && \ | |
36 $(MAKE) -C '$(1)/Qt4Qt5' -j 1 install; \ | |
37 fi | |
38 | |
39 if [ $(MXE_SYSTEM) = mingw -o $(MXE_SYSTEM) = msvc ]; then \ | |
40 $(INSTALL) -m755 '$(HOST_LIBDIR)/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll' \ | |
41 '$(HOST_BINDIR)/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll'; \ | |
42 rm -f '$(HOST_LIBDIR)/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll'; \ | |
30 fi | 43 fi |
31 endef | 44 endef |