Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch exprtk to submodule #3965

Merged
merged 2 commits into from
Nov 11, 2017
Merged

Switch exprtk to submodule #3965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b2d69a
Switch exprtk to submodoule
tresf Nov 10, 2017
898f978
Rename xpressive to Xpressive
tresf Nov 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion plugins/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ IF("${PLUGIN_LIST}" STREQUAL "")
watsyn
waveshaper
vibed
xpressive
Xpressive
zynaddsubfx
)

Expand Down
0 plugins/xpressive/.gitignore → plugins/Xpressive/.gitignore
View file
Open in desktop
File renamed without changes.
26 changes: 26 additions & 0 deletions plugins/Xpressive/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
INCLUDE(BuildPlugin)

INCLUDE_DIRECTORIES(exprtk)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Dexprtk_disable_sc_andor")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Dexprtk_disable_return_statement")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Dexprtk_disable_break_continue")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Dexprtk_disable_comments")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Dexprtk_disable_string_capabilities")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Dexprtk_disable_rtl_io_file")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Dexprtk_disable_rtl_vecops")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WERROR_FLAGS} -fexceptions")

IF(LMMS_BUILD_WIN32)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wa,-mbig-obj -Dexprtk_disable_enhanced_features")
ENDIF()

BUILD_PLUGIN(xpressive
Xpressive.cpp
ExprSynth.cpp
Xpressive.h
exprtk/exprtk.hpp
MOCFILES Xpressive.h
EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png"
)


6 changes: 3 additions & 3 deletions plugins/xpressive/exprsynth.cpp → plugins/Xpressive/ExprSynth.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* exprfront.cpp - implementation of a Frontend to ExprTk
* ExprSynth.cpp - Implementation of a Frontend to ExprTk
*
* Copyright (c) 2016-2017 Orr Dvori
*
Expand All @@ -23,15 +23,15 @@
*/


#include "exprsynth.h"
#include "ExprSynth.h"

#include <string>
#include <vector>
#include <math.h>
#include <cstdlib>
#include <random>

#include "expressive_plugin.h"
#include "Xpressive.h"

#include "interpolation.h"
#include "lmms_math.h"
Expand Down
6 changes: 3 additions & 3 deletions plugins/xpressive/exprsynth.h → plugins/Xpressive/ExprSynth.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
*
*/

#ifndef EXPRFRONT_H_
#define EXPRFRONT_H_
#ifndef EXPRSYNTH_H
#define EXPRSYNTH_H

#include <cmath>
#include <cstddef>
Expand Down Expand Up @@ -138,4 +138,4 @@ inline void clearArray(T* arr,unsigned int size)



#endif /* EXPRFRONT_H_ */
#endif
Loading