[Kst] branches/work/kst/portto4/kst

[Peter Kümmel]

SVN commit 1200059 by kuemmel:

add dirfile support to kst for osx

 M  +3 -0      config.pri  
 M  +5 -0      datasourceplugin.pri  
 M  +3 -1      misc/macdeploykst  
 M  +1 -0      src/datasources/dirfilesource/dirfilesource.pro  


--- branches/work/kst/portto4/kst/config.pri #1200058:1200059
@@ -73,6 +73,9 @@
   win32:!isEmpty(GETDATADIR) {
     return(true)
   }
+  macx:!isEmpty(GETDATADIR) {
+    return(true)
+  }
   return(false)
 }
 
--- branches/work/kst/portto4/kst/datasourceplugin.pri #1200058:1200059
@@ -45,11 +45,16 @@
 	INCLUDEPATH += $$(GETDATADIR)/include
 	LIBS += -L$$(GETDATADIR)/lib
     } else {
+        macx {
+            INCLUDEPATH += $$(GETDATADIR)/include
+	    LIBS += -L$$(GETDATADIR)/lib
+        } else {
 	CONFIG += link_pkgconfig
 	PKGCONFIG += getdata
 	INCLUDEPATH += $$pkginclude(getdata)
     }
 }
+}
 
 LibExists(netcdf) {
     win32 {	
--- branches/work/kst/portto4/kst/misc/macdeploykst #1200058:1200059
@@ -26,7 +26,6 @@
 #ref: http://doc.qt.nokia.com/4.7/deployment-mac.html
 #
 
-mkdir build/bin/kst2.app/Contents
 mkdir build/bin/kst2.app/Contents/PlugIns
 
 change_lib_path()
@@ -45,7 +44,10 @@
 }
 
 deploy_plugin build/plugin/libkst2data_ascii.dylib
+deploy_plugin build/plugin/libkst2data_dirfilesource.dylib
 
+
+
 # 2. Libraries
 
 install_kst_libs()
--- branches/work/kst/portto4/kst/src/datasources/dirfilesource/dirfilesource.pro #1200058:1200059
@@ -8,6 +8,7 @@
 
 LIBS += -lgetdata++
 win32:LIBS += -lgetdata
+macx:LIBS += -lgetdata -lz -lbz2
 
 SOURCES += \
     dirfilesource.cpp