Skip to content

Commit

Permalink
Rename xpressive to Xpressive
Browse files Browse the repository at this point in the history
  • Loading branch information
tresf committed Nov 11, 2017
1 parent 4b2d69a commit 898f978
Show file tree
Hide file tree
Showing 26 changed files with 104 additions and 89 deletions.
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +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
[submodule "plugins/Xpressive/exprtk"]
path = plugins/Xpressive/exprtk
url = https://github.com/ArashPartow/exprtk
2 changes: 1 addition & 1 deletion plugins/CMakeLists.txt
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
File renamed without changes.
26 changes: 26 additions & 0 deletions plugins/Xpressive/CMakeLists.txt
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"
)


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
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

0 comments on commit 898f978

Please sign in to comment.