diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 80e7655..e665eab 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -18,7 +18,7 @@ jobs: run: | sudo apt update cd ../.. - git clone https://github.com/open-ephys/plugin-GUI.git + git clone https://github.com/open-ephys/plugin-GUI.git --branch main sudo ./plugin-GUI/Resources/Scripts/install_linux_dependencies.sh cd plugin-GUI/Build && cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release .. - name: build diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index db8d451..eb9f104 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -17,7 +17,7 @@ jobs: - name: setup run: | cd ../.. - git clone https://github.com/open-ephys/plugin-GUI.git + git clone https://github.com/open-ephys/plugin-GUI.git --branch main cd plugin-GUI/Build && cmake -G "Xcode" .. - name: build run: | diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 86b729d..b6cc278 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -20,7 +20,7 @@ jobs: package: "open-ephys-lib" run: | cd ../.. - git clone https://github.com/open-ephys/plugin-GUI.git + git clone https://github.com/open-ephys/plugin-GUI.git --branch main cd plugin-GUI/Build cmake -G "Visual Studio 16 2019" -A x64 .. mkdir Release && cd Release diff --git a/CMakeLists.txt b/CMakeLists.txt index 6183211..fff831e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,8 @@ endif() get_filename_component(PROJECT_FOLDER ${CMAKE_CURRENT_SOURCE_DIR} ABSOLUTE) get_filename_component(PLUGIN_NAME ${PROJECT_FOLDER} NAME) +set(CMAKE_OSX_ARCHITECTURES "x86_64" CACHE STRING "Build architecture for Mac OS X" FORCE) + project(OE_PLUGIN_${PLUGIN_NAME}) set(CMAKE_SHARED_LIBRARY_PREFIX "") if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") diff --git a/README.md b/README.md index 8316ebe..06329c0 100644 --- a/README.md +++ b/README.md @@ -19,8 +19,6 @@ Mixes, weights, and applies a rolling average to three bandwidths of interest on First, follow the instructions on [this page](https://open-ephys.github.io/gui-docs/Developer-Guide/Compiling-the-GUI.html) to build the Open Ephys GUI. -**Important:** This plugin is intended for use with the pre-release core application, version 0.6.0. The GUI should be compiled from the [`development-juce6`](https://github.com/open-ephys/plugin-gui/tree/development-juce6) branch, rather than the `master` branch. - Then, clone this repository into a directory at the same level as the `plugin-GUI`, e.g.: ``` diff --git a/Source/OpenEphysLib.cpp b/Source/OpenEphysLib.cpp index 05010ef..51bef4b 100644 --- a/Source/OpenEphysLib.cpp +++ b/Source/OpenEphysLib.cpp @@ -38,7 +38,7 @@ extern "C" EXPORT void getLibInfo(Plugin::LibraryInfo* info) { info->apiVersion = PLUGIN_API_VER; info->name = "Multi-Band Integrator"; - info->libVersion = "0.1.0"; + info->libVersion = "0.2.0"; info->numPlugins = NUM_PLUGINS; }