Skip to content

Commit 93b2ad8

Browse files
committed
Update to API 10
1 parent dbe500e commit 93b2ad8

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ if(MSVC)
6666
target_link_libraries(${PLUGIN_NAME} ${GUI_BIN_DIR}/open-ephys.lib)
6767
target_compile_options(${PLUGIN_NAME} PRIVATE /sdl- /W0)
6868

69-
install(TARGETS ${PLUGIN_NAME} RUNTIME DESTINATION ${GUI_BIN_DIR}/plugins-api9 CONFIGURATIONS ${CMAKE_CONFIGURATION_TYPES})
69+
install(TARGETS ${PLUGIN_NAME} RUNTIME DESTINATION ${GUI_BIN_DIR}/plugins-api10 CONFIGURATIONS ${CMAKE_CONFIGURATION_TYPES})
7070

7171
set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../libs)
7272

@@ -85,17 +85,17 @@ if(MSVC)
8585
elseif(LINUX)
8686
target_link_libraries(${PLUGIN_NAME} GL X11 Xext Xinerama asound dl freetype pthread rt)
8787
set_property(TARGET ${PLUGIN_NAME} APPEND_STRING PROPERTY LINK_FLAGS
88-
"-fvisibility=hidden -fPIC -rdynamic -Wl,-rpath,'$$ORIGIN/../shared-api9'")
88+
"-fvisibility=hidden -fPIC -rdynamic -Wl,-rpath,'$$ORIGIN/../shared-api10'")
8989
target_compile_options(${PLUGIN_NAME} PRIVATE -fPIC -rdynamic)
9090
target_compile_options(${PLUGIN_NAME} PRIVATE -O3) #enable optimization for linux debug
9191

92-
install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${GUI_BIN_DIR}/plugins-api9)
92+
install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${GUI_BIN_DIR}/plugins-api10)
9393
elseif(APPLE)
9494
set_target_properties(${PLUGIN_NAME} PROPERTIES BUNDLE TRUE)
9595
set_property(TARGET ${PLUGIN_NAME} APPEND_STRING PROPERTY LINK_FLAGS
96-
"-undefined dynamic_lookup -rpath @loader_path/../../../../shared-api9")
96+
"-undefined dynamic_lookup -rpath @loader_path/../../../../shared-api10")
9797

98-
install(TARGETS ${PLUGIN_NAME} DESTINATION $ENV{HOME}/Library/Application\ Support/open-ephys/plugins-api9)
98+
install(TARGETS ${PLUGIN_NAME} DESTINATION $ENV{HOME}/Library/Application\ Support/open-ephys/plugins-api10)
9999
set(CMAKE_PREFIX_PATH /opt/local)
100100
endif()
101101

Resources/API/OEClient.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
while ~self.connected && attempts < self.MAX_CONNECT_ATTEMPTS
4040
self.connect(host,port);
4141
attempts = attempts + 1;
42+
pause(2)
4243
end
4344

4445
if ~self.connected

Source/MatlabInterfaceEditor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ MatlabInterfaceEditor::MatlabInterfaceEditor(MatlabInterface* parentNode)
6969

7070
addTextBoxParameterEditor(Parameter::PROCESSOR_SCOPE, "port_number", 15, 54);
7171

72-
connectButton = std::make_unique<UtilityButton>("Connect", Font("Small Text", 13, Font::bold));
72+
connectButton = std::make_unique<UtilityButton>("Connect");
7373
connectButton->setRadius(3.0f);
7474
connectButton->setBounds(15, 79, 90, 20);
7575
connectButton->addListener(this);

0 commit comments

Comments
 (0)