filters: moved to own lib

aveminus · Oct 9, 2014 · 1e3b388 · 1e3b388
1 parent dcdd1d6
commit 1e3b388
Show file tree

Hide file tree

Showing 47 changed files with 43 additions and 2 deletions.
diff --git a/features/sawelibs.prf b/features/sawelibs.prf
@@ -11,6 +11,7 @@ INCLUDEPATH += \
     $$SAWEROOT/lib/justmisc \
     $$SAWEROOT/lib/signal \
     $$SAWEROOT/lib/tfr \
+    $$SAWEROOT/lib/filters \
     $$SAWEROOT/lib/heightmap \
     $$SAWEROOT/lib/tfrheightmap \
     $$SAWEROOT/lib/heightmapview \
@@ -38,6 +39,7 @@ LIBS += \
     -L$$SAWEROOT/lib/gpumisc -lgpumisc \
     -L$$SAWEROOT/lib/signal -lsignal \
     -L$$SAWEROOT/lib/tfr -ltfr \
+    -L$$SAWEROOT/lib/filters -lfilters \
     -L$$SAWEROOT/lib/heightmap -lheightmap \
     -L$$SAWEROOT/lib/tfrheightmap -ltfrheightmap \
     -L$$SAWEROOT/lib/heightmapview -lheightmapview \

diff --git a/lib/filters/filters.pro b/lib/filters/filters.pro
@@ -0,0 +1,40 @@
+# This builds a static library
+# Use Makefile.unittest to build and run a unit test
+
+TARGET = filters
+TEMPLATE = lib
+win32:TEMPLATE = vclib
+win32:CONFIG += debug_and_release
+
+CONFIG += staticlib warn_on
+CONFIG += c++11 buildflags
+CONFIG += tmpdir
+
+QT += widgets
+
+PWD = $$_PRO_FILE_PWD_
+
+SOURCES += \
+    $$PWD/filters/*.cpp \
+    $$PWD/filters/support/*.cpp \
+
+HEADERS += \
+    $$PWD/filters/*.h \
+    $$PWD/filters/support/*.h \
+
+INCLUDEPATH += ../backtrace ../gpumisc ../signal ../tfr ../justmisc
+win32: INCLUDEPATH += ../sonicawe-winlib
+
+macx:exists(/opt/local/include/): INCLUDEPATH += /opt/local/include/ # macports
+macx:exists(/usr/local/include/): INCLUDEPATH += /usr/local/include/ # homebrew
+
+OTHER_FILES += \
+    LICENSE \
+    README.txt \
+    *.pro \
+
+win32 { 
+    othersources.input = OTHER_FILES
+    othersources.output = ${QMAKE_FILE_NAME}
+    QMAKE_EXTRA_COMPILERS += othersources
+}
diff --git a/src/filters/absolutevalue.cpp → lib/filters/filters/absolutevalue.cpp b/src/filters/absolutevalue.cpp → lib/filters/filters/absolutevalue.cpp
diff --git a/src/filters/absolutevalue.h → lib/filters/filters/absolutevalue.h b/src/filters/absolutevalue.h → lib/filters/filters/absolutevalue.h
diff --git a/src/filters/bandpass.cpp → lib/filters/filters/bandpass.cpp b/src/filters/bandpass.cpp → lib/filters/filters/bandpass.cpp
diff --git a/src/filters/bandpass.h → lib/filters/filters/bandpass.h b/src/filters/bandpass.h → lib/filters/filters/bandpass.h
diff --git a/src/filters/ellipse.cpp → lib/filters/filters/ellipse.cpp b/src/filters/ellipse.cpp → lib/filters/filters/ellipse.cpp
diff --git a/src/filters/ellipse.h → lib/filters/filters/ellipse.h b/src/filters/ellipse.h → lib/filters/filters/ellipse.h
diff --git a/src/filters/ellipsekernel.h → lib/filters/filters/ellipsekernel.h b/src/filters/ellipsekernel.h → lib/filters/filters/ellipsekernel.h
diff --git a/src/filters/ellipsekernel_cpu.cpp → lib/filters/filters/ellipsekernel_cpu.cpp b/src/filters/ellipsekernel_cpu.cpp → lib/filters/filters/ellipsekernel_cpu.cpp
diff --git a/src/filters/ellipsekernel_cuda.cu → lib/filters/filters/ellipsekernel_cuda.cu b/src/filters/ellipsekernel_cuda.cu → lib/filters/filters/ellipsekernel_cuda.cu
diff --git a/src/filters/ellipsekerneldef.h → lib/filters/filters/ellipsekerneldef.h b/src/filters/ellipsekerneldef.h → lib/filters/filters/ellipsekerneldef.h
diff --git a/src/filters/envelope.cpp → lib/filters/filters/envelope.cpp b/src/filters/envelope.cpp → lib/filters/filters/envelope.cpp
diff --git a/src/filters/envelope.h → lib/filters/filters/envelope.h b/src/filters/envelope.h → lib/filters/filters/envelope.h
diff --git a/src/filters/move.cpp → lib/filters/filters/move.cpp b/src/filters/move.cpp → lib/filters/filters/move.cpp
diff --git a/src/filters/move.cu → lib/filters/filters/move.cu b/src/filters/move.cu → lib/filters/filters/move.cu
diff --git a/src/filters/move.cu.h → lib/filters/filters/move.cu.h b/src/filters/move.cu.h → lib/filters/filters/move.cu.h
diff --git a/src/filters/move.h → lib/filters/filters/move.h b/src/filters/move.h → lib/filters/filters/move.h
diff --git a/src/filters/normalize.cpp → lib/filters/filters/normalize.cpp b/src/filters/normalize.cpp → lib/filters/filters/normalize.cpp
diff --git a/src/filters/normalize.h → lib/filters/filters/normalize.h b/src/filters/normalize.h → lib/filters/filters/normalize.h
diff --git a/src/filters/normalizekernel.h → lib/filters/filters/normalizekernel.h b/src/filters/normalizekernel.h → lib/filters/filters/normalizekernel.h
diff --git a/src/filters/normalizekernel_cpu.cpp → lib/filters/filters/normalizekernel_cpu.cpp b/src/filters/normalizekernel_cpu.cpp → lib/filters/filters/normalizekernel_cpu.cpp
diff --git a/src/filters/normalizekernel_cuda.cu → lib/filters/filters/normalizekernel_cuda.cu b/src/filters/normalizekernel_cuda.cu → lib/filters/filters/normalizekernel_cuda.cu
diff --git a/src/filters/normalizespectra.cpp → lib/filters/filters/normalizespectra.cpp b/src/filters/normalizespectra.cpp → lib/filters/filters/normalizespectra.cpp
diff --git a/src/filters/normalizespectra.h → lib/filters/filters/normalizespectra.h b/src/filters/normalizespectra.h → lib/filters/filters/normalizespectra.h
diff --git a/src/filters/reassign.cpp → lib/filters/filters/reassign.cpp b/src/filters/reassign.cpp → lib/filters/filters/reassign.cpp
diff --git a/src/filters/reassign.cu → lib/filters/filters/reassign.cu b/src/filters/reassign.cu → lib/filters/filters/reassign.cu
diff --git a/src/filters/reassign.cu.h → lib/filters/filters/reassign.cu.h b/src/filters/reassign.cu.h → lib/filters/filters/reassign.cu.h
diff --git a/src/filters/reassign.h → lib/filters/filters/reassign.h b/src/filters/reassign.h → lib/filters/filters/reassign.h
diff --git a/src/filters/rectangle.cpp → lib/filters/filters/rectangle.cpp b/src/filters/rectangle.cpp → lib/filters/filters/rectangle.cpp
diff --git a/src/filters/rectangle.h → lib/filters/filters/rectangle.h b/src/filters/rectangle.h → lib/filters/filters/rectangle.h
diff --git a/src/filters/rectanglekernel.h → lib/filters/filters/rectanglekernel.h b/src/filters/rectanglekernel.h → lib/filters/filters/rectanglekernel.h
diff --git a/src/filters/rectanglekernel_cpu.cpp → lib/filters/filters/rectanglekernel_cpu.cpp b/src/filters/rectanglekernel_cpu.cpp → lib/filters/filters/rectanglekernel_cpu.cpp
diff --git a/src/filters/rectanglekernel_cuda.cu → lib/filters/filters/rectanglekernel_cuda.cu b/src/filters/rectanglekernel_cuda.cu → lib/filters/filters/rectanglekernel_cuda.cu
diff --git a/src/filters/rectanglekerneldef.h → lib/filters/filters/rectanglekerneldef.h b/src/filters/rectanglekerneldef.h → lib/filters/filters/rectanglekerneldef.h
diff --git a/src/filters/ridge.cpp → lib/filters/filters/ridge.cpp b/src/filters/ridge.cpp → lib/filters/filters/ridge.cpp
diff --git a/src/filters/ridge.cu → lib/filters/filters/ridge.cu b/src/filters/ridge.cu → lib/filters/filters/ridge.cu
diff --git a/src/filters/ridge.cu.h → lib/filters/filters/ridge.cu.h b/src/filters/ridge.cu.h → lib/filters/filters/ridge.cu.h
diff --git a/src/filters/ridge.h → lib/filters/filters/ridge.h b/src/filters/ridge.h → lib/filters/filters/ridge.h
diff --git a/src/filters/selection.cpp → lib/filters/filters/selection.cpp b/src/filters/selection.cpp → lib/filters/filters/selection.cpp
diff --git a/src/filters/selection.h → lib/filters/filters/selection.h b/src/filters/selection.h → lib/filters/filters/selection.h
diff --git a/src/tools/support/operation-composite.cpp → ...s/filters/support/operation-composite.cpp b/src/tools/support/operation-composite.cpp → ...s/filters/support/operation-composite.cpp
diff --git a/src/tools/support/operation-composite.h → ...ers/filters/support/operation-composite.h b/src/tools/support/operation-composite.h → ...ers/filters/support/operation-composite.h
diff --git a/src/filters/timeselection.cpp → lib/filters/filters/timeselection.cpp b/src/filters/timeselection.cpp → lib/filters/filters/timeselection.cpp
diff --git a/src/filters/timeselection.h → lib/filters/filters/timeselection.h b/src/filters/timeselection.h → lib/filters/filters/timeselection.h
diff --git a/sonicawe.pro b/sonicawe.pro
@@ -7,6 +7,7 @@ SUBDIRS = \
     lib/gpumisc \
     lib/signal \
     lib/tfr \
+    lib/filters \
     lib/heightmap \
     lib/tfrheightmap \
     lib/heightmapview \

diff --git a/src/src.pro b/src/src.pro
@@ -46,7 +46,6 @@ PWD = $$_PRO_FILE_PWD_
 
 SOURCES += \
     $$PWD/adapters/*.cpp \
-    $$PWD/filters/*.cpp \
     $$PWD/sawe/*.cpp \
     $$PWD/test/*.cpp \
     $$PWD/tools/*.cpp \
@@ -62,7 +61,6 @@ win32:SOURCES += sonicawe.rc \
 
 HEADERS += \
     $$PWD/adapters/*.h \
-    $$PWD/filters/*.h \
     $$PWD/sawe/*.h \
     $$PWD/test/*.h \
     $$PWD/tools/*.h \