Refactor build system.

2016-09-04 16:34:38 -04:00
parent 1c0ca82072
commit 91ddb1fb55
9 changed files with 80 additions and 67 deletions
--- a/common/common.pro
+++ b/common/common.pro
@@ -1,9 +1,10 @@
 include(../config.pri)

-TARGET = qcma_common
 QT += core network sql
+
 TEMPLATE = lib
 CONFIG += staticlib
+TARGET = qcma_common

 SOURCES += \
    capability.cpp \
@@ -36,12 +37,12 @@ HEADERS += \
    qlistdb.h \
    database.h

-DISABLE_FFMPEG {
-    PKGCONFIG = libvitamtp
-} else {
+PKGCONFIG += libvitamtp
+
+!DISABLE_FFMPEG {
    DEFINES += FFMPEG_ENABLED
    SOURCES += avdecoder.cpp
-    PKGCONFIG = libvitamtp libavformat libavcodec libavutil libswscale
+    PKGCONFIG += libavformat libavcodec libavutil libswscale
 }

 OTHER_FILES += \