added changes for OFv0.11.2 compatibility

[nitin710]

Description

Requirements

See standard dependencies: https://github.com/EmotiBit/ofxEmotiBit/blob/master/README.md#the-following-script-may-be-run-from-a-bash-shell-within-your-openframeworksaddons-directory-to-install-ofxemotibit-and-all-dependencies

• https://github.com/EmotiBit/ofxLSL/pull/11

Issues Referenced

• fixes #216

Documentation update

none

Notes for Reviewer

• Needed to initialize vector guiPanels to avoid unique_ptr double delete error

Testing

• ✅ EmotiBitOscilloscope runs on windows
• ✅ EmotiBitDataParser runs on windows
• ✅ EmotiBitFirmwareInstaller still runs on windows (worked without mod on OF v0.11.2)
• ✅ EmotiBitOscilloscope runs on mac (intel mac, Mojave)
• ✅ EmotiBitDataParser runs on mac (intel mac, Mojave)
• ✅ EmotiBitFirmwareInstaller still runs on mac (intel mac, Mojave)
• ✅ EmotiBitOscilloscope runs on linux
• ✅ EmotiBitDataParser runs on linux
• ✅ EmotiBitFirmwareInstaller still runs on linux

Feature Tests

Non

Steps to test

Build & run

Shared files

None

Checklist to allow merge

• [ ] All dependent repositories used were on branch master
• Software
  • [ ] Get approval from the reviewer
  • [ ] Passed testing on Windows
  • [ ] Passed testing on macOS (for major changes/GUI changes/ PRs adding files distributed with the EmotiBit software)
  • [ ] Passed testing on linux (ubuntu) (for major changes/GUI changes/ PRs adding files distributed with the EmotiBit software)
  • [ ] Update software bundle version in ofxEmotiBitVersion.h
• Firmware
  • [ ] Set testingMode to TestingMode::NONE
  • [ ] Set const bool DIGITAL_WRITE_DEBUG = false (if set true while testing)
  • [ ] Update version in EmotiBit.h
  • [ ] Update library.properties to the correct version (should match EmotiBit.h)
• [ ] doxygen style comments included for new code snippets
• [ ] Required documentation updated

Screenshots:

[nitin710]

Compatibility matrix

OF version	EmotiBit codebase	ofxLSL	xcode proj file	Windows	linux	macos intel	macos-apple-silicon
v0.11.0	master	master	-	✔️	✔️	✔️	❌
v0.11.2	master	master	-	❌	❌	❌	❌
v0.11.2	fix-OFv0.11.2_2	master	updated link to fmod.lib	✔️	✔️	✔️	❌
v0.11.2	fix-OFv0.11.2_2	+new dylib for Apple silicon mac	updated link to fmod.lib	✔️	✔️	✔️	✔️

Key changes

Changes to codebase

• Code changes (in Dataparser and Oscilloscope)
  • https://github.com/EmotiBit/ofxEmotiBit/blob/31dd38e375cb4c1223ddb7d2a2712c60cfc6d67d/EmotiBitOscilloscope/src/ofApp.h#L268
  • https://github.com/EmotiBit/ofxEmotiBit/blob/31dd38e375cb4c1223ddb7d2a2712c60cfc6d67d/EmotiBitOscilloscope/src/ofApp.cpp#L1253C25-L1253C25

Proposed plan

After reviewing the comments in #216, the following plan can be used to merge this PR

1. Use an apple silicon based mac to create a new dylib package (binary) for apple silicon architecture based macs
2. we can add this new binary to ofxLSL according to the structure shown below

   ofxLSL
   ├── libs
   │   └── labstreaminglayer
   │       └── lib
   │           └── osx
   │               └── intel-macs
   │               │       └── liblsl.1.14.0.dylib (compiled using intel mac)
   │               └── apple-silicon-macs
   │                        └── liblsl.1.14.0.dylib (compiled using M1 mac)

3. We update the readme, that cleary states which file path to select in the project file(xcode), to build from source for intel vs apple silicon

[nitin710]

discussion notes

• Alternate approach
  • Have 2 dylib files but add a #define to the apple project to remove hassle for users to change it manually
  • Change the name of the files to reflect difference and use a #define int he project file to choose the right file

[nitin710]

not compiling on intel macs. Looks like the project file lists ofxLSL/**/osx/** as a path for dylib files and according to file structure, it encounters arm/lsl.dylib first, which gives compile errors saying "lib for wrong platform".

[nitin710]

Build status matrix

mac type	xcode run	debug application	release application	Notes
x86_64	✔️	✔️	✔️	Change dylib search path to x86_64
arm64	✔️	✔️	✔️ (Had to change project file: build settings > build for active architecture only > Release > Yes )	See individual notes

[nitin710]

Changes that need addressing

change	arm64	x86_64
dylib search path	OFlsl/**/lib/osx/** ✔️	❌ needs to be OFlsl/**/lib/osx/x86_64
build settings > build for active architecture only	Release > Yes	currently: Release > No. I don't suspect anything breaks if we change it to Yes. We can confirm this in deploy system tests. It should work on all x86 systems, and all arm systems will use rosetta 2 to translate

[nitin710]

How is libfmod.dylib handled in the Openframeworks?

[nitin710]

The dev branch has been merged into master that resolves OF 0.11.2

This PR has inter-mixed OF-11.2 and building on apple silicon macs. It is therefore being closed since some changes already exist in the master. A new PR will be created that focuses solely on the apple silicon compatibility.