Files
librecad/librecad-use-system-libdxfrw.patch

44 lines
1.2 KiB
Diff
Raw Normal View History

build: avoid using bundled libdxfrw
[asterios.dramis@gmail.com: patch imported from Fedora]
---
libraries/libraries.pro | 1 -
librecad/src/src.pro | 5 ++---
2 files changed, 2 insertions(+), 4 deletions(-)
Index: LibreCAD-2.0.8/libraries/libraries.pro
===================================================================
--- LibreCAD-2.0.8.orig/libraries/libraries.pro
+++ LibreCAD-2.0.8/libraries/libraries.pro
@@ -9,7 +9,6 @@ TEMPLATE = subdirs
TARGET = libraries
SUBDIRS = \
- libdxfrw \
jwwlib
macx|win32|equals(build_muparser, "true")|!packagesExist(muparser){
Index: LibreCAD-2.0.8/librecad/src/src.pro
===================================================================
--- LibreCAD-2.0.8.orig/librecad/src/src.pro
+++ LibreCAD-2.0.8/librecad/src/src.pro
@@ -42,8 +42,7 @@ greaterThan( QT_MAJOR_VERSION, 4 ) {
}
GEN_LIB_DIR = ../../generated/lib
-PRE_TARGETDEPS += $$GEN_LIB_DIR/libdxfrw.a \
- $$GEN_LIB_DIR/libjwwlib.a
+PRE_TARGETDEPS += $$GEN_LIB_DIR/libjwwlib.a
DESTDIR = $${INSTALLDIR}
@@ -91,7 +90,7 @@ LIBS += -L../../generated/lib \
-ljwwlib
DEPENDPATH += \
- ../../libraries/libdxfrw/src \
+ $${DXFRW_INCLUDEDIR} \
../../libraries/jwwlib/src \
cmd \
lib/actions \