Ticket #37748: dream.pro.diff

dream.pro

@@ -72 +72 @@
         FORMS += JLViewer.ui BWSViewer.ui SlideShowViewer.ui
         unix {
             macx {
-                exists(libs/qwt.framework) {
-                    message("with qwt6")
-                    INCLUDEPATH += libs/qwt
+                exists(@PREFIX@/lib/qwt.framework) {
+                    message("with macports qwt6")
+                    INCLUDEPATH += @PREFIX@/lib/qwt.framework/Headers
                     LIBS += -framework qwt
                 }
                 else {
@@ -135 +135 @@
         }
 }
 macx {
-    INCLUDEPATH += /Developer/dream/include /opt/local/include
-    LIBS += -L/Developer/dream/lib -L/opt/local/lib
+    INCLUDEPATH += @PREFIX@/include
+    LIBS += -L@PREFIX@/lib
     LIBS += -framework CoreFoundation -framework CoreServices
     LIBS += -framework CoreAudio -framework AudioToolbox -framework AudioUnit
     UI_DIR = moc
     MOC_DIR = moc
     RC_FILE = src/GUI-QT/res/macicons.icns
 }
-exists(libs/faac.h) {
+exists(@PREFIX@/include/faac.h) {
     CONFIG += faac
-    message("with FAAC")
+    message("with macports FAAC")
 }
-exists(libs/neaacdec.h) {
+exists(@PREFIX@/include/neaacdec.h) {
     CONFIG += faad
-    message("with FAAD2")
+    message("with macports FAAD2")
 }
 unix {
     target.path = /usr/bin
@@ -160 +160 @@
                   message("with pulseaudio")
               }
     else {
-    #packagesExist(portaudio-2.0) {
-        CONFIG += portaudio
-     PKGCONFIG += portaudio-2.0
-                  message("with portaudio")
+        exists(@PREFIX@/include/portaudio.h) {
+                CONFIG += portaudio
+                PKGCONFIG += portaudio-2.0
+                message("with macports portaudio")
               }
-    exists(/usr/include/hamlib/rig.h) {
+        }
+    exists(@PREFIX@/include/hamlib/rig.h) {
         CONFIG += hamlib
-                  message("with hamlib")
+                  message("with macports hamlib")
               }
     exists(/usr/local/include/hamlib/rig.h) {
         CONFIG += hamlib
@@ -177 +178 @@
         CONFIG += gps
                   message("with gps")
               }
-    exists(/usr/include/pcap.h) {
+    exists(@PREFIX@/include/pcap.h) {
         CONFIG += pcap
-                  message("with pcap")
+                  message("with macports pcap")
               }
     exists(/usr/include/sndfile.h) {
         CONFIG += sndfile
                   message("with libsndfile")
               }
-    exists(/opt/local/include/sndfile.h) {
+    exists(@PREFIX@/include/sndfile.h) {
         CONFIG += sndfile
-                  message("with libsndfile")
+                  message("with macports libsndfile")
               }
-    exists(/usr/include/fftw3.h) {
+    exists(@PREFIX@/include/fftw3.h) {
         DEFINES += HAVE_FFTW3_H
-                   LIBS += -lfftw3
-                           message("with fftw3")
+        LIBS += -lfftw3
+        message("with macports fftw3")
                        }
     else {
       exists(/usr/include/fftw.h) {
@@ -307 +308 @@
 faad {
     DEFINES += HAVE_LIBFAAD \
     USE_FAAD2_LIBRARY
-    LIBS += -lfaad_drm
+    LIBS += -lfaad
 }
 faac {
     DEFINES += HAVE_LIBFAAC \
     USE_FAAC_LIBRARY
-    LIBS += -lfaac_drm
+    LIBS += -lfaac
 }
 sndfile {
     DEFINES += HAVE_LIBSNDFILE