Merge pull request #99 from neuromore/master

Version 1.4.9
neuromore · Apr 12, 2021 · bbd4925 · bbd4925
2 parents 71571ea + 5e93818
commit bbd4925
Show file tree

Hide file tree

Showing 752 changed files with 265,338 additions and 146 deletions.
diff --git a/build/make/Makefile.android-linux b/build/make/Makefile.android-linux
@@ -37,6 +37,11 @@ endif
 
 #########################################################################################
 
+# prebuilt binary folder
+PREBUILTDIR_X86 = ../../deps/prebuilt/android/x86
+PREBUILTDIR_X64 = ../../deps/prebuilt/android/x64
+SHAREDLIBEXT    = .so
+
 # flags shared between all
 FLAGS = -O3 \
         -fpic \
@@ -65,6 +70,9 @@ JAVAC = "$(JAVA_HOME)/bin/javac"
 define deletefilepattern
 	find $(1) -type f -name '$(2)' -delete
 endef
+define copyfilepattern
+	cp $(1) $(2)
+endef
 
 # AR
 LIB_X86      = $(TOOLCHAIN)/bin/$(TARGET_AR_X86)-ar

diff --git a/build/make/Makefile.android-osx b/build/make/Makefile.android-osx
@@ -36,6 +36,11 @@ endif
 
 #########################################################################################
 
+# prebuilt binary folder
+PREBUILTDIR_X86 = ../../deps/prebuilt/android/x86
+PREBUILTDIR_X64 = ../../deps/prebuilt/android/x64
+SHAREDLIBEXT    = .so
+
 # flags shared between all
 FLAGS = -O3 \
         -fpic \
@@ -65,6 +70,9 @@ JAVAC = "$(JAVA_HOME)/bin/javac"
 define deletefilepattern
 	find $(1) -type f -name '$(2)' -delete
 endef
+define copyfilepattern
+	cp $(1) $(2)
+endef
 
 # AR
 LIB_X86      = $(TOOLCHAIN)/bin/$(TARGET_AR_X86)-ar

diff --git a/build/make/Makefile.android-shared b/build/make/Makefile.android-shared
@@ -89,18 +89,23 @@ STUDIO_LIBS_X86 = $(LIBDIR_X86)/QtBase.a \
                   $(DEPSLIBDIR_X86)/kissfft.a \
                   $(DEPSLIBDIR_X86)/libssl.a \
                   $(DEPSLIBDIR_X86)/libcrypto.a \
+                  $(DEPSLIBDIR_X86)/brainflow-boardcontroller.a \
+                  $(DEPSLIBDIR_X86)/brainflow.a \
                   $(DEPSLIBDIR_X86)/opencv-core.a \
                   $(DEPSLIBDIR_X86)/opencv-imgcodecs.a \
                   $(DEPSLIBDIR_X86)/opencv-imgproc.a \
                   $(DEPSLIBDIR_X86)/opencv-videoio.a \
                   $(DEPSLIBDIR_X86)/minizip.a \
+                  $(DEPSLIBDIR_X86)/dspfilters.a \
+                  $(DEPSLIBDIR_X86)/wavelib.a \
                   $(DEPSLIBDIR_X86)/oscpack.a \
                   $(DEPSLIBDIR_X86)/pcre2.a \
                   $(DEPSLIBDIR_X86)/tinyaes.a \
                   $(DEPSLIBDIR_X86)/tinyobjloader.a \
                   $(DEPSLIBDIR_X86)/tinyxml.a \
                   $(DEPSLIBDIR_X86)/libjpeg.a \
                   $(DEPSLIBDIR_X86)/libpng.a \
+                  $(DEPSLIBDIR_X86)/libsvm.a \
                   $(DEPSLIBDIR_X86)/zlib.a
 STUDIO_LIBS_X64 = $(LIBDIR_X64)/QtBase.a \
                   $(LIBDIR_X64)/Engine.a \
@@ -131,18 +136,23 @@ STUDIO_LIBS_X64 = $(LIBDIR_X64)/QtBase.a \
                   $(DEPSLIBDIR_X64)/kissfft.a \
                   $(DEPSLIBDIR_X64)/libssl.a \
                   $(DEPSLIBDIR_X64)/libcrypto.a \
+                  $(DEPSLIBDIR_X64)/brainflow-boardcontroller.a \
+                  $(DEPSLIBDIR_X64)/brainflow.a \
                   $(DEPSLIBDIR_X64)/opencv-core.a \
                   $(DEPSLIBDIR_X64)/opencv-imgcodecs.a \
                   $(DEPSLIBDIR_X64)/opencv-imgproc.a \
                   $(DEPSLIBDIR_X64)/opencv-videoio.a \
                   $(DEPSLIBDIR_X64)/minizip.a \
+                  $(DEPSLIBDIR_X64)/dspfilters.a \
+                  $(DEPSLIBDIR_X64)/wavelib.a \
                   $(DEPSLIBDIR_X64)/oscpack.a \
                   $(DEPSLIBDIR_X64)/pcre2.a \
                   $(DEPSLIBDIR_X64)/tinyaes.a \
                   $(DEPSLIBDIR_X64)/tinyobjloader.a \
                   $(DEPSLIBDIR_X64)/tinyxml.a \
                   $(DEPSLIBDIR_X64)/libjpeg.a \
                   $(DEPSLIBDIR_X64)/libpng.a \
+                  $(DEPSLIBDIR_X64)/libsvm.a \
                   $(DEPSLIBDIR_X64)/zlib.a
 
 #####################################################################################

diff --git a/build/make/Makefile.android-win b/build/make/Makefile.android-win
@@ -37,6 +37,11 @@ endif
 
 #########################################################################################
 
+# prebuilt binary folder
+PREBUILTDIR_X86 = ../../deps/prebuilt/android/x86
+PREBUILTDIR_X64 = ../../deps/prebuilt/android/x64
+SHAREDLIBEXT    = .so
+
 # flags shared between all
 FLAGS = -O3 \
         -fpic \
@@ -65,6 +70,9 @@ JAVAC = "$(JAVA_HOME)/bin/javac.exe"
 define deletefilepattern
 	del /s /q $(subst /,\,$(1))\$(2)
 endef
+define copyfilepattern
+	copy $(subst /,\,$(1)) $(subst /,\,$(2))
+endef
 
 # AR
 LIB_X86      = $(TOOLCHAIN)/bin/$(TARGET_AR_X86)-ar.exe

diff --git a/build/make/Makefile.common b/build/make/Makefile.common
@@ -589,7 +589,14 @@ STUDIO_DEFINES       = -DAPPNAME="neuromore Studio" \
 STUDIO_DEFINES_X86   = $(STUDIO_DEFINES) $(STUDIO_DEFINES_X86_PLAT)
 STUDIO_DEFINES_X64   = $(STUDIO_DEFINES) $(STUDIO_DEFINES_X64_PLAT)
 STUDIO_INCLUDES      = -I$(INCDIR) -I$(SRCDIR) -I$(ENGINE_SRCDIR) -I$(ENGINE_INCDIR) \
-                       -I$(DEPSINCDIR) -I$(DEPSINCDIR)/qt \
+                       -I$(DEPSINCDIR) \
+                       -I$(DEPSINCDIR)/brainflow/board_controller \
+                       -I$(DEPSINCDIR)/brainflow/data_handler \
+                       -I$(DEPSINCDIR)/brainflow/utils \
+                       -I$(DEPSINCDIR)/json \
+                       -I$(DEPSINCDIR)/neurosdk \
+                       -I$(DEPSINCDIR)/unicorn \
+                       -I$(DEPSINCDIR)/qt \
                        -I$(DEPSINCDIR)/qt/QtBluetooth \
                        -I$(DEPSINCDIR)/qt/QtCore \
                        -I$(DEPSINCDIR)/qt/QtGui \

diff --git a/build/make/Makefile.linux b/build/make/Makefile.linux
@@ -2,6 +2,11 @@
 # LINUX CLANG MAKEFILE
 #
 
+# prebuilt binary folder
+PREBUILTDIR_X86 = ../../deps/prebuilt/linux/x86
+PREBUILTDIR_X64 = ../../deps/prebuilt/linux/x64
+SHAREDLIBEXT    = .so
+
 # target platforms
 TARGET_X86 = i686-linux-gnu
 TARGET_X64 = x86_64-linux-gnu
@@ -36,6 +41,9 @@ JAVAC = "$(JAVA_HOME)/bin/javac"
 define deletefilepattern
 	find $(1) -type f -name '$(2)' -delete
 endef
+define copyfilepattern
+	cp $(1) $(2)
+endef
 
 # Platform Specific additional defines
 ENGINE_DEFINES_X86_PLAT    = -DNEUROMORE_PLATFORM_LINUX
@@ -241,18 +249,23 @@ STUDIO_LIBS_X86 = $(LIBDIR_X86)/QtBase.a \
                   $(DEPSLIBDIR_X86)/kissfft.a \
                   $(DEPSLIBDIR_X86)/libssl.a \
                   $(DEPSLIBDIR_X86)/libcrypto.a \
+                  $(DEPSLIBDIR_X86)/brainflow-boardcontroller.a \
+                  $(DEPSLIBDIR_X86)/brainflow.a \
                   $(DEPSLIBDIR_X86)/opencv-core.a \
                   $(DEPSLIBDIR_X86)/opencv-imgcodecs.a \
                   $(DEPSLIBDIR_X86)/opencv-imgproc.a \
                   $(DEPSLIBDIR_X86)/opencv-videoio.a \
                   $(DEPSLIBDIR_X86)/minizip.a \
+                  $(DEPSLIBDIR_X86)/dspfilters.a \
+                  $(DEPSLIBDIR_X86)/wavelib.a \
                   $(DEPSLIBDIR_X86)/oscpack.a \
                   $(DEPSLIBDIR_X86)/pcre2.a \
                   $(DEPSLIBDIR_X86)/tinyaes.a \
                   $(DEPSLIBDIR_X86)/tinyobjloader.a \
                   $(DEPSLIBDIR_X86)/tinyxml.a \
                   $(DEPSLIBDIR_X86)/libjpeg.a \
                   $(DEPSLIBDIR_X86)/libpng.a \
+                  $(DEPSLIBDIR_X86)/libsvm.a \
                   $(DEPSLIBDIR_X86)/zlib.a \
                   $(STUDIO_LIBS_ALL)
 STUDIO_LIBS_X64 = $(LIBDIR_X64)/QtBase.a \
@@ -285,18 +298,23 @@ STUDIO_LIBS_X64 = $(LIBDIR_X64)/QtBase.a \
                   $(DEPSLIBDIR_X64)/kissfft.a \
                   $(DEPSLIBDIR_X64)/libssl.a \
                   $(DEPSLIBDIR_X64)/libcrypto.a \
+                  $(DEPSLIBDIR_X64)/brainflow-boardcontroller.a \
+                  $(DEPSLIBDIR_X64)/brainflow.a \
                   $(DEPSLIBDIR_X64)/opencv-core.a \
                   $(DEPSLIBDIR_X64)/opencv-imgcodecs.a \
                   $(DEPSLIBDIR_X64)/opencv-imgproc.a \
                   $(DEPSLIBDIR_X64)/opencv-videoio.a \
                   $(DEPSLIBDIR_X64)/minizip.a \
+                  $(DEPSLIBDIR_X64)/dspfilters.a \
+                  $(DEPSLIBDIR_X64)/wavelib.a \
                   $(DEPSLIBDIR_X64)/oscpack.a \
                   $(DEPSLIBDIR_X64)/pcre2.a \
                   $(DEPSLIBDIR_X64)/tinyaes.a \
                   $(DEPSLIBDIR_X64)/tinyobjloader.a \
                   $(DEPSLIBDIR_X64)/tinyxml.a \
                   $(DEPSLIBDIR_X64)/libjpeg.a \
                   $(DEPSLIBDIR_X64)/libpng.a \
+                  $(DEPSLIBDIR_X64)/libsvm.a \
                   $(DEPSLIBDIR_X64)/zlib.a \
                   $(STUDIO_LIBS_ALL)
 

diff --git a/build/make/Makefile.osx b/build/make/Makefile.osx
@@ -2,6 +2,11 @@
 # MAC OS X CLANG MAKEFILE
 #
 
+# prebuilt binary folder and library extension pattern
+PREBUILTDIR_X86 = ../../deps/prebuilt/osx/x86
+PREBUILTDIR_X64 = ../../deps/prebuilt/osx/x64
+SHAREDLIBEXT    = .dylib
+
 # target platforms
 TARGET_X86 = i686-apple-darwin19.2.0
 TARGET_X64 = x86_64-apple-darwin19.2.0
@@ -39,6 +44,9 @@ JAVAC = "$(JAVA_HOME)/bin/javac"
 define deletefilepattern
 	find $(1) -type f -name '$(2)' -delete
 endef
+define copyfilepattern
+	cp $(1) $(2)
+endef
 
 # Platform Specific additional defines
 ENGINE_DEFINES_X86_PLAT    = -DNEUROMORE_PLATFORM_OSX
@@ -222,18 +230,23 @@ STUDIO_LIBS_X86 = $(LIBDIR_X86)/QtBase.a \
                   $(DEPSLIBDIR_X86)/kissfft.a \
                   $(DEPSLIBDIR_X86)/libssl.a \
                   $(DEPSLIBDIR_X86)/libcrypto.a \
+                  $(DEPSLIBDIR_X86)/brainflow-boardcontroller.a \
+                  $(DEPSLIBDIR_X86)/brainflow.a \
                   $(DEPSLIBDIR_X86)/opencv-core.a \
                   $(DEPSLIBDIR_X86)/opencv-imgcodecs.a \
                   $(DEPSLIBDIR_X86)/opencv-imgproc.a \
                   $(DEPSLIBDIR_X86)/opencv-videoio.a \
                   $(DEPSLIBDIR_X86)/minizip.a \
+                  $(DEPSLIBDIR_X86)/dspfilters.a \
+                  $(DEPSLIBDIR_X86)/wavelib.a \
                   $(DEPSLIBDIR_X86)/oscpack.a \
                   $(DEPSLIBDIR_X86)/pcre2.a \
                   $(DEPSLIBDIR_X86)/tinyaes.a \
                   $(DEPSLIBDIR_X86)/tinyobjloader.a \
                   $(DEPSLIBDIR_X86)/tinyxml.a \
                   $(DEPSLIBDIR_X86)/libjpeg.a \
                   $(DEPSLIBDIR_X86)/libpng.a \
+                  $(DEPSLIBDIR_X86)/libsvm.a \
                   $(DEPSLIBDIR_X86)/zlib.a
 STUDIO_LIBS_X64 = $(LIBDIR_X64)/QtBase.a \
                   $(LIBDIR_X64)/Engine.a \
@@ -263,18 +276,23 @@ STUDIO_LIBS_X64 = $(LIBDIR_X64)/QtBase.a \
                   $(DEPSLIBDIR_X64)/kissfft.a \
                   $(DEPSLIBDIR_X64)/libssl.a \
                   $(DEPSLIBDIR_X64)/libcrypto.a \
+                  $(DEPSLIBDIR_X64)/brainflow-boardcontroller.a \
+                  $(DEPSLIBDIR_X64)/brainflow.a \
                   $(DEPSLIBDIR_X64)/opencv-core.a \
                   $(DEPSLIBDIR_X64)/opencv-imgcodecs.a \
                   $(DEPSLIBDIR_X64)/opencv-imgproc.a \
                   $(DEPSLIBDIR_X64)/opencv-videoio.a \
                   $(DEPSLIBDIR_X64)/minizip.a \
+                  $(DEPSLIBDIR_X64)/dspfilters.a \
+                  $(DEPSLIBDIR_X64)/wavelib.a \
                   $(DEPSLIBDIR_X64)/oscpack.a \
                   $(DEPSLIBDIR_X64)/pcre2.a \
                   $(DEPSLIBDIR_X64)/tinyaes.a \
                   $(DEPSLIBDIR_X64)/tinyobjloader.a \
                   $(DEPSLIBDIR_X64)/tinyxml.a \
                   $(DEPSLIBDIR_X64)/libjpeg.a \
                   $(DEPSLIBDIR_X64)/libpng.a \
+                  $(DEPSLIBDIR_X64)/libsvm.a \
                   $(DEPSLIBDIR_X64)/zlib.a
 
 #####################################################################################

diff --git a/build/make/Makefile.targets b/build/make/Makefile.targets
@@ -136,14 +136,21 @@ $(STUDIO_OBLS_X64) : $(STUDIO_PRES_X64)
 
 Studio-x86: Engine-x86 QtBase-x86 $(STUDIO_PRES_X86) $(STUDIO_OBLS_X86)
 	$(call createbin32,Studio,$(STUDIO_OBLS_X86),$(STUDIO_LIBS_X86))
+	$(call copyfilepattern,$(PREBUILTDIR_X86)/*$(SHAREDLIBEXT),$(BINDIR_X86)/)
+	$(call copyfilepattern,$(DEPSLIBDIR_X86)/*$(SHAREDLIBEXT),$(BINDIR_X86)/)
 
 Studio-x64: Engine-x64 QtBase-x64 $(STUDIO_PRES_X64) $(STUDIO_OBLS_X64)
 	$(call createbin64,Studio,$(STUDIO_OBLS_X64),$(STUDIO_LIBS_X64))
+	$(call copyfilepattern,$(PREBUILTDIR_X64)/*$(SHAREDLIBEXT),$(BINDIR_X64)/)
+	$(call copyfilepattern,$(DEPSLIBDIR_X64)/*$(SHAREDLIBEXT),$(BINDIR_X64)/)
 
 Studio: Studio-x86 Studio-x64
 
 Studio-x86-clean:
 	$(call deletefilepattern,$(BINDIR_X86),Studio*)
+	$(call deletefilepattern,$(BINDIR_X86),*.dll)
+	$(call deletefilepattern,$(BINDIR_X86),*.so)
+	$(call deletefilepattern,$(BINDIR_X86),*.dynlib)
 	$(call deletefilepattern,$(STUDIO_OBJDIR_X86),*.o)
 	$(call deletefilepattern,$(STUDIO_OBJDIR_X86),*.omoc)
 	$(call deletefilepattern,$(STUDIO_OBJDIR_X86),*.orcc)
@@ -153,6 +160,9 @@ Studio-x86-clean:
 
 Studio-x64-clean:
 	$(call deletefilepattern,$(BINDIR_X64),Studio*)
+	$(call deletefilepattern,$(BINDIR_X64),*.dll)
+	$(call deletefilepattern,$(BINDIR_X64),*.so)
+	$(call deletefilepattern,$(BINDIR_X64),*.dynlib)
 	$(call deletefilepattern,$(STUDIO_OBJDIR_X64),*.o)
 	$(call deletefilepattern,$(STUDIO_OBJDIR_X64),*.omoc)
 	$(call deletefilepattern,$(STUDIO_OBJDIR_X64),*.orcc)

diff --git a/build/make/Makefile.win b/build/make/Makefile.win
@@ -2,6 +2,11 @@
 # WINDOWS CLANG MAKEFILE
 #
 
+# prebuilt binary folder
+PREBUILTDIR_X86 = ../../deps/prebuilt/win/x86
+PREBUILTDIR_X64 = ../../deps/prebuilt/win/x64
+SHAREDLIBEXT    = .dll
+
 # target platforms
 TARGET_X86 = i686-pc-windows-msvc
 TARGET_X64 = x86_64-pc-windows-msvc
@@ -22,14 +27,14 @@ ARCHFLAGS_X64 = -msse -msse2
 # C Compiler
 CC_X86       = clang-cl
 CC_X64       = clang-cl
-CFLAGS_X86   = -MT -TC -m32 --target=$(TARGET_X86) $(ARCHFLAGS_X86) $(FLAGS)
-CFLAGS_X64   = -MT -TC -m64 --target=$(TARGET_X64) $(ARCHFLAGS_X64) $(FLAGS)
+CFLAGS_X86   = -TC -m32 --target=$(TARGET_X86) $(ARCHFLAGS_X86) $(FLAGS)
+CFLAGS_X64   = -TC -m64 --target=$(TARGET_X64) $(ARCHFLAGS_X64) $(FLAGS)
 
 # C++ Compiler
 CXX_X86      = clang++
 CXX_X64      = clang++
-CXXFLAGS_X86 = -MT -TP -m32 -target $(TARGET_X86) $(ARCHFLAGS_X86) -Xclang -flto-visibility-public-std -std=c++17 $(FLAGS)
-CXXFLAGS_X64 = -MT -TP -m64 -target $(TARGET_X64) $(ARCHFLAGS_X64) -Xclang -flto-visibility-public-std -std=c++17 $(FLAGS)
+CXXFLAGS_X86 = -m32 -target $(TARGET_X86) $(ARCHFLAGS_X86) -Xclang -flto-visibility-public-std -std=c++17 $(FLAGS)
+CXXFLAGS_X64 = -m64 -target $(TARGET_X64) $(ARCHFLAGS_X64) -Xclang -flto-visibility-public-std -std=c++17 $(FLAGS)
 
 # JAVA JDK
 JAR   = "$(JAVA_HOME)/bin/jar.exe"
@@ -39,6 +44,10 @@ JAVAC = "$(JAVA_HOME)/bin/javac.exe"
 define deletefilepattern
 	del /s /q $(subst /,\,$(1))\$(2)
 endef
+define copyfilepattern
+	copy $(subst /,\,$(1)) $(subst /,\,$(2))
+endef
+
 
 # Platform Specific additional defines
 ENGINE_DEFINES_X86_PLAT    = -DNEUROMORE_PLATFORM_WINDOWS -DNEUROMORE_ARCHITECTURE_X86
@@ -124,12 +133,14 @@ WINSDKVER  := $(subst \,/,$(WindowsSDKVersion))
 
 # Linker Library Path
 LINKPATH_X86 = -libpath:"$(DIRVCTOOLS)lib/x86" \
+               -libpath:"$(DIRVCTOOLS)atlmfc/lib/x86" \
                -libpath:"$(DIRWINSDK)Lib/$(WINSDKVER)ucrt/x86" \
                -libpath:"$(DIRWINSDK)Lib/$(WINSDKVER)um/x86" \
                -libpath:"../../deps/build/make/lib/x86" \
                -libpath:"../../deps/prebuilt/win/x86" \
                -libpath:"lib/x86"
 LINKPATH_X64 = -libpath:"$(DIRVCTOOLS)lib/x64" \
+               -libpath:"$(DIRVCTOOLS)atlmfc/lib/x64" \
                -libpath:"$(DIRWINSDK)Lib/$(WINSDKVER)ucrt/x64" \
                -libpath:"$(DIRWINSDK)Lib/$(WINSDKVER)um/x64" \
                -libpath:"../../deps/build/make/lib/x64" \