aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile3
-rw-r--r--src/kristall.pro7
2 files changed, 7 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 07f9732..48e85ea 100644
--- a/Makefile
+++ b/Makefile
@@ -31,8 +31,7 @@ kristall: build/kristall
.PHONY: build/kristall
build/kristall: src/*
mkdir -p build
- cd build; $(HOMEBREW_PATH) $(QMAKE_COMMAND) ../src/kristall.pro && $(MAKE) $(MAKEFLAGS)
-
+ cd build; $(HOMEBREW_PATH) $(QMAKE_COMMAND) CONFIG+=$(QMAKE_CONFIG) ../src/kristall.pro && $(MAKE) $(MAKEFLAGS)
install: kristall
# Prepare directories
$(MAKEDIR) $(sharedir)/icons/hicolor/scalable/apps/
diff --git a/src/kristall.pro b/src/kristall.pro
index 9b96dba..5875a72 100644
--- a/src/kristall.pro
+++ b/src/kristall.pro
@@ -66,7 +66,12 @@ android: include(/home/felix/projects/android-hass/android-sdk/android_openssl/o
# }
-include($$PWD/../lib/cmark/cmark.pri)
+external-cmark {
+ CONFIG += link_pkgconfig
+ PKGCONFIG += libcmark
+} else {
+ include($$PWD/../lib/cmark/cmark.pri)
+}
INCLUDEPATH += $$PWD/../lib/luis-l-gist/
DEPENDPATH += $$PWD/../lib/luis-l-gist/