45 lines
1.7 KiB
Text
45 lines
1.7 KiB
Text
- remove unsupported compiler flag (that is NOT ignored)
|
|
- don't use bundled Liberation fonts, use RDEP on fonts/liberation-fonts instead
|
|
- fix manpage installation dir
|
|
- disable hidapi support, it doesn't compile
|
|
|
|
Index: openscad.pro
|
|
--- openscad.pro.orig
|
|
+++ openscad.pro
|
|
@@ -150,7 +150,6 @@ netbsd* {
|
|
# See Dec 2011 OpenSCAD mailing list, re: CGAL/GCC bugs.
|
|
*g++* {
|
|
QMAKE_CXXFLAGS *= -fno-strict-aliasing
|
|
- QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-local-typedefs # ignored before 4.8
|
|
|
|
# Disable attributes warnings on MSYS/MXE due to gcc bug spamming the logs: Issue #2771
|
|
win* | CONFIG(mingw-cross-env)|CONFIG(mingw-cross-env-shared) {
|
|
@@ -193,7 +192,7 @@ CONFIG += lib3mf
|
|
CONFIG += gettext
|
|
CONFIG += libxml2
|
|
CONFIG += libzip
|
|
-CONFIG += hidapi
|
|
+#CONFIG += hidapi
|
|
CONFIG += spnav
|
|
CONFIG += double-conversion
|
|
CONFIG += cairo
|
|
@@ -721,10 +720,6 @@ libraries.path = "$$PREFIX/share/$${FULLNAME}/librarie
|
|
libraries.files = libraries/*
|
|
INSTALLS += libraries
|
|
|
|
-fonts.path = "$$PREFIX/share/$${FULLNAME}/fonts/"
|
|
-fonts.files = fonts/*
|
|
-INSTALLS += fonts
|
|
-
|
|
colorschemes.path = "$$PREFIX/share/$${FULLNAME}/color-schemes/"
|
|
colorschemes.files = color-schemes/*
|
|
INSTALLS += colorschemes
|
|
@@ -757,7 +752,7 @@ icon512.path = $$PREFIX/share/icons/hicolor/512x512/ap
|
|
icon512.extra = test -f icons/$${FULLNAME}-512.png && cp -f icons/$${FULLNAME}-512.png \"\$(INSTALL_ROOT)$${icon512.path}/$${FULLNAME}.png\" || cp -f icons/openscad-512.png \"\$(INSTALL_ROOT)$${icon512.path}/$${FULLNAME}.png\"
|
|
INSTALLS += icon48 icon64 icon128 icon256 icon512
|
|
|
|
-man.path = $$PREFIX/share/man/man1
|
|
+man.path = $$PREFIX/man/man1
|
|
man.extra = cp -f doc/openscad.1 \"\$(INSTALL_ROOT)$${man.path}/$${FULLNAME}.1\"
|
|
INSTALLS += man
|
|
|