3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/pkgs/tools/graphics/nifskope/external-lib-paths.patch
Maximilian Bosch d60127fd8c
nifskope: 1.1.3 -> 2.0.dev7
`nifskope` v2 contains a lot of new features and a new, QT5-based UI
(see https://github.com/niftools/nifskope/releases). Additionally the
2.0 sourcetree exists for quite a while and after some short user tests
it seems fairly stable.

The following aspects have been changed:

* Use QT 5.9 rather than QT4 (see ).

* GCC7 support from upstream (gcc6 patch not needed anymore, build on
  GCC7 works fine), disabled `-Werror=format-security` can be used again
  as compiler flag.

* Patched broken paths in `NifSkope_targets.pri` to point to the proper
  dependencies (otherwise `<gli.hpp>` and `qhull` couldn't be found).

* Patched paths in `NifSkope.pro` to `lupdate` and `lrelease` (default
  `QT_*` paths point to `libsForQt5x.qtbase` which doesn't contain the
  needed binaries, instead they need to point to `libsForQt5x.qttools`).

* Added myself as maintainer.
2018-06-18 00:52:16 +02:00

34 lines
1.2 KiB
Diff

diff --git a/NifSkope.pro b/NifSkope.pro
index 1c0bc5a..cc29fc5 100644
--- a/NifSkope.pro
+++ b/NifSkope.pro
@@ -330,14 +330,14 @@ nvtristrip {
}
qhull {
- !*msvc*:QMAKE_CFLAGS += -isystem ../nifskope/lib/qhull/src
- !*msvc*:QMAKE_CXXFLAGS += -isystem ../nifskope/lib/qhull/src
+ !*msvc*:QMAKE_CFLAGS += -isystem ./lib/qhull/src
+ !*msvc*:QMAKE_CXXFLAGS += -isystem ./lib/qhull/src
else:INCLUDEPATH += lib/qhull/src
HEADERS += $$files($$PWD/lib/qhull/src/libqhull/*.h, false)
}
gli {
- !*msvc*:QMAKE_CXXFLAGS += -isystem ../nifskope/lib/gli/gli -isystem ../nifskope/lib/gli/external
+ !*msvc*:QMAKE_CXXFLAGS += -isystem ./lib/gli/gli -isystem ./lib/gli/external
else:INCLUDEPATH += lib/gli/gli lib/gli/external
HEADERS += $$files($$PWD/lib/gli/gli/*.hpp, true)
HEADERS += $$files($$PWD/lib/gli/gli/*.inl, true)
@@ -346,8 +346,8 @@ gli {
}
zlib {
- !*msvc*:QMAKE_CFLAGS += -isystem ../nifskope/lib/zlib
- !*msvc*:QMAKE_CXXFLAGS += -isystem ../nifskope/lib/zlib
+ !*msvc*:QMAKE_CFLAGS += -isystem ./lib/zlib
+ !*msvc*:QMAKE_CXXFLAGS += -isystem ./lib/zlib
else:INCLUDEPATH += lib/zlib
HEADERS += $$files($$PWD/lib/zlib/*.h, false)
SOURCES += $$files($$PWD/lib/zlib/*.c, false)