Compare commits

..

No commits in common. "init-cli" and "main" have entirely different histories.

4 changed files with 4 additions and 21 deletions

4
.gitmodules vendored
View File

@ -1,4 +0,0 @@
[submodule "lib/pybind11"]
path = lib/pybind11
url = https://github.com/pybind/pybind11
branch = stable

View File

@ -3,19 +3,13 @@ project(wtpp)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
add_subdirectory(lib/pybind11)
add_executable(wtpp src/wtpp.cpp)
pybind11_add_module(py-wave SHARED src/wave.cpp)
pybind11_add_module(py-wavetable SHARED src/wavetable.cpp)
# pybind11_add_module(common SHARED src/common.cpp)
# pybind11_add_module(generators SHARED src/generators.cpp)
add_library (wave src/wave.cpp) add_library (wave src/wave.cpp)
add_library (wavetable src/wavetable.cpp) add_library (wavetable src/wavetable.cpp)
add_library (common src/common.cpp) add_library (common src/common.cpp)
add_library (generators src/generators.cpp) add_library (generators src/generators.cpp)
add_executable(wtpp src/wtpp.cpp)
target_link_libraries(wtpp wave wavetable common generators) target_link_libraries(wtpp wave wavetable common generators)
include(FetchContent) include(FetchContent)

@ -1 +0,0 @@
Subproject commit 12852cd33bdaae0fe5fecc0db39b788dbbcc7b3d

View File

@ -1,10 +1,4 @@
#include <iostream> #include <iostream>
#include "wave.h"
#include "wavetable.h"
// Initialize index at 0 for Wave and Wavetable cycles
uint16_t Wave::m_nid = 0;
uint16_t Wavetable::m_nid = 0;
int main() int main()
{ {