Switch exprtk to submodoule

LMMS · Nov 10, 2017 · 4b2d69a · 4b2d69a
1 parent d37284b
commit 4b2d69a
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 38,048 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -13,3 +13,6 @@
 [submodule "plugins/LadspaEffect/calf/veal"]
 	path = plugins/LadspaEffect/calf/veal
 	url = https://github.com/lmms/veal
+[submodule "plugins/xpressive/exprtk"]
+	path = plugins/xpressive/exprtk
+	url = https://github.com/ArashPartow/exprtk
diff --git a/plugins/xpressive/CMakeLists.txt b/plugins/xpressive/CMakeLists.txt
@@ -1,10 +1,11 @@
 INCLUDE(BuildPlugin)
 
+INCLUDE_DIRECTORIES(exprtk)
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Dexprtk_disable_sc_andor -Dexprtk_disable_return_statement -Dexprtk_disable_break_continue -Dexprtk_disable_comments -Dexprtk_disable_string_capabilities -Dexprtk_disable_rtl_io_file -Dexprtk_disable_rtl_vecops ${WERROR_FLAGS} -fexceptions")
 
 IF(WIN32)
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wa,-mbig-obj -Dexprtk_disable_enhanced_features")
 ENDIF()
 
-BUILD_PLUGIN(xpressive expressive_plugin.cpp exprsynth.cpp expressive_plugin.h exprtk.hpp MOCFILES expressive_plugin.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
+BUILD_PLUGIN(xpressive expressive_plugin.cpp exprsynth.cpp expressive_plugin.h exprtk/exprtk.hpp MOCFILES expressive_plugin.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
 
diff --git a/plugins/xpressive/MIT b/plugins/xpressive/MIT
diff --git a/plugins/xpressive/exprtk b/plugins/xpressive/exprtk