d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gcc9 compatibility: qca, qscintilla2

This commit is contained in:
Mark Brand 2019-05-15 22:21:56 +02:00
parent 5855983070
commit e247b7c5da
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/qca.mk
View File

@ -22,7 +22,9 @@ define $(PKG)_BUILD
# build test as qmake project
mkdir '$(BUILD_DIR).test-qmake'
cd '$(BUILD_DIR).test-qmake' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' '$(PWD)/src/qca-test.pro'
cd '$(BUILD_DIR).test-qmake' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' \
'greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-deprecated-copy' \
'$(PWD)/src/qca-test.pro'
$(MAKE) -C '$(BUILD_DIR).test-qmake' -j 1
$(INSTALL) -m755 '$(BUILD_DIR).test-qmake/$(BUILD_TYPE)/test-qca-qmake.exe' '$(PREFIX)/$(TARGET)/bin/'
@ -35,7 +37,7 @@ define $(PKG)_BUILD
# build test manually
'$(TARGET)-g++' \
-W -Wall -Werror -std=gnu++11 \
-W -Wall -Werror -std=gnu++11 -Wno-deprecated-copy \
'$(PWD)/src/qca-test.cpp' \
-o '$(PREFIX)/$(TARGET)/bin/test-$(PKG)-pkgconfig.exe' \
$(if $(BUILD_STATIC), -L'$(PREFIX)/$(TARGET)/qt5/plugins/crypto' -lqca-ossl) \

2
src/qscintilla2.mk
View File

@ -26,7 +26,7 @@ define $(PKG)_BUILD
$(MAKE) -C '$(1)/Qt4Qt5' -j '$(JOBS)' install
'$(TARGET)-g++' \
-W -Wall -Werror -std=c++0x -pedantic \
-W -Wall -Werror -std=c++0x -pedantic -Wno-deprecated-copy \
`'$(TARGET)-pkg-config' Qt5Widgets --cflags` \
'$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-qscintilla2.exe' -lqscintilla2_qt5 \
`'$(TARGET)-pkg-config' Qt5Widgets --libs`