diff --git a/.github/workflows/build-all-on-linux.yaml b/.github/workflows/build-all-on-linux.yaml
new file mode 100644
index 0000000..e39e8fa
--- /dev/null
+++ b/.github/workflows/build-all-on-linux.yaml
@@ -0,0 +1,45 @@
+name: Build all on linux
+on: [push]
+jobs:
+ clone-to-OF_ROOT:
+ runs-on: [self-hosted, Linux]
+ environment: RUNNER-LINUX
+ steps:
+ - name: remove existing clone
+ working-directory: ${{ vars.ADDONS_DIR }}
+ run: |
+ pwd
+ #echo "the commit that dispatched this job-- ${GITHUB_SHA}"
+ if [ -d ofxEmotiBit ]; then
+ echo "Directory exists."
+ rm -rf ofxEmotiBit
+ echo "clone removed"
+ else
+ echo "Directory does not already exist"
+ fi
+ - name: checkout repository
+ uses: actions/checkout@v4
+ - name: move fresh clone to OF_ROOT
+ run: cp -r ../$(echo ${{ github.repository }} | cut -d '/' -f 2) ${{ vars.ADDONS_DIR }}
+ build-oscilloscope:
+ needs: clone-to-OF_ROOT
+ runs-on: [self-hosted, Linux]
+ environment: RUNNER-LINUX
+ steps:
+ - name: build using make
+ working-directory: ${{ vars.OFXEMOTIBIT_DIR }}
+ run: |
+ echo "current working directory" && pwd
+ cd EmotiBitOscilloscope
+ make
+ build-dataparser:
+ needs: clone-to-OF_ROOT
+ runs-on: [self-hosted, Linux]
+ environment: RUNNER-LINUX
+ steps:
+ - name: build using make
+ working-directory: ${{ vars.OFXEMOTIBIT_DIR }}
+ run: |
+ echo "current working directory" && pwd
+ cd EmotiBitDataParser
+ make
diff --git a/.github/workflows/build-all-on-macos.yml b/.github/workflows/build-all-on-macos.yml
new file mode 100644
index 0000000..da0f9a3
--- /dev/null
+++ b/.github/workflows/build-all-on-macos.yml
@@ -0,0 +1,56 @@
+name: Build all on macos
+on: [push]
+jobs:
+ clone-to-OF_ROOT:
+ runs-on: [self-hosted, macOS]
+ environment: RUNNER-MACOS
+ steps:
+ - name: remove existing clone
+ working-directory: ${{ vars.ADDONS_DIR }}
+ run: |
+ pwd
+ #echo "the commit that dispatched this job-- ${GITHUB_SHA}"
+ if [ -d ofxEmotiBit ]; then
+ echo "Directory exists."
+ rm -rf ofxEmotiBit
+ echo "clone removed"
+ else
+ echo "Directory does not already exist"
+ fi
+ - name: checkout repository
+ uses: actions/checkout@v4
+ - name: move fresh clone to OF_ROOT
+ run: cp -r ../$(echo ${{ github.repository }} | cut -d '/' -f 2) ${{ vars.ADDONS_DIR }}
+ build-oscilloscope:
+ needs: clone-to-OF_ROOT
+ runs-on: [self-hosted, macOS]
+ environment: RUNNER-MACOS
+ steps:
+ - name: build using xcode
+ working-directory: ${{ vars.OFXEMOTIBIT_DIR }}
+ run: |
+ echo "current working directory" && pwd
+ cd EmotiBitOscilloscope
+ xcodebuild -project EmotiBitOscilloscope.xcodeproj -scheme Release-x86_64
+ build-dataparser:
+ needs: clone-to-OF_ROOT
+ runs-on: [self-hosted, macOS]
+ environment: RUNNER-MACOS
+ steps:
+ - name: build using xcode
+ working-directory: ${{ vars.OFXEMOTIBIT_DIR }}
+ run: |
+ echo "current working directory" && pwd
+ cd EmotiBitDataParser
+ xcodebuild -project EmotiBitDataParser.xcodeproj -scheme Release
+ build-firmwareinstaller:
+ needs: clone-to-OF_ROOT
+ runs-on: [self-hosted, macOS]
+ environment: RUNNER-MACOS
+ steps:
+ - name: build using xcode
+ working-directory: ${{ vars.OFXEMOTIBIT_DIR }}
+ run: |
+ echo "current working directory" && pwd
+ cd EmotiBitFirmwareInstaller
+ xcodebuild -project EmotiBitFirmwareInstaller.xcodeproj -scheme Release
diff --git a/.github/workflows/build-all-on-win.yaml b/.github/workflows/build-all-on-win.yaml
new file mode 100644
index 0000000..ab33212
--- /dev/null
+++ b/.github/workflows/build-all-on-win.yaml
@@ -0,0 +1,63 @@
+name: Build all on Windows
+on: [push]
+jobs:
+ clone-to-OF_ROOT:
+ runs-on: [self-hosted, Windows]
+ environment: RUNNER-WINDOWS
+ steps:
+ - name: remove existing clone
+ shell: bash
+ working-directory: ${{ vars.ADDONS_DIR }}
+ run: |
+ pwd
+ #echo "the commit that dispatched this job-- ${GITHUB_SHA}"
+ if [ -d ofxEmotiBit ]; then
+ echo "Directory exists."
+ rm -rf ofxEmotiBit
+ echo "clone removed"
+ else
+ echo "Directory does not already exist"
+ fi
+ - name: checkout repository
+ uses: actions/checkout@v4
+ - name: move fresh clone to OF_ROOT
+ shell: bash
+ run: |
+ echo ${{ github.repository }} | cut -d '/' -f 2
+ cp -r ..\\$(echo ${{ github.repository }} | cut -d '/' -f 2) ${{ vars.ADDONS_DIR }}
+ build-oscilloscope:
+ needs: clone-to-OF_ROOT
+ runs-on: [self-hosted, Windows]
+ environment: RUNNER-WINDOWS
+ steps:
+ - name: build using MSBuild
+ shell: cmd
+ working-directory: ${{ vars.OFXEMOTIBIT_DIR }}
+ run: |
+ echo "current working directory" && pwd
+ cd EmotiBitOscilloscope
+ MSBuild EmotiBitOscilloscope.sln -t:Build -p:Configuration=Release
+ build-dataparser:
+ needs: clone-to-OF_ROOT
+ runs-on: [self-hosted, Windows]
+ environment: RUNNER-WINDOWS
+ steps:
+ - name: build using MSBuild
+ shell: cmd
+ working-directory: ${{ vars.OFXEMOTIBIT_DIR }}
+ run: |
+ echo "current working directory" && pwd
+ cd EmotiBitDataParser
+ MSBuild EmotiBitDataParser.sln -t:Build -p:Configuration=Release
+ build-firmwareinstaller:
+ needs: clone-to-OF_ROOT
+ runs-on: [self-hosted, Windows]
+ environment: RUNNER-WINDOWS
+ steps:
+ - name: build using MSBuild
+ shell: cmd
+ working-directory: ${{ vars.OFXEMOTIBIT_DIR }}
+ run: |
+ echo "current working directory" && pwd
+ cd EmotiBitFirmwareInstaller
+ MSBuild EmotiBitFirmwareInstaller.sln -t:Build -p:Configuration=Release
\ No newline at end of file
diff --git a/.github/workflows/upload-build-artifact-mac.yml b/.github/workflows/upload-build-artifact-mac.yml
new file mode 100644
index 0000000..017bf88
--- /dev/null
+++ b/.github/workflows/upload-build-artifact-mac.yml
@@ -0,0 +1,27 @@
+name: upload build artifact mac
+on:
+ workflow_run:
+ workflows: ["Build all on macos"]
+ types:
+ - completed
+ branches:
+ [dev]
+jobs:
+ upload-artifact:
+ runs-on: [self-hosted, macOS]
+ environment: RUNNER-MACOS
+ steps:
+ - name: create stage-release
+ working-directory: ${{ vars.OFXEMOTIBIT_DIR }}
+ run: mkdir -p stageRelease/EmotiBitSoftware-macos
+ - name: populate stage release
+ working-directory: ${{ vars.OFXEMOTIBIT_DIR }}
+ run: |
+ mv EmotiBitOscilloscope/bin/EmotiBitOscilloscope.app stageRelease/EmotiBitSoftware-macos
+ mv EmotiBitDataParser/bin/EmotiBitDataParser.app stageRelease/EmotiBitSoftware-macos
+ mv EmotiBitFirmwareInstaller/bin/EmotiBitFirmwareInstaller.app stageRelease/EmotiBitSoftware-macos
+ - name: upload artifact
+ uses: actions/upload-artifact@v4
+ with:
+ name: EmotiBitSoftware-macos
+ path: ${{ vars.OFXEMOTIBIT_DIR }}/stageRelease/EmotiBitSoftware-macos/
diff --git a/.github/workflows/upload-build-artifact-win.yml b/.github/workflows/upload-build-artifact-win.yml
new file mode 100644
index 0000000..61bfb20
--- /dev/null
+++ b/.github/workflows/upload-build-artifact-win.yml
@@ -0,0 +1,62 @@
+name: upload build artifact Windows
+on:
+
+ #workflow_dispatch:
+ workflow_run:
+ workflows: ["Build all on Windows"]
+ types:
+ - completed
+ branches:
+ [dev]
+jobs:
+ build-installer:
+ runs-on: [self-hosted, Windows]
+ environment: RUNNER-WINDOWS
+ steps:
+ - name: build installer project
+ shell: cmd
+ working-directory: ${{ vars.OFXEMOTIBIT_DIR }}
+ run: |
+ cd EmotiBitInstaller
+ devenv EmotiBitInstaller.sln /Build Release
+
+ upload-artifact:
+ needs: build-installer
+ runs-on: [self-hosted, Windows]
+ environment: RUNNER-WINDOWS
+ steps:
+ - name: create stage-release
+ shell: bash
+ working-directory: ${{ vars.OFXEMOTIBIT_DIR }}
+ run: mkdir -p stageRelease/EmotiBitSoftware-Windows
+ - name: populate stage release
+ shell: bash
+ working-directory: ${{ vars.OFXEMOTIBIT_DIR }}
+ run: |
+ msiInstPath=./EmotiBitInstaller/EmotiBitInstaller/Release/EmotiBitInstaller.msi
+ setupPath=./EmotiBitInstaller/EmotiBitInstaller/Release/setup.exe
+ silabsDriverPath=../../../drivers/CP210x_Windows_Drivers
+ releaseFolder="EmotiBitSoftware-Windows"
+ version=$(grep ./src/ofxEmotiBitVersion.h -e "string ofxEmotiBitVersion" | cut -d '"' -f 2)
+ echo "Staging release for version: $version"
+
+ if [ -f "$msiInstPath" ] || [ -f "$setupPath" ]; then
+ echo "msi and exe files found!"
+ echo "staging release"
+ echo "copying installer files"
+ cp "$msiInstPath" "./stageRelease/$releaseFolder"
+ cp "$setupPath" "./stageRelease/$releaseFolder"
+ for i in $(find ../../../drivers -maxdepth 1 -mindepth 1 -name '*CP210x*' -type d); do
+ dirname=$(basename "$i")
+ worktree="../../../drivers/$dirname"
+ echo "copying $dirname"
+ cp -r "$worktree" "./stageRelease/$releaseFolder"
+ done
+ else
+ echo "installer files not found! Create installer!"
+ fi
+ - name: upload artifact
+ uses: actions/upload-artifact@v4
+ with:
+ name: EmotiBitSoftware-Windows
+ path: ${{ vars.OFXEMOTIBIT_DIR }}\\stageRelease\\EmotiBitSoftware-Windows
diff --git a/EmotiBitDataParser/EmotiBitDataParser.vcxproj b/EmotiBitDataParser/EmotiBitDataParser.vcxproj
index d6f0836..ad6011d 100644
--- a/EmotiBitDataParser/EmotiBitDataParser.vcxproj
+++ b/EmotiBitDataParser/EmotiBitDataParser.vcxproj
@@ -105,10 +105,6 @@
-
-
-
-
@@ -119,21 +115,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -143,12 +125,6 @@
-
-
-
-
-
-
@@ -162,23 +138,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/EmotiBitDataParser/EmotiBitDataParser.vcxproj.filters b/EmotiBitDataParser/EmotiBitDataParser.vcxproj.filters
index 0c90ae9..a27ea50 100644
--- a/EmotiBitDataParser/EmotiBitDataParser.vcxproj.filters
+++ b/EmotiBitDataParser/EmotiBitDataParser.vcxproj.filters
@@ -13,18 +13,6 @@
src
-
- addons\ofxBiquadFilter\src
-
-
- addons\ofxBiquadFilter\src
-
-
- addons\ofxEmotiBit\src
-
-
- addons\ofxEmotiBit\src
-
addons\ofxGui\src
@@ -55,51 +43,9 @@
addons\ofxGui\src
-
- addons\ofxNetwork\src
-
-
- addons\ofxNetwork\src
-
-
- addons\ofxNetwork\src
-
-
- addons\ofxNetwork\src
-
-
- addons\ofxNetwork\src
-
-
- addons\ofxPoco\src
-
-
- addons\ofxNetworkUtils\libs\ofxNetworkUtils\src
-
-
- addons\ofxNetworkUtils\libs\ofxNetworkUtils\src
-
-
- addons\ofxNetworkUtils\libs\ofxNetworkUtils\src
-
-
- addons\ofxOscilloscope\src
-
addons\ofxThreadedLogger\src
-
- addons\ofxXmlSettings\src
-
-
- addons\ofxXmlSettings\libs
-
-
- addons\ofxXmlSettings\libs
-
-
- addons\ofxXmlSettings\libs
-
src\EmotiBit_XPlat_Utils\src
@@ -117,12 +63,6 @@
{71834F65-F3A9-211E-73B8-DC85}
-
- {722AA280-224B-6677-0333-080D}
-
-
- {6A1697DC-957E-5FD0-4C2B-394F}
-
{D5BAEE0B-17C8-94EC-18FD-28FF}
@@ -135,63 +75,12 @@
{645E9533-4DCD-6179-1CDF-CB65}
-
- {01A15744-29A6-108D-08E9-83A7}
-
-
- {3D1C10C7-8F35-E796-9C70-F5F3}
-
-
- {3256AE3E-9B29-EA27-C842-CE6B}
-
-
- {C7D4269D-D8A9-A7BB-531B-98DA}
-
-
- {70602827-0B05-E0AB-D576-41B5}
-
-
- {2CEAFECC-CC03-CFEC-AD86-E0B8}
-
-
- {70900355-8B0B-5038-EE2C-607E}
-
-
- {9B0998B0-859D-7FAF-E7E3-357F}
-
-
- {0D08502A-641D-DA92-1520-1AF4}
-
-
- {FB36A9AF-C5D5-2D1A-6465-8E8C}
-
-
- {F6603996-7AC9-0971-4D3A-9F4B}
-
-
- {C86DFC67-EF96-D121-C612-E620}
-
-
- {CB6C7742-41F7-9C67-52CA-71E8}
-
-
- {BBA04344-3B3C-EEBB-B886-25E4}
-
{832094C4-8614-2B4B-A60F-4240}
{CA068CB5-A638-66AF-AE6A-1CDD}
-
- {877F005D-13E6-0592-1D97-F2E3}
-
-
- {CCB2AC63-49D2-977C-CFE8-AEAD}
-
-
- {687714A8-1662-FA1C-261F-50F0}
-
{65278f89-1de8-4349-b6a2-67608b3cc543}
@@ -227,24 +116,6 @@
src
-
- addons\ofxBiquadFilter\src
-
-
- addons\ofxBiquadFilter\src
-
-
- addons\ofxEmotiBit\src
-
-
- addons\ofxEmotiBit\src
-
-
- addons\ofxEmotiBit\src
-
-
- addons\ofxEmotiBit\src
-
addons\ofxEmotiBit\src
@@ -284,57 +155,9 @@
addons\ofxGui\src
-
- addons\ofxNetwork\src
-
-
- addons\ofxNetwork\src
-
-
- addons\ofxNetwork\src
-
-
- addons\ofxNetwork\src
-
-
- addons\ofxNetwork\src
-
-
- addons\ofxNetwork\src
-
-
- addons\ofxNetwork\src
-
-
- addons\ofxNetwork\src
-
-
- addons\ofxPoco\src
-
-
- addons\ofxNetworkUtils\src
-
-
- addons\ofxNetworkUtils\libs\ofxNetworkUtils\include\ofx\Net
-
-
- addons\ofxNetworkUtils\libs\ofxNetworkUtils\include\ofx\Net
-
-
- addons\ofxNetworkUtils\libs\ofxNetworkUtils\include\ofx\Net
-
-
- addons\ofxOscilloscope\src
-
addons\ofxThreadedLogger\src
-
- addons\ofxXmlSettings\src
-
-
- addons\ofxXmlSettings\libs
-
src\EmotiBit_XPlat_Utils\src
diff --git a/EmotiBitDataParser/EmotiBitDataParser.xcodeproj/project.pbxproj b/EmotiBitDataParser/EmotiBitDataParser.xcodeproj/project.pbxproj
index 7107701..d995d19 100644
--- a/EmotiBitDataParser/EmotiBitDataParser.xcodeproj/project.pbxproj
+++ b/EmotiBitDataParser/EmotiBitDataParser.xcodeproj/project.pbxproj
@@ -7,37 +7,20 @@
objects = {
/* Begin PBXBuildFile section */
- 02FA22EAD4CE81F39CC58EEA /* Periodizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CA65A234F6CABD350A1BA57 /* Periodizer.cpp */; };
- 125506CD3E5F428AAFE5CC65 /* ofxTCPManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F399B91E98DC31CDA6DDACB4 /* ofxTCPManager.cpp */; };
- 1C36947250DCB09A8A375C0C /* ofxXmlPoco.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9998694E5001F9CF0B13BF0 /* ofxXmlPoco.cpp */; };
1CD33E884D9E3358252E82A1 /* ofxToggle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 907C5B5E104864A2D3A25745 /* ofxToggle.cpp */; };
483908258D00B98B4BE69F07 /* ofxLabel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78D67A00EB899FAC09430597 /* ofxLabel.cpp */; };
- 5A4349E9754D6FA14C0F2A3A /* tinyxmlparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FC5DA1C87211D4F6377DA719 /* tinyxmlparser.cpp */; };
5CBB2AB3A60F65431D7B555D /* ofxButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C88333E71C9457E441C33474 /* ofxButton.cpp */; };
- 5CE4E12FF3BBF9B3E2A42B3D /* SoftwareVersionChecker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9B3B69F1411454D188127C4E /* SoftwareVersionChecker.cpp */; };
- 633AFFDB4EC6674D34F0EF7D /* IPAddressRange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2FA5A4362497FA77DF9B5A19 /* IPAddressRange.cpp */; };
- 63B57AC5BF4EF088491E0317 /* ofxXmlSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50DF87D612C5AAE17AAFA6C0 /* ofxXmlSettings.cpp */; };
- 661A1991F5CE4CCC2919D8E7 /* ofxNetworkUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AE30B18B42BAF0E92CB140E5 /* ofxNetworkUtils.cpp */; };
- 66CA411C5A9664E27326BF36 /* ofxTCPServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C085E327DAB912CFA2A443D /* ofxTCPServer.cpp */; };
- 69AF35586CA18EA57C5CFCD3 /* NetworkUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B557FD8519CC0900FAB1DCA2 /* NetworkUtils.cpp */; };
837220E80EB56CD44AD27F2A /* ofxSlider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15F2C6477A769C03A56D1401 /* ofxSlider.cpp */; };
852E0891794923EE7583C621 /* ofxInputField.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 44B351490B620D04E1E7C52D /* ofxInputField.cpp */; };
853E0BA2F448076739446874 /* ofxColorPicker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 181D363B6DD54D1FA6309C43 /* ofxColorPicker.cpp */; };
856AA354D08AB4B323081444 /* ofxBaseGui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9604B925D32EE39065747725 /* ofxBaseGui.cpp */; };
- 933A2227713C720CEFF80FD9 /* tinyxml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B40EDA85BEB63E46785BC29 /* tinyxml.cpp */; };
- 960D20B191346612D5C05A6A /* ofxTCPClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BF88F02779DD820913ACEA06 /* ofxTCPClient.cpp */; };
+ 8E80A3682CCDAE9300C65119 /* EmotiBitPacket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E80A3672CCDAE9300C65119 /* EmotiBitPacket.cpp */; };
9CA591B9A40F2386FE099328 /* ofxThreadedLogger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D6D75E57C2EB53518090D07A /* ofxThreadedLogger.cpp */; };
- 9D44DC88EF9E7991B4A09951 /* tinyxmlerror.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 832BDC407620CDBA568B713D /* tinyxmlerror.cpp */; };
- AEAE7BD10A06519AE832EC52 /* ofxNetworkUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14A43221DDD441A2AC353651 /* ofxNetworkUtils.cpp */; };
B266578FC55D23BFEBC042E7 /* ofxGuiGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECF8674C7975F1063C5E30CA /* ofxGuiGroup.cpp */; };
B56FE57CC35806596D38118C /* ofxSliderGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 802251BAF1B35B1D67B32FD0 /* ofxSliderGroup.cpp */; };
- B65D7C8C591DF95D595E2053 /* NetworkInterfaceListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 44D29F961AB993B629D7C467 /* NetworkInterfaceListener.cpp */; };
- B990E6152C17F4E60094B63E /* EmotiBitPacket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B990E6142C17F4E60094B63E /* EmotiBitPacket.cpp */; };
B990E61C2C1CAB040094B63E /* parsedDataFormat.json in Copy Resources */ = {isa = PBXBuildFile; fileRef = B990E61A2C1CAB040094B63E /* parsedDataFormat.json */; };
B990E61D2C1CAB040094B63E /* verdana.ttf in Copy Resources */ = {isa = PBXBuildFile; fileRef = B990E61B2C1CAB040094B63E /* verdana.ttf */; };
BEDFEE7400C58EA4E412B757 /* ofxJSONElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F2B099E6BD1199664C48B177 /* ofxJSONElement.cpp */; };
- D1E529D7B6961183405926CF /* EmotiBitOfUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0BDE549108B6A79D110451A5 /* EmotiBitOfUtils.cpp */; };
- E2564CF7DDB3713772BB682E /* ofxUDPManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 35BB9BB90DBABFD3B39F8DB6 /* ofxUDPManager.cpp */; };
E4B69E200A3A1BDC003C02F2 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4B69E1D0A3A1BDC003C02F2 /* main.cpp */; };
E4B69E210A3A1BDC003C02F2 /* ofApp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4B69E1E0A3A1BDC003C02F2 /* ofApp.cpp */; };
F285EB3169F1566CA3D93C20 /* ofxPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E112B3AEBEA2C091BF2B40AE /* ofxPanel.cpp */; };
@@ -69,140 +52,37 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
- 01DCC0911400F9ACF5B65578 /* ofxXmlSettings.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxXmlSettings.h; path = ../../../addons/ofxXmlSettings/src/ofxXmlSettings.h; sourceTree = SOURCE_ROOT; };
- 04C68EFF05480545A9A374D9 /* SoftwareVersionChecker.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = SoftwareVersionChecker.h; path = ../../../addons/ofxEmotiBit/src/SoftwareVersionChecker.h; sourceTree = SOURCE_ROOT; };
0A1DAC09F322AE313A40706D /* ofxToggle.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxToggle.h; path = ../../../addons/ofxGui/src/ofxToggle.h; sourceTree = SOURCE_ROOT; };
- 0B26945A52EE3207EE20D083 /* buffer.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = buffer.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/buffer.h; sourceTree = SOURCE_ROOT; };
- 0BDE549108B6A79D110451A5 /* EmotiBitOfUtils.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = EmotiBitOfUtils.cpp; path = ../../../addons/ofxEmotiBit/src/EmotiBitOfUtils.cpp; sourceTree = SOURCE_ROOT; };
- 0ED9E7E17E11365C9F07BC90 /* symhacks.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = symhacks.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/symhacks.h; sourceTree = SOURCE_ROOT; };
- 101E00135DD5F4A88AA3119E /* rc2.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = rc2.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/rc2.h; sourceTree = SOURCE_ROOT; };
- 14A43221DDD441A2AC353651 /* ofxNetworkUtils.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = ofxNetworkUtils.cpp; path = ../../../addons/ofxNetworkUtils/src/ofxNetworkUtils.cpp; sourceTree = SOURCE_ROOT; };
15F2C6477A769C03A56D1401 /* ofxSlider.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = ofxSlider.cpp; path = ../../../addons/ofxGui/src/ofxSlider.cpp; sourceTree = SOURCE_ROOT; };
- 163ABB7F5E22B6A0ECF51B07 /* ofxTCPSettings.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxTCPSettings.h; path = ../../../addons/ofxNetwork/src/ofxTCPSettings.h; sourceTree = SOURCE_ROOT; };
1645F56257269CD0356320BD /* ofxJSON.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxJSON.h; path = ../../../addons/ofxJSON/src/ofxJSON.h; sourceTree = SOURCE_ROOT; };
- 16D8E1844A44453A0C287E72 /* ssl.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ssl.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/ssl.h; sourceTree = SOURCE_ROOT; };
- 17006150745E007FA32014F5 /* modes.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = modes.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/modes.h; sourceTree = SOURCE_ROOT; };
17E65988300FBD9AAA2CD0CA /* ofxGui.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxGui.h; path = ../../../addons/ofxGui/src/ofxGui.h; sourceTree = SOURCE_ROOT; };
181D363B6DD54D1FA6309C43 /* ofxColorPicker.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = ofxColorPicker.cpp; path = ../../../addons/ofxGui/src/ofxColorPicker.cpp; sourceTree = SOURCE_ROOT; };
- 1AEDCF9A6D7A9C81A1FFFB82 /* cmac.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = cmac.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/cmac.h; sourceTree = SOURCE_ROOT; };
- 1C085E327DAB912CFA2A443D /* ofxTCPServer.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = ofxTCPServer.cpp; path = ../../../addons/ofxNetwork/src/ofxTCPServer.cpp; sourceTree = SOURCE_ROOT; };
- 1C0972A2A90100E10C49938E /* rsa.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = rsa.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/rsa.h; sourceTree = SOURCE_ROOT; };
1C0DA2561397A7DE0246858B /* ofxGuiGroup.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxGuiGroup.h; path = ../../../addons/ofxGui/src/ofxGuiGroup.h; sourceTree = SOURCE_ROOT; };
- 1D548216CC2978215BFDAC85 /* engine.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = engine.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/engine.h; sourceTree = SOURCE_ROOT; };
- 1DFA26F2C6BBD1B8AC24C0B1 /* ofxNetworkUtils.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxNetworkUtils.h; path = ../../../addons/ofxNetwork/src/ofxNetworkUtils.h; sourceTree = SOURCE_ROOT; };
21BDE665988474F1B1F4D302 /* jsoncpp.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = jsoncpp.cpp; path = ../../../addons/ofxJSON/libs/jsoncpp/src/jsoncpp.cpp; sourceTree = SOURCE_ROOT; };
26A541233BC6F736E758F718 /* ofxJSONElement.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxJSONElement.h; path = ../../../addons/ofxJSON/src/ofxJSONElement.h; sourceTree = SOURCE_ROOT; };
- 26EF3E71A07C6948EAF6709E /* ofxTCPManager.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxTCPManager.h; path = ../../../addons/ofxNetwork/src/ofxTCPManager.h; sourceTree = SOURCE_ROOT; };
- 26FD7792D0FC0533A46C4B0D /* comp.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = comp.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/comp.h; sourceTree = SOURCE_ROOT; };
2834D88A62CD23F3DE2C47D1 /* ofxButton.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxButton.h; path = ../../../addons/ofxGui/src/ofxButton.h; sourceTree = SOURCE_ROOT; };
- 2A20F45E8472AF83015D687B /* ec.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ec.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/ec.h; sourceTree = SOURCE_ROOT; };
- 2A61AA76A834926F81F48ADC /* async.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = async.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/async.h; sourceTree = SOURCE_ROOT; };
- 2A8E6EE70DD635A657EEEC99 /* x509v3.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = x509v3.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/x509v3.h; sourceTree = SOURCE_ROOT; };
- 2B40EDA85BEB63E46785BC29 /* tinyxml.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = tinyxml.cpp; path = ../../../addons/ofxXmlSettings/libs/tinyxml.cpp; sourceTree = SOURCE_ROOT; };
- 2BE946CC0D0FAFAFB318D357 /* NetworkUtils.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = NetworkUtils.h; path = ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include/ofx/Net/NetworkUtils.h; sourceTree = SOURCE_ROOT; };
2C7CF000B7B4F782C187C353 /* json.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = json.h; path = ../../../addons/ofxJSON/libs/jsoncpp/include/json/json.h; sourceTree = SOURCE_ROOT; };
- 2D45A496EFB9F361A92C1F2A /* ct.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ct.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/ct.h; sourceTree = SOURCE_ROOT; };
- 2F519EB3B0DCD7378FB86ABE /* ofxUDPManager.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxUDPManager.h; path = ../../../addons/ofxNetwork/src/ofxUDPManager.h; sourceTree = SOURCE_ROOT; };
- 2FA5A4362497FA77DF9B5A19 /* IPAddressRange.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = IPAddressRange.cpp; path = ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/src/IPAddressRange.cpp; sourceTree = SOURCE_ROOT; };
- 30841703B7AC8487D16FB4AA /* ofxTCPServer.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxTCPServer.h; path = ../../../addons/ofxNetwork/src/ofxTCPServer.h; sourceTree = SOURCE_ROOT; };
- 3196BB02FD710583AD1E8682 /* opensslconf_osx.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = opensslconf_osx.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/opensslconf_osx.h; sourceTree = SOURCE_ROOT; };
- 355218D9B12A28AD4F099029 /* txt_db.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = txt_db.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/txt_db.h; sourceTree = SOURCE_ROOT; };
- 35BB9BB90DBABFD3B39F8DB6 /* ofxUDPManager.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = ofxUDPManager.cpp; path = ../../../addons/ofxNetwork/src/ofxUDPManager.cpp; sourceTree = SOURCE_ROOT; };
- 37A00AAE55CA7B437073B0C9 /* bio.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = bio.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/bio.h; sourceTree = SOURCE_ROOT; };
- 3F9F5D5E3A4CDE45682F38E2 /* sha.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = sha.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/sha.h; sourceTree = SOURCE_ROOT; };
- 3FED4C887C37A3FD70D004E8 /* ui.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ui.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/ui.h; sourceTree = SOURCE_ROOT; };
- 40F8AFFCAB8F69A35DA9FD2A /* ssl3.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ssl3.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/ssl3.h; sourceTree = SOURCE_ROOT; };
- 413E48C985AFC06586413FB9 /* pkcs7.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = pkcs7.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/pkcs7.h; sourceTree = SOURCE_ROOT; };
44B351490B620D04E1E7C52D /* ofxInputField.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = ofxInputField.cpp; path = ../../../addons/ofxGui/src/ofxInputField.cpp; sourceTree = SOURCE_ROOT; };
- 44D29F961AB993B629D7C467 /* NetworkInterfaceListener.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = NetworkInterfaceListener.cpp; path = ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/src/NetworkInterfaceListener.cpp; sourceTree = SOURCE_ROOT; };
- 452AF016D8E68676D45A9498 /* EmotiBitOfUtils.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = EmotiBitOfUtils.h; path = ../../../addons/ofxEmotiBit/src/EmotiBitOfUtils.h; sourceTree = SOURCE_ROOT; };
- 4882CC26D63610292CFADBE9 /* cms.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = cms.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/cms.h; sourceTree = SOURCE_ROOT; };
489B196944B06ADC2A071076 /* ofxColorPicker.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxColorPicker.h; path = ../../../addons/ofxGui/src/ofxColorPicker.h; sourceTree = SOURCE_ROOT; };
- 490DE03DA72EE341B37B4BBB /* conf_api.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = conf_api.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/conf_api.h; sourceTree = SOURCE_ROOT; };
- 4A941E617512F1E87E294653 /* x509_vfy.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = x509_vfy.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/x509_vfy.h; sourceTree = SOURCE_ROOT; };
- 4BF97AC133A743F7D2E222B6 /* bn.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = bn.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/bn.h; sourceTree = SOURCE_ROOT; };
- 50DF87D612C5AAE17AAFA6C0 /* ofxXmlSettings.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = ofxXmlSettings.cpp; path = ../../../addons/ofxXmlSettings/src/ofxXmlSettings.cpp; sourceTree = SOURCE_ROOT; };
52AFA1F08C420992CAAAE648 /* ofxSlider.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxSlider.h; path = ../../../addons/ofxGui/src/ofxSlider.h; sourceTree = SOURCE_ROOT; };
- 53849B4541E31656773B5C53 /* Periodizer.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = Periodizer.h; path = ../../../addons/ofxEmotiBit/src/Signal/Periodizer.h; sourceTree = SOURCE_ROOT; };
- 5565E3718DB1D46F1214EBFC /* md2.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = md2.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/md2.h; sourceTree = SOURCE_ROOT; };
- 56DAF0A34EFCF5E2A5E60386 /* rand.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = rand.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/rand.h; sourceTree = SOURCE_ROOT; };
- 5749F2535EC575188CD8B7EA /* md5.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = md5.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/md5.h; sourceTree = SOURCE_ROOT; };
- 5CAABABC5D465FF3E4FDBAA0 /* ssl2.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ssl2.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/ssl2.h; sourceTree = SOURCE_ROOT; };
- 5D05C2B0CBAFC3F9F2F693AF /* tls1.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = tls1.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/tls1.h; sourceTree = SOURCE_ROOT; };
61313493CDB52744E22A604D /* json-forwards.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = "json-forwards.h"; path = "../../../addons/ofxJSON/libs/jsoncpp/include/json/json-forwards.h"; sourceTree = SOURCE_ROOT; };
- 61A673E0354F5DD23699802A /* ebcdic.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ebcdic.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/ebcdic.h; sourceTree = SOURCE_ROOT; };
- 61CC1A2E0CC17BE6CE4A68F7 /* conf.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = conf.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/conf.h; sourceTree = SOURCE_ROOT; };
- 64D45D3FC56C30943AC64D5E /* aes.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = aes.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/aes.h; sourceTree = SOURCE_ROOT; };
- 67AD080A2A62A398BC832D7A /* evp.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = evp.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/evp.h; sourceTree = SOURCE_ROOT; };
- 6B4197F8EF581E2F00041258 /* hmac.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = hmac.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/hmac.h; sourceTree = SOURCE_ROOT; };
- 6FAF79F4AD0DC48C239A0E3E /* idea.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = idea.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/idea.h; sourceTree = SOURCE_ROOT; };
- 7200EB1EC64977ED08AC0111 /* ofxXmlPoco.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxXmlPoco.h; path = ../../../addons/ofxPoco/src/ofxXmlPoco.h; sourceTree = SOURCE_ROOT; };
- 750F4A2471E0E5E0A889C455 /* IPAddressRange.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = IPAddressRange.h; path = ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include/ofx/Net/IPAddressRange.h; sourceTree = SOURCE_ROOT; };
- 773AA38F169F9C1E793528DC /* lhash.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = lhash.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/lhash.h; sourceTree = SOURCE_ROOT; };
78D67A00EB899FAC09430597 /* ofxLabel.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = ofxLabel.cpp; path = ../../../addons/ofxGui/src/ofxLabel.cpp; sourceTree = SOURCE_ROOT; };
- 7A6C877B8EC4F7438DED9FB4 /* ecdh.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ecdh.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/ecdh.h; sourceTree = SOURCE_ROOT; };
- 7D3A8C6EA022F43F7B57C119 /* pkcs12.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = pkcs12.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/pkcs12.h; sourceTree = SOURCE_ROOT; };
802251BAF1B35B1D67B32FD0 /* ofxSliderGroup.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = ofxSliderGroup.cpp; path = ../../../addons/ofxGui/src/ofxSliderGroup.cpp; sourceTree = SOURCE_ROOT; };
- 832BDC407620CDBA568B713D /* tinyxmlerror.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = tinyxmlerror.cpp; path = ../../../addons/ofxXmlSettings/libs/tinyxmlerror.cpp; sourceTree = SOURCE_ROOT; };
87F26B4B24CBD428AD9EEBAA /* ofxBaseGui.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxBaseGui.h; path = ../../../addons/ofxGui/src/ofxBaseGui.h; sourceTree = SOURCE_ROOT; };
89449E3044D456F7DE7BEA14 /* ofxPanel.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxPanel.h; path = ../../../addons/ofxGui/src/ofxPanel.h; sourceTree = SOURCE_ROOT; };
- 8A1254FD4FD7284078EEE55E /* x509.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = x509.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/x509.h; sourceTree = SOURCE_ROOT; };
- 8B1E1E0F1F7DF006BF6F4E80 /* dsa.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = dsa.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/dsa.h; sourceTree = SOURCE_ROOT; };
- 8CA65A234F6CABD350A1BA57 /* Periodizer.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = Periodizer.cpp; path = ../../../addons/ofxEmotiBit/src/Signal/Periodizer.cpp; sourceTree = SOURCE_ROOT; };
- 8F225C97B6ECA8B22FFB4B76 /* rc5.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = rc5.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/rc5.h; sourceTree = SOURCE_ROOT; };
+ 8E80A3672CCDAE9300C65119 /* EmotiBitPacket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EmotiBitPacket.cpp; path = ../../EmotiBit_XPlat_Utils/src/EmotiBitPacket.cpp; sourceTree = ""; };
907C5B5E104864A2D3A25745 /* ofxToggle.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = ofxToggle.cpp; path = ../../../addons/ofxGui/src/ofxToggle.cpp; sourceTree = SOURCE_ROOT; };
- 958F068D5A2037583179BDED /* NetworkInterfaceListener.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = NetworkInterfaceListener.h; path = ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include/ofx/Net/NetworkInterfaceListener.h; sourceTree = SOURCE_ROOT; };
9604B925D32EE39065747725 /* ofxBaseGui.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = ofxBaseGui.cpp; path = ../../../addons/ofxGui/src/ofxBaseGui.cpp; sourceTree = SOURCE_ROOT; };
- 98B916CABFC10AC9836EB352 /* cast.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = cast.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/cast.h; sourceTree = SOURCE_ROOT; };
9938519AF7D3E0C48586F0C1 /* ofxEmotiBitVersion.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxEmotiBitVersion.h; path = ../../../addons/ofxEmotiBit/src/ofxEmotiBitVersion.h; sourceTree = SOURCE_ROOT; };
- 9A00A37CC5D4BF1FD1883438 /* pem2.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = pem2.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/pem2.h; sourceTree = SOURCE_ROOT; };
- 9B3B69F1411454D188127C4E /* SoftwareVersionChecker.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = SoftwareVersionChecker.cpp; path = ../../../addons/ofxEmotiBit/src/SoftwareVersionChecker.cpp; sourceTree = SOURCE_ROOT; };
- 9D907A98D6FF2E95AE4FCFBE /* opensslv.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = opensslv.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/opensslv.h; sourceTree = SOURCE_ROOT; };
- 9E41B5C932654328664C3743 /* ocsp.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ocsp.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/ocsp.h; sourceTree = SOURCE_ROOT; };
- 9E67C420F0790C0E12C99190 /* ts.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ts.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/ts.h; sourceTree = SOURCE_ROOT; };
- A635ED74FA38F1EFA4AD206C /* err.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = err.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/err.h; sourceTree = SOURCE_ROOT; };
- A9AA9F290280E04944C1CEEE /* srp.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = srp.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/srp.h; sourceTree = SOURCE_ROOT; };
- AA136346D730CE2FC0EC85CD /* e_os2.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = e_os2.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/e_os2.h; sourceTree = SOURCE_ROOT; };
- AE30B18B42BAF0E92CB140E5 /* ofxNetworkUtils.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = ofxNetworkUtils.cpp; path = ../../../addons/ofxNetwork/src/ofxNetworkUtils.cpp; sourceTree = SOURCE_ROOT; };
AE68B54581BE4A1DAE853180 /* ofxInputField.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxInputField.h; path = ../../../addons/ofxGui/src/ofxInputField.h; sourceTree = SOURCE_ROOT; };
- AF53C1FCB4DC2DA249C71CE4 /* asn1t.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = asn1t.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/asn1t.h; sourceTree = SOURCE_ROOT; };
- AFB59BF33EDC27D6AF2CC50B /* ArduinoString.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ArduinoString.h; path = ../../../addons/ofxEmotiBit/src/ArduinoString.h; sourceTree = SOURCE_ROOT; };
- B1CC96657896D2F948104F3D /* seed.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = seed.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/seed.h; sourceTree = SOURCE_ROOT; };
- B21E7E5F548EEA92F368040B /* tinyxml.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = tinyxml.h; path = ../../../addons/ofxXmlSettings/libs/tinyxml.h; sourceTree = SOURCE_ROOT; };
- B2D9BED8F594CFBBD0821E7E /* mdc2.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = mdc2.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/mdc2.h; sourceTree = SOURCE_ROOT; };
- B37D59256BC5BDEB408A0B4B /* DoubleBuffer.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = DoubleBuffer.h; path = ../../../addons/ofxEmotiBit/src/DoubleBuffer.h; sourceTree = SOURCE_ROOT; };
- B3F27E813E1250126AA46F39 /* stack.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = stack.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/stack.h; sourceTree = SOURCE_ROOT; };
- B400F6AD48F06E02F44FD05F /* safestack.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = safestack.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/safestack.h; sourceTree = SOURCE_ROOT; };
- B4F3FCB1CEE7B5D701F79122 /* crypto.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = crypto.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/crypto.h; sourceTree = SOURCE_ROOT; };
- B557FD8519CC0900FAB1DCA2 /* NetworkUtils.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = NetworkUtils.cpp; path = ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/src/NetworkUtils.cpp; sourceTree = SOURCE_ROOT; };
- B62DC455BB791E69D877D3B6 /* blowfish.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = blowfish.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/blowfish.h; sourceTree = SOURCE_ROOT; };
- B65483D96A9E876D46C93373 /* srtp.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = srtp.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/srtp.h; sourceTree = SOURCE_ROOT; };
B87C60311EC1FE841C1ECD89 /* ofxLabel.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxLabel.h; path = ../../../addons/ofxGui/src/ofxLabel.h; sourceTree = SOURCE_ROOT; };
- B990E6132C17F4E60094B63E /* EmotiBitPacket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EmotiBitPacket.h; path = ../../../addons/EmotiBit_XPlat_Utils/src/EmotiBitPacket.h; sourceTree = ""; };
- B990E6142C17F4E60094B63E /* EmotiBitPacket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EmotiBitPacket.cpp; path = ../../../addons/EmotiBit_XPlat_Utils/src/EmotiBitPacket.cpp; sourceTree = ""; };
- B990E6182C17F6F10094B63E /* ofxOscilloscope.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofxOscilloscope.h; path = ../../ofxOscilloscope/src/ofxOscilloscope.h; sourceTree = ""; };
B990E61A2C1CAB040094B63E /* parsedDataFormat.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = parsedDataFormat.json; path = bin/data/parsedDataFormat.json; sourceTree = ""; };
B990E61B2C1CAB040094B63E /* verdana.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = verdana.ttf; path = bin/data/verdana.ttf; sourceTree = ""; };
BA274EC7A169D538BD43A5D8 /* ofxGuiUtils.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxGuiUtils.h; path = ../../../addons/ofxGui/src/ofxGuiUtils.h; sourceTree = SOURCE_ROOT; };
- BAE45B5EDF2D519E39986297 /* ofxNetworkUtils.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxNetworkUtils.h; path = ../../../addons/ofxNetworkUtils/src/ofxNetworkUtils.h; sourceTree = SOURCE_ROOT; };
- BF88F02779DD820913ACEA06 /* ofxTCPClient.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = ofxTCPClient.cpp; path = ../../../addons/ofxNetwork/src/ofxTCPClient.cpp; sourceTree = SOURCE_ROOT; };
- C04436216C2B8A5144183E83 /* dtls1.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = dtls1.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/dtls1.h; sourceTree = SOURCE_ROOT; };
- C373CBF6422737D147BA8B70 /* objects.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = objects.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/objects.h; sourceTree = SOURCE_ROOT; };
- C388FEB5AAE4ED4271BE782D /* ecdsa.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ecdsa.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/ecdsa.h; sourceTree = SOURCE_ROOT; };
- C4CA054A26838033180F5EE5 /* camellia.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = camellia.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/camellia.h; sourceTree = SOURCE_ROOT; };
C70D8946940288799E82131E /* ofxSliderGroup.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxSliderGroup.h; path = ../../../addons/ofxGui/src/ofxSliderGroup.h; sourceTree = SOURCE_ROOT; };
C88333E71C9457E441C33474 /* ofxButton.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = ofxButton.cpp; path = ../../../addons/ofxGui/src/ofxButton.cpp; sourceTree = SOURCE_ROOT; };
- C8C9B823D7872F9CBF03A813 /* ofxTCPClient.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxTCPClient.h; path = ../../../addons/ofxNetwork/src/ofxTCPClient.h; sourceTree = SOURCE_ROOT; };
- C9FE1E8D2E9BC8B7F5D308C8 /* asn1.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = asn1.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/asn1.h; sourceTree = SOURCE_ROOT; };
CA32618C6484394941477500 /* ofxThreadedLogger.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxThreadedLogger.h; path = ../../../addons/ofxThreadedLogger/src/ofxThreadedLogger.h; sourceTree = SOURCE_ROOT; };
- D1F2D509F3D753BBF52DAA19 /* rc4.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = rc4.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/rc4.h; sourceTree = SOURCE_ROOT; };
- D315839A1D24D10046025C0C /* asn1_mac.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = asn1_mac.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/asn1_mac.h; sourceTree = SOURCE_ROOT; };
- D67FE8EDE92985070F3FD992 /* ofxUDPSettings.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxUDPSettings.h; path = ../../../addons/ofxNetwork/src/ofxUDPSettings.h; sourceTree = SOURCE_ROOT; };
D6D75E57C2EB53518090D07A /* ofxThreadedLogger.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = ofxThreadedLogger.cpp; path = ../../../addons/ofxThreadedLogger/src/ofxThreadedLogger.cpp; sourceTree = SOURCE_ROOT; };
- D7D04840334F3A7A5E0022ED /* obj_mac.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = obj_mac.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/obj_mac.h; sourceTree = SOURCE_ROOT; };
- D9A29C9DD4DFDF38F00ECF27 /* pem.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = pem.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/pem.h; sourceTree = SOURCE_ROOT; };
- DB8E8A3E7DBD341637059A64 /* dh.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = dh.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/dh.h; sourceTree = SOURCE_ROOT; };
- DE72DC98030465018D130E67 /* md4.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = md4.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/md4.h; sourceTree = SOURCE_ROOT; };
E112B3AEBEA2C091BF2B40AE /* ofxPanel.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = ofxPanel.cpp; path = ../../../addons/ofxGui/src/ofxPanel.cpp; sourceTree = SOURCE_ROOT; };
E42962AC2163EDD300A6A9E2 /* ofCamera.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ofCamera.cpp; path = ../../../libs/openFrameworks/3d/ofCamera.cpp; sourceTree = SOURCE_ROOT; };
E42962AD2163EDD300A6A9E2 /* ofMesh.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ofMesh.h; path = ../../../libs/openFrameworks/3d/ofMesh.h; sourceTree = SOURCE_ROOT; };
@@ -385,18 +265,8 @@
E4B69E1F0A3A1BDC003C02F2 /* ofApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofApp.h; path = src/ofApp.h; sourceTree = SOURCE_ROOT; };
E4B6FCAD0C3E899E008CF71C /* openFrameworks-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "openFrameworks-Info.plist"; sourceTree = ""; };
E4EB6923138AFD0F00A09F29 /* Project.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Project.xcconfig; sourceTree = ""; };
- E78FB8975C07248217E531FA /* kdf.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = kdf.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/kdf.h; sourceTree = SOURCE_ROOT; };
- E811E52684D14AA533F8D72B /* whrlpool.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = whrlpool.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/whrlpool.h; sourceTree = SOURCE_ROOT; };
- E9998694E5001F9CF0B13BF0 /* ofxXmlPoco.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = ofxXmlPoco.cpp; path = ../../../addons/ofxPoco/src/ofxXmlPoco.cpp; sourceTree = SOURCE_ROOT; };
ECF8674C7975F1063C5E30CA /* ofxGuiGroup.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = ofxGuiGroup.cpp; path = ../../../addons/ofxGui/src/ofxGuiGroup.cpp; sourceTree = SOURCE_ROOT; };
- EEC2734565C1EDDDE6616883 /* ripemd.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ripemd.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/ripemd.h; sourceTree = SOURCE_ROOT; };
- F0B21373033A0907CFFFD055 /* des.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = des.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/des.h; sourceTree = SOURCE_ROOT; };
F2B099E6BD1199664C48B177 /* ofxJSONElement.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = ofxJSONElement.cpp; path = ../../../addons/ofxJSON/src/ofxJSONElement.cpp; sourceTree = SOURCE_ROOT; };
- F399B91E98DC31CDA6DDACB4 /* ofxTCPManager.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = ofxTCPManager.cpp; path = ../../../addons/ofxNetwork/src/ofxTCPManager.cpp; sourceTree = SOURCE_ROOT; };
- F66993296A3AEEC70FD444F5 /* ofxNetwork.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxNetwork.h; path = ../../../addons/ofxNetwork/src/ofxNetwork.h; sourceTree = SOURCE_ROOT; };
- FC5DA1C87211D4F6377DA719 /* tinyxmlparser.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = tinyxmlparser.cpp; path = ../../../addons/ofxXmlSettings/libs/tinyxmlparser.cpp; sourceTree = SOURCE_ROOT; };
- FDB04DA12ABAFBA5FFE217C9 /* opensslconf.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = opensslconf.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/opensslconf.h; sourceTree = SOURCE_ROOT; };
- FDC037DF46F0D26E4621F89B /* ossl_typ.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ossl_typ.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/ossl_typ.h; sourceTree = SOURCE_ROOT; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -410,24 +280,6 @@
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
- 0117D94CE0C695E5E5482BEC /* ofxPoco */ = {
- isa = PBXGroup;
- children = (
- 959BC13926B6C962531CEF17 /* libs */,
- 0EFE45161A4E28BDE46D84D0 /* src */,
- );
- name = ofxPoco;
- sourceTree = "";
- };
- 086770EA564806B847975656 /* src */ = {
- isa = PBXGroup;
- children = (
- 14A43221DDD441A2AC353651 /* ofxNetworkUtils.cpp */,
- BAE45B5EDF2D519E39986297 /* ofxNetworkUtils.h */,
- );
- name = src;
- sourceTree = "";
- };
0B8ED02ED04845BC31B3E518 /* ofxEmotiBit */ = {
isa = PBXGroup;
children = (
@@ -436,76 +288,6 @@
name = ofxEmotiBit;
sourceTree = "";
};
- 0EFE45161A4E28BDE46D84D0 /* src */ = {
- isa = PBXGroup;
- children = (
- E9998694E5001F9CF0B13BF0 /* ofxXmlPoco.cpp */,
- 7200EB1EC64977ED08AC0111 /* ofxXmlPoco.h */,
- );
- name = src;
- sourceTree = "";
- };
- 10D3F3F0B7A5F4F005A72281 /* libs */ = {
- isa = PBXGroup;
- children = (
- 3267A0EC40EE3A074E568CC5 /* ofxNetworkUtils */,
- );
- name = libs;
- sourceTree = "";
- };
- 13C2436A78CDB4354594CA7D /* include */ = {
- isa = PBXGroup;
- children = (
- 70E25EBAAB745F09329DDB44 /* openssl */,
- );
- name = include;
- sourceTree = "";
- };
- 15D44573EC8FB19C8A2B4DA1 /* include */ = {
- isa = PBXGroup;
- children = (
- 70F449D423BB9FB6AC828E03 /* ofx */,
- );
- name = include;
- sourceTree = "";
- };
- 18240ECCE4076FB0833A8578 /* ofxNetwork */ = {
- isa = PBXGroup;
- children = (
- 219374A14594D121F27FED3A /* src */,
- );
- name = ofxNetwork;
- sourceTree = "";
- };
- 1F4FB5C423662B96ADFDCC0B /* ofxXmlSettings */ = {
- isa = PBXGroup;
- children = (
- 6E54289412D2D94F45A05113 /* libs */,
- 6ECEF0D76BC33727823EADFF /* src */,
- );
- name = ofxXmlSettings;
- sourceTree = "";
- };
- 219374A14594D121F27FED3A /* src */ = {
- isa = PBXGroup;
- children = (
- F66993296A3AEEC70FD444F5 /* ofxNetwork.h */,
- AE30B18B42BAF0E92CB140E5 /* ofxNetworkUtils.cpp */,
- 1DFA26F2C6BBD1B8AC24C0B1 /* ofxNetworkUtils.h */,
- BF88F02779DD820913ACEA06 /* ofxTCPClient.cpp */,
- C8C9B823D7872F9CBF03A813 /* ofxTCPClient.h */,
- F399B91E98DC31CDA6DDACB4 /* ofxTCPManager.cpp */,
- 26EF3E71A07C6948EAF6709E /* ofxTCPManager.h */,
- 1C085E327DAB912CFA2A443D /* ofxTCPServer.cpp */,
- 30841703B7AC8487D16FB4AA /* ofxTCPServer.h */,
- 163ABB7F5E22B6A0ECF51B07 /* ofxTCPSettings.h */,
- 35BB9BB90DBABFD3B39F8DB6 /* ofxUDPManager.cpp */,
- 2F519EB3B0DCD7378FB86ABE /* ofxUDPManager.h */,
- D67FE8EDE92985070F3FD992 /* ofxUDPSettings.h */,
- );
- name = src;
- sourceTree = "";
- };
2865DAEF86B1907A704CA70B /* ofxJSON */ = {
isa = PBXGroup;
children = (
@@ -525,15 +307,6 @@
name = src;
sourceTree = "";
};
- 3267A0EC40EE3A074E568CC5 /* ofxNetworkUtils */ = {
- isa = PBXGroup;
- children = (
- 15D44573EC8FB19C8A2B4DA1 /* include */,
- F06A6CC1DE8AD93D3A0E1E5D /* src */,
- );
- name = ofxNetworkUtils;
- sourceTree = "";
- };
3286A6A80FB3354E8DF1D5B8 /* ofxThreadedLogger */ = {
isa = PBXGroup;
children = (
@@ -542,15 +315,6 @@
name = ofxThreadedLogger;
sourceTree = "";
};
- 406D7399CEFC4C539B676AFF /* ofxNetworkUtils */ = {
- isa = PBXGroup;
- children = (
- 10D3F3F0B7A5F4F005A72281 /* libs */,
- 086770EA564806B847975656 /* src */,
- );
- name = ofxNetworkUtils;
- sourceTree = "";
- };
480A780D8D0308AE4A368801 /* ofxGui */ = {
isa = PBXGroup;
children = (
@@ -562,13 +326,6 @@
4CD5C6EA1AEB082DFF01E7BE /* src */ = {
isa = PBXGroup;
children = (
- AFB59BF33EDC27D6AF2CC50B /* ArduinoString.h */,
- B37D59256BC5BDEB408A0B4B /* DoubleBuffer.h */,
- 0BDE549108B6A79D110451A5 /* EmotiBitOfUtils.cpp */,
- 452AF016D8E68676D45A9498 /* EmotiBitOfUtils.h */,
- D15B7CC43D038EC633AC3A25 /* Signal */,
- 9B3B69F1411454D188127C4E /* SoftwareVersionChecker.cpp */,
- 04C68EFF05480545A9A374D9 /* SoftwareVersionChecker.h */,
9938519AF7D3E0C48586F0C1 /* ofxEmotiBitVersion.h */,
);
name = src;
@@ -590,123 +347,6 @@
name = local_addons;
sourceTree = "";
};
- 6E54289412D2D94F45A05113 /* libs */ = {
- isa = PBXGroup;
- children = (
- 2B40EDA85BEB63E46785BC29 /* tinyxml.cpp */,
- B21E7E5F548EEA92F368040B /* tinyxml.h */,
- 832BDC407620CDBA568B713D /* tinyxmlerror.cpp */,
- FC5DA1C87211D4F6377DA719 /* tinyxmlparser.cpp */,
- );
- name = libs;
- sourceTree = "";
- };
- 6ECEF0D76BC33727823EADFF /* src */ = {
- isa = PBXGroup;
- children = (
- 50DF87D612C5AAE17AAFA6C0 /* ofxXmlSettings.cpp */,
- 01DCC0911400F9ACF5B65578 /* ofxXmlSettings.h */,
- );
- name = src;
- sourceTree = "";
- };
- 70E25EBAAB745F09329DDB44 /* openssl */ = {
- isa = PBXGroup;
- children = (
- 64D45D3FC56C30943AC64D5E /* aes.h */,
- C9FE1E8D2E9BC8B7F5D308C8 /* asn1.h */,
- D315839A1D24D10046025C0C /* asn1_mac.h */,
- AF53C1FCB4DC2DA249C71CE4 /* asn1t.h */,
- 2A61AA76A834926F81F48ADC /* async.h */,
- 37A00AAE55CA7B437073B0C9 /* bio.h */,
- B62DC455BB791E69D877D3B6 /* blowfish.h */,
- 4BF97AC133A743F7D2E222B6 /* bn.h */,
- 0B26945A52EE3207EE20D083 /* buffer.h */,
- C4CA054A26838033180F5EE5 /* camellia.h */,
- 98B916CABFC10AC9836EB352 /* cast.h */,
- 1AEDCF9A6D7A9C81A1FFFB82 /* cmac.h */,
- 4882CC26D63610292CFADBE9 /* cms.h */,
- 26FD7792D0FC0533A46C4B0D /* comp.h */,
- 61CC1A2E0CC17BE6CE4A68F7 /* conf.h */,
- 490DE03DA72EE341B37B4BBB /* conf_api.h */,
- B4F3FCB1CEE7B5D701F79122 /* crypto.h */,
- 2D45A496EFB9F361A92C1F2A /* ct.h */,
- F0B21373033A0907CFFFD055 /* des.h */,
- DB8E8A3E7DBD341637059A64 /* dh.h */,
- 8B1E1E0F1F7DF006BF6F4E80 /* dsa.h */,
- C04436216C2B8A5144183E83 /* dtls1.h */,
- AA136346D730CE2FC0EC85CD /* e_os2.h */,
- 61A673E0354F5DD23699802A /* ebcdic.h */,
- 2A20F45E8472AF83015D687B /* ec.h */,
- 7A6C877B8EC4F7438DED9FB4 /* ecdh.h */,
- C388FEB5AAE4ED4271BE782D /* ecdsa.h */,
- 1D548216CC2978215BFDAC85 /* engine.h */,
- A635ED74FA38F1EFA4AD206C /* err.h */,
- 67AD080A2A62A398BC832D7A /* evp.h */,
- 6B4197F8EF581E2F00041258 /* hmac.h */,
- 6FAF79F4AD0DC48C239A0E3E /* idea.h */,
- E78FB8975C07248217E531FA /* kdf.h */,
- 773AA38F169F9C1E793528DC /* lhash.h */,
- 5565E3718DB1D46F1214EBFC /* md2.h */,
- DE72DC98030465018D130E67 /* md4.h */,
- 5749F2535EC575188CD8B7EA /* md5.h */,
- B2D9BED8F594CFBBD0821E7E /* mdc2.h */,
- 17006150745E007FA32014F5 /* modes.h */,
- D7D04840334F3A7A5E0022ED /* obj_mac.h */,
- C373CBF6422737D147BA8B70 /* objects.h */,
- 9E41B5C932654328664C3743 /* ocsp.h */,
- FDB04DA12ABAFBA5FFE217C9 /* opensslconf.h */,
- 3196BB02FD710583AD1E8682 /* opensslconf_osx.h */,
- 9D907A98D6FF2E95AE4FCFBE /* opensslv.h */,
- FDC037DF46F0D26E4621F89B /* ossl_typ.h */,
- D9A29C9DD4DFDF38F00ECF27 /* pem.h */,
- 9A00A37CC5D4BF1FD1883438 /* pem2.h */,
- 7D3A8C6EA022F43F7B57C119 /* pkcs12.h */,
- 413E48C985AFC06586413FB9 /* pkcs7.h */,
- 56DAF0A34EFCF5E2A5E60386 /* rand.h */,
- 101E00135DD5F4A88AA3119E /* rc2.h */,
- D1F2D509F3D753BBF52DAA19 /* rc4.h */,
- 8F225C97B6ECA8B22FFB4B76 /* rc5.h */,
- EEC2734565C1EDDDE6616883 /* ripemd.h */,
- 1C0972A2A90100E10C49938E /* rsa.h */,
- B400F6AD48F06E02F44FD05F /* safestack.h */,
- B1CC96657896D2F948104F3D /* seed.h */,
- 3F9F5D5E3A4CDE45682F38E2 /* sha.h */,
- A9AA9F290280E04944C1CEEE /* srp.h */,
- B65483D96A9E876D46C93373 /* srtp.h */,
- 16D8E1844A44453A0C287E72 /* ssl.h */,
- 5CAABABC5D465FF3E4FDBAA0 /* ssl2.h */,
- 40F8AFFCAB8F69A35DA9FD2A /* ssl3.h */,
- B3F27E813E1250126AA46F39 /* stack.h */,
- 0ED9E7E17E11365C9F07BC90 /* symhacks.h */,
- 5D05C2B0CBAFC3F9F2F693AF /* tls1.h */,
- 9E67C420F0790C0E12C99190 /* ts.h */,
- 355218D9B12A28AD4F099029 /* txt_db.h */,
- 3FED4C887C37A3FD70D004E8 /* ui.h */,
- E811E52684D14AA533F8D72B /* whrlpool.h */,
- 8A1254FD4FD7284078EEE55E /* x509.h */,
- 4A941E617512F1E87E294653 /* x509_vfy.h */,
- 2A8E6EE70DD635A657EEEC99 /* x509v3.h */,
- );
- name = openssl;
- sourceTree = "";
- };
- 70F449D423BB9FB6AC828E03 /* ofx */ = {
- isa = PBXGroup;
- children = (
- BA927607FD4C8BD5D2119338 /* Net */,
- );
- name = ofx;
- sourceTree = "";
- };
- 959BC13926B6C962531CEF17 /* libs */ = {
- isa = PBXGroup;
- children = (
- B2C98B62869583DB9FE30DA7 /* openssl */,
- );
- name = libs;
- sourceTree = "";
- };
977A836DD2C489CCC5E330FF /* jsoncpp */ = {
isa = PBXGroup;
children = (
@@ -745,14 +385,6 @@
name = src;
sourceTree = "";
};
- B2C98B62869583DB9FE30DA7 /* openssl */ = {
- isa = PBXGroup;
- children = (
- 13C2436A78CDB4354594CA7D /* include */,
- );
- name = openssl;
- sourceTree = "";
- };
B990E6102C1272A70094B63E /* EmotiBit_XPlat_Utils */ = {
isa = PBXGroup;
children = (
@@ -764,51 +396,19 @@
B990E6122C17F4B70094B63E /* src */ = {
isa = PBXGroup;
children = (
- B990E6142C17F4E60094B63E /* EmotiBitPacket.cpp */,
- B990E6132C17F4E60094B63E /* EmotiBitPacket.h */,
+ 8E80A3672CCDAE9300C65119 /* EmotiBitPacket.cpp */,
);
name = src;
sourceTree = "";
};
- B990E6162C17F6CD0094B63E /* ofxOscilloscope */ = {
- isa = PBXGroup;
- children = (
- B990E6172C17F6D90094B63E /* src */,
- );
- name = ofxOscilloscope;
- sourceTree = "";
- };
- B990E6172C17F6D90094B63E /* src */ = {
- isa = PBXGroup;
- children = (
- B990E6182C17F6F10094B63E /* ofxOscilloscope.h */,
- );
- name = src;
- sourceTree = "";
- };
- BA927607FD4C8BD5D2119338 /* Net */ = {
- isa = PBXGroup;
- children = (
- 750F4A2471E0E5E0A889C455 /* IPAddressRange.h */,
- 958F068D5A2037583179BDED /* NetworkInterfaceListener.h */,
- 2BE946CC0D0FAFAFB318D357 /* NetworkUtils.h */,
- );
- name = Net;
- sourceTree = "";
- };
BB4B014C10F69532006C3DED /* addons */ = {
isa = PBXGroup;
children = (
- B990E6162C17F6CD0094B63E /* ofxOscilloscope */,
B990E6102C1272A70094B63E /* EmotiBit_XPlat_Utils */,
0B8ED02ED04845BC31B3E518 /* ofxEmotiBit */,
480A780D8D0308AE4A368801 /* ofxGui */,
2865DAEF86B1907A704CA70B /* ofxJSON */,
- 18240ECCE4076FB0833A8578 /* ofxNetwork */,
- 0117D94CE0C695E5E5482BEC /* ofxPoco */,
- 406D7399CEFC4C539B676AFF /* ofxNetworkUtils */,
3286A6A80FB3354E8DF1D5B8 /* ofxThreadedLogger */,
- 1F4FB5C423662B96ADFDCC0B /* ofxXmlSettings */,
);
name = addons;
sourceTree = "";
@@ -821,15 +421,6 @@
name = src;
sourceTree = "";
};
- D15B7CC43D038EC633AC3A25 /* Signal */ = {
- isa = PBXGroup;
- children = (
- 8CA65A234F6CABD350A1BA57 /* Periodizer.cpp */,
- 53849B4541E31656773B5C53 /* Periodizer.h */,
- );
- name = Signal;
- sourceTree = "";
- };
D486FC87F063317BB47E9FAC /* include */ = {
isa = PBXGroup;
children = (
@@ -1154,16 +745,6 @@
path = src;
sourceTree = SOURCE_ROOT;
};
- F06A6CC1DE8AD93D3A0E1E5D /* src */ = {
- isa = PBXGroup;
- children = (
- 2FA5A4362497FA77DF9B5A19 /* IPAddressRange.cpp */,
- 44D29F961AB993B629D7C467 /* NetworkInterfaceListener.cpp */,
- B557FD8519CC0900FAB1DCA2 /* NetworkUtils.cpp */,
- );
- name = src;
- sourceTree = "";
- };
F40E80CB2D443CBA9581DD03 /* libs */ = {
isa = PBXGroup;
children = (
@@ -1271,12 +852,9 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- B990E6152C17F4E60094B63E /* EmotiBitPacket.cpp in Sources */,
+ 8E80A3682CCDAE9300C65119 /* EmotiBitPacket.cpp in Sources */,
E4B69E200A3A1BDC003C02F2 /* main.cpp in Sources */,
E4B69E210A3A1BDC003C02F2 /* ofApp.cpp in Sources */,
- D1E529D7B6961183405926CF /* EmotiBitOfUtils.cpp in Sources */,
- 02FA22EAD4CE81F39CC58EEA /* Periodizer.cpp in Sources */,
- 5CE4E12FF3BBF9B3E2A42B3D /* SoftwareVersionChecker.cpp in Sources */,
856AA354D08AB4B323081444 /* ofxBaseGui.cpp in Sources */,
5CBB2AB3A60F65431D7B555D /* ofxButton.cpp in Sources */,
853E0BA2F448076739446874 /* ofxColorPicker.cpp in Sources */,
@@ -1289,21 +867,7 @@
1CD33E884D9E3358252E82A1 /* ofxToggle.cpp in Sources */,
FB84AAF8D1B7A95266DB5C09 /* jsoncpp.cpp in Sources */,
BEDFEE7400C58EA4E412B757 /* ofxJSONElement.cpp in Sources */,
- 661A1991F5CE4CCC2919D8E7 /* ofxNetworkUtils.cpp in Sources */,
- 960D20B191346612D5C05A6A /* ofxTCPClient.cpp in Sources */,
- 125506CD3E5F428AAFE5CC65 /* ofxTCPManager.cpp in Sources */,
- 66CA411C5A9664E27326BF36 /* ofxTCPServer.cpp in Sources */,
- E2564CF7DDB3713772BB682E /* ofxUDPManager.cpp in Sources */,
- 1C36947250DCB09A8A375C0C /* ofxXmlPoco.cpp in Sources */,
- 633AFFDB4EC6674D34F0EF7D /* IPAddressRange.cpp in Sources */,
- B65D7C8C591DF95D595E2053 /* NetworkInterfaceListener.cpp in Sources */,
- 69AF35586CA18EA57C5CFCD3 /* NetworkUtils.cpp in Sources */,
- AEAE7BD10A06519AE832EC52 /* ofxNetworkUtils.cpp in Sources */,
9CA591B9A40F2386FE099328 /* ofxThreadedLogger.cpp in Sources */,
- 933A2227713C720CEFF80FD9 /* tinyxml.cpp in Sources */,
- 9D44DC88EF9E7991B4A09951 /* tinyxmlerror.cpp in Sources */,
- 5A4349E9754D6FA14C0F2A3A /* tinyxmlparser.cpp in Sources */,
- 63B57AC5BF4EF088491E0317 /* ofxXmlSettings.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/EmotiBitDataParser/EmotiBitDataParser.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme b/EmotiBitDataParser/EmotiBitDataParser.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme
new file mode 100644
index 0000000..e27329d
--- /dev/null
+++ b/EmotiBitDataParser/EmotiBitDataParser.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme
@@ -0,0 +1,78 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/EmotiBitDataParser/EmotiBitDataParser.xcodeproj/xcshareddata/xcschemes/Release.xcscheme b/EmotiBitDataParser/EmotiBitDataParser.xcodeproj/xcshareddata/xcschemes/Release.xcscheme
new file mode 100644
index 0000000..ad541f2
--- /dev/null
+++ b/EmotiBitDataParser/EmotiBitDataParser.xcodeproj/xcshareddata/xcschemes/Release.xcscheme
@@ -0,0 +1,78 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/EmotiBitDataParser/addons.make b/EmotiBitDataParser/addons.make
index 4fb6483..670016c 100644
--- a/EmotiBitDataParser/addons.make
+++ b/EmotiBitDataParser/addons.make
@@ -1,11 +1,6 @@
-ofxBiquadFilter
ofxEmotiBit
ofxGui
-ofxNetwork
-ofxPoco
-ofxNetworkUtils
-ofxOscilloscope
ofxThreadedLogger
-ofxXmlSettings
EmotiBit_XPlat_Utils
ofxJSON
+ofxBiquadFilter
diff --git a/EmotiBitDataParser/src/ofApp.h b/EmotiBitDataParser/src/ofApp.h
index e9b0e31..37455f8 100644
--- a/EmotiBitDataParser/src/ofApp.h
+++ b/EmotiBitDataParser/src/ofApp.h
@@ -1,9 +1,6 @@
#pragma once
#include "ofMain.h"
-#include "ofxOscilloscope.h"
-#include "ofxNetwork.h"
-#include "ofxNetworkUtils.h"
#include "ofxThreadedLogger.h"
#include "ofxGui.h"
#include "ofxInputField.h"
diff --git a/EmotiBitFirmwareInstaller/EmotiBitFirmwareInstaller.xcodeproj/project.pbxproj b/EmotiBitFirmwareInstaller/EmotiBitFirmwareInstaller.xcodeproj/project.pbxproj
index 7a5afe1..6fbb6d5 100644
--- a/EmotiBitFirmwareInstaller/EmotiBitFirmwareInstaller.xcodeproj/project.pbxproj
+++ b/EmotiBitFirmwareInstaller/EmotiBitFirmwareInstaller.xcodeproj/project.pbxproj
@@ -2402,6 +2402,7 @@
INFOPLIST_FILE = "openFrameworks-Info.plist";
INSTALL_PATH = /Applications;
LIBRARY_SEARCH_PATHS = "$(inherited)";
+ OTHER_CPLUSPLUSFLAGS = "-D__MACOSX_CORE__";
OTHER_LDFLAGS = (
"$(OF_CORE_LIBS)",
"$(OF_CORE_FRAMEWORKS)",
@@ -2488,6 +2489,7 @@
INFOPLIST_FILE = "openFrameworks-Info.plist";
INSTALL_PATH = /Applications;
LIBRARY_SEARCH_PATHS = "$(inherited)";
+ OTHER_CPLUSPLUSFLAGS = "-D__MACOSX_CORE__";
OTHER_LDFLAGS = (
"$(OF_CORE_LIBS)",
"$(OF_CORE_FRAMEWORKS)",
diff --git a/EmotiBitFirmwareInstaller/EmotiBitFirmwareInstaller.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme b/EmotiBitFirmwareInstaller/EmotiBitFirmwareInstaller.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme
new file mode 100644
index 0000000..ced5d49
--- /dev/null
+++ b/EmotiBitFirmwareInstaller/EmotiBitFirmwareInstaller.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme
@@ -0,0 +1,78 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/EmotiBitFirmwareInstaller/EmotiBitFirmwareInstaller.xcodeproj/xcshareddata/xcschemes/Release.xcscheme b/EmotiBitFirmwareInstaller/EmotiBitFirmwareInstaller.xcodeproj/xcshareddata/xcschemes/Release.xcscheme
new file mode 100644
index 0000000..5790617
--- /dev/null
+++ b/EmotiBitFirmwareInstaller/EmotiBitFirmwareInstaller.xcodeproj/xcshareddata/xcschemes/Release.xcscheme
@@ -0,0 +1,78 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/EmotiBitOscilloscope/EmotiBitOscilloscope.vcxproj b/EmotiBitOscilloscope/EmotiBitOscilloscope.vcxproj
index 70807e2..f0ebb02 100644
--- a/EmotiBitOscilloscope/EmotiBitOscilloscope.vcxproj
+++ b/EmotiBitOscilloscope/EmotiBitOscilloscope.vcxproj
@@ -108,16 +108,16 @@
-
+
+
-
@@ -169,17 +169,17 @@
-
+
+
-
diff --git a/EmotiBitOscilloscope/EmotiBitOscilloscope.vcxproj.filters b/EmotiBitOscilloscope/EmotiBitOscilloscope.vcxproj.filters
index 9f6e2d0..90521c5 100644
--- a/EmotiBitOscilloscope/EmotiBitOscilloscope.vcxproj.filters
+++ b/EmotiBitOscilloscope/EmotiBitOscilloscope.vcxproj.filters
@@ -22,9 +22,6 @@
addons\ofxEmotiBit\src
-
- addons\ofxEmotiBit\src
-
addons\ofxGui\src
@@ -154,9 +151,6 @@
addons\ofxLSL\src
-
- src
-
addons\ofxOscilloscope\ofxPatchboard\Patchboard\src
@@ -169,6 +163,13 @@
addons\ofxEmotiBit\src
+
+
+ src
+
+
+ src
+
@@ -350,9 +351,6 @@
addons\ofxEmotiBit\src
-
- addons\ofxEmotiBit\src
-
addons\ofxEmotiBit\src
@@ -545,9 +543,6 @@
addons\ofxEmotiBit\src
-
- src
-
addons\ofxOscilloscope\ofxPatchboard\Patchboard\src
@@ -560,6 +555,12 @@
addons\ofxEmotiBit\src
+
+ src
+
+
+ src
+
diff --git a/EmotiBitOscilloscope/EmotiBitOscilloscope.xcodeproj/project.pbxproj b/EmotiBitOscilloscope/EmotiBitOscilloscope.xcodeproj/project.pbxproj
index 1293010..267d68e 100644
--- a/EmotiBitOscilloscope/EmotiBitOscilloscope.xcodeproj/project.pbxproj
+++ b/EmotiBitOscilloscope/EmotiBitOscilloscope.xcodeproj/project.pbxproj
@@ -12,7 +12,6 @@
125506CD3E5F428AAFE5CC65 /* ofxTCPManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F399B91E98DC31CDA6DDACB4 /* ofxTCPManager.cpp */; };
1C36947250DCB09A8A375C0C /* ofxXmlPoco.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9998694E5001F9CF0B13BF0 /* ofxXmlPoco.cpp */; };
1CD33E884D9E3358252E82A1 /* ofxToggle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 907C5B5E104864A2D3A25745 /* ofxToggle.cpp */; };
- 2CB15D77D4862C444CBAD4FA /* EmotiBitWiFiHost.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2EEA793E39D386EF32CB1ADD /* EmotiBitWiFiHost.cpp */; };
483908258D00B98B4BE69F07 /* ofxLabel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78D67A00EB899FAC09430597 /* ofxLabel.cpp */; };
4ADB88E2FB52E76A471065DE /* ofxOscParameterSync.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0AED834CE4DEC5260AF302A2 /* ofxOscParameterSync.cpp */; };
510CAFE035E576A4E1502D52 /* UdpSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E6DEF695B88BA5FAACEAA937 /* UdpSocket.cpp */; };
@@ -34,7 +33,7 @@
853E0BA2F448076739446874 /* ofxColorPicker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 181D363B6DD54D1FA6309C43 /* ofxColorPicker.cpp */; };
856AA354D08AB4B323081444 /* ofxBaseGui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9604B925D32EE39065747725 /* ofxBaseGui.cpp */; };
879A251454401BC0B6E4F238 /* OscTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D9BFFBBF4CC43DEE890B3C3E /* OscTypes.cpp */; };
- 8E012CDE29A5B157009FB530 /* udpOutputSettings.xml in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8E012CDD29A5B157009FB530 /* udpOutputSettings.xml */; };
+ 8E012CDE29A5B157009FB530 /* udpOutputSettings.xml in Copy Files */ = {isa = PBXBuildFile; fileRef = 8E012CDD29A5B157009FB530 /* udpOutputSettings.xml */; };
8E016F642832CAFE005D7C65 /* ofxJSONElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E016F612832CAFE005D7C65 /* ofxJSONElement.cpp */; };
8E016F6E2832CB73005D7C65 /* jsoncpp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E016F6D2832CB73005D7C65 /* jsoncpp.cpp */; };
8E016F7C2832CE28005D7C65 /* EmotiBitVariants.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E016F722832CE28005D7C65 /* EmotiBitVariants.cpp */; };
@@ -43,21 +42,24 @@
8E016F7F2832CE28005D7C65 /* EmotiBitPacket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E016F762832CE28005D7C65 /* EmotiBitPacket.cpp */; };
8E016F802832CE28005D7C65 /* EmotiBitFactoryTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E016F782832CE28005D7C65 /* EmotiBitFactoryTest.cpp */; };
8E016F842832CE82005D7C65 /* Periodizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E016F832832CE82005D7C65 /* Periodizer.cpp */; };
- 8E016F862832D594005D7C65 /* emotibitCommSettings.json in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8E016F852832D594005D7C65 /* emotibitCommSettings.json */; };
+ 8E016F862832D594005D7C65 /* emotibitCommSettings.json in Copy Files */ = {isa = PBXBuildFile; fileRef = 8E016F852832D594005D7C65 /* emotibitCommSettings.json */; };
8E07BBAD2B1F824D00CDD443 /* SoftwareVersionChecker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E07BBAB2B1F824D00CDD443 /* SoftwareVersionChecker.cpp */; };
8E07BBCD2BB3B2BF00CDD443 /* PatchboardJson.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E07BBC72BB3B2BF00CDD443 /* PatchboardJson.cpp */; };
8E07BBCE2BB3B2BF00CDD443 /* PatchboardXml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E07BBC92BB3B2BF00CDD443 /* PatchboardXml.cpp */; };
8E07BBCF2BB3B2BF00CDD443 /* PatchboardBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E07BBCC2BB3B2BF00CDD443 /* PatchboardBase.cpp */; };
- 8E07BBD42BB3B46400CDD443 /* EmotiBitLsl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E07BBD02BB3B46400CDD443 /* EmotiBitLsl.cpp */; };
8E07BBD52BB3B46400CDD443 /* EmotiBitOfUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E07BBD32BB3B46400CDD443 /* EmotiBitOfUtils.cpp */; };
- 8E07BBD72BB3B5D200CDD443 /* lslOutputSettings.json in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8E07BBD62BB3B5D200CDD443 /* lslOutputSettings.json */; };
- 8E6079EA27C978BE00959DDB /* inputSettings.xml in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8E6079E827C978BE00959DDB /* inputSettings.xml */; };
- 8E6079EB27C978BE00959DDB /* ofxOscilloscopeSettings.xml in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8E6079E927C978BE00959DDB /* ofxOscilloscopeSettings.xml */; };
+ 8E07BBD72BB3B5D200CDD443 /* lslOutputSettings.json in Copy Files */ = {isa = PBXBuildFile; fileRef = 8E07BBD62BB3B5D200CDD443 /* lslOutputSettings.json */; };
+ 8E6079EA27C978BE00959DDB /* inputSettings.xml in Copy Files */ = {isa = PBXBuildFile; fileRef = 8E6079E827C978BE00959DDB /* inputSettings.xml */; };
+ 8E6079EB27C978BE00959DDB /* ofxOscilloscopeSettings.xml in Copy Files */ = {isa = PBXBuildFile; fileRef = 8E6079E927C978BE00959DDB /* ofxOscilloscopeSettings.xml */; };
+ 8E80A3632CCDAAA000C65119 /* EmotiBitLsl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E80A35F2CCDAAA000C65119 /* EmotiBitLsl.cpp */; };
+ 8E80A3642CCDAAA000C65119 /* EmotiBitLsl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E80A35F2CCDAAA000C65119 /* EmotiBitLsl.cpp */; };
+ 8E80A3652CCDAAA000C65119 /* EmotiBitWiFiHost.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E80A3622CCDAAA000C65119 /* EmotiBitWiFiHost.cpp */; };
+ 8E80A3662CCDAAA000C65119 /* EmotiBitWiFiHost.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E80A3622CCDAAA000C65119 /* EmotiBitWiFiHost.cpp */; };
8F5205AEF8861EF234F0651A /* ofxOscSender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81967292BFC87A0144BD32C6 /* ofxOscSender.cpp */; };
933A2227713C720CEFF80FD9 /* tinyxml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B40EDA85BEB63E46785BC29 /* tinyxml.cpp */; };
- 941B2FC325BA241400BB7E84 /* oscOutputSettings.xml in CopyFiles */ = {isa = PBXBuildFile; fileRef = 941B2FB525B8EA3200BB7E84 /* oscOutputSettings.xml */; };
- 941B2FC425BA241400BB7E84 /* verdana.ttf in CopyFiles */ = {isa = PBXBuildFile; fileRef = 941B2FB225B8E62400BB7E84 /* verdana.ttf */; };
- 941B2FC525BA241400BB7E84 /* verdanab.ttf in CopyFiles */ = {isa = PBXBuildFile; fileRef = 941B2FB125B8E62400BB7E84 /* verdanab.ttf */; };
+ 941B2FC325BA241400BB7E84 /* oscOutputSettings.xml in Copy Files */ = {isa = PBXBuildFile; fileRef = 941B2FB525B8EA3200BB7E84 /* oscOutputSettings.xml */; };
+ 941B2FC425BA241400BB7E84 /* verdana.ttf in Copy Files */ = {isa = PBXBuildFile; fileRef = 941B2FB225B8E62400BB7E84 /* verdana.ttf */; };
+ 941B2FC525BA241400BB7E84 /* verdanab.ttf in Copy Files */ = {isa = PBXBuildFile; fileRef = 941B2FB125B8E62400BB7E84 /* verdanab.ttf */; };
948E6B5228528CA5000A8B76 /* ofxLSLReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 948E6B4E28528CA5000A8B76 /* ofxLSLReceiver.cpp */; };
948E6B5328528CA5000A8B76 /* ofxLSLResolver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 948E6B5128528CA5000A8B76 /* ofxLSLResolver.cpp */; };
948E6B5928529E74000A8B76 /* liblsl.1.14.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 948E6B5528528E34000A8B76 /* liblsl.1.14.0.dylib */; };
@@ -78,8 +80,6 @@
B990E5BE2C0E7A370094B63E /* EmotiBitFactoryTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E016F782832CE28005D7C65 /* EmotiBitFactoryTest.cpp */; };
B990E5BF2C0E7A370094B63E /* jsoncpp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E016F6D2832CB73005D7C65 /* jsoncpp.cpp */; };
B990E5C02C0E7A370094B63E /* EmotiBitTestingHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A8815F94AF8B1A79DAF932B /* EmotiBitTestingHelper.cpp */; };
- B990E5C12C0E7A370094B63E /* EmotiBitWiFiHost.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2EEA793E39D386EF32CB1ADD /* EmotiBitWiFiHost.cpp */; };
- B990E5C22C0E7A370094B63E /* EmotiBitLsl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E07BBD02BB3B46400CDD443 /* EmotiBitLsl.cpp */; };
B990E5C32C0E7A370094B63E /* EmotiBitEdaCalibration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E016F732832CE28005D7C65 /* EmotiBitEdaCalibration.cpp */; };
B990E5C42C0E7A370094B63E /* ofxLSLResolver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 948E6B5128528CA5000A8B76 /* ofxLSLResolver.cpp */; };
B990E5C52C0E7A370094B63E /* ofxBaseGui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9604B925D32EE39065747725 /* ofxBaseGui.cpp */; };
@@ -165,21 +165,22 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
- E4C2427710CC5ABF004149E2 /* CopyFiles */ = {
+ E4C2427710CC5ABF004149E2 /* Copy Files */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 7;
files = (
- 8E07BBD72BB3B5D200CDD443 /* lslOutputSettings.json in CopyFiles */,
- 8E012CDE29A5B157009FB530 /* udpOutputSettings.xml in CopyFiles */,
- 8E016F862832D594005D7C65 /* emotibitCommSettings.json in CopyFiles */,
- 8E6079EA27C978BE00959DDB /* inputSettings.xml in CopyFiles */,
- 8E6079EB27C978BE00959DDB /* ofxOscilloscopeSettings.xml in CopyFiles */,
- 941B2FC325BA241400BB7E84 /* oscOutputSettings.xml in CopyFiles */,
- 941B2FC425BA241400BB7E84 /* verdana.ttf in CopyFiles */,
- 941B2FC525BA241400BB7E84 /* verdanab.ttf in CopyFiles */,
- );
+ 8E07BBD72BB3B5D200CDD443 /* lslOutputSettings.json in Copy Files */,
+ 8E012CDE29A5B157009FB530 /* udpOutputSettings.xml in Copy Files */,
+ 8E016F862832D594005D7C65 /* emotibitCommSettings.json in Copy Files */,
+ 8E6079EA27C978BE00959DDB /* inputSettings.xml in Copy Files */,
+ 8E6079EB27C978BE00959DDB /* ofxOscilloscopeSettings.xml in Copy Files */,
+ 941B2FC325BA241400BB7E84 /* oscOutputSettings.xml in Copy Files */,
+ 941B2FC425BA241400BB7E84 /* verdana.ttf in Copy Files */,
+ 941B2FC525BA241400BB7E84 /* verdanab.ttf in Copy Files */,
+ );
+ name = "Copy Files";
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */
@@ -219,7 +220,6 @@
2B40EDA85BEB63E46785BC29 /* tinyxml.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = tinyxml.cpp; path = ../../../addons/ofxXmlSettings/libs/tinyxml.cpp; sourceTree = SOURCE_ROOT; };
2BE946CC0D0FAFAFB318D357 /* NetworkUtils.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = NetworkUtils.h; path = ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include/ofx/Net/NetworkUtils.h; sourceTree = SOURCE_ROOT; };
2D45A496EFB9F361A92C1F2A /* ct.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ct.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/ct.h; sourceTree = SOURCE_ROOT; };
- 2EEA793E39D386EF32CB1ADD /* EmotiBitWiFiHost.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = EmotiBitWiFiHost.cpp; path = ../../../addons/ofxEmotiBit/src/EmotiBitWiFiHost.cpp; sourceTree = SOURCE_ROOT; };
2F519EB3B0DCD7378FB86ABE /* ofxUDPManager.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxUDPManager.h; path = ../../../addons/ofxNetwork/src/ofxUDPManager.h; sourceTree = SOURCE_ROOT; };
2FA5A4362497FA77DF9B5A19 /* IPAddressRange.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = IPAddressRange.cpp; path = ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/src/IPAddressRange.cpp; sourceTree = SOURCE_ROOT; };
2FD4B0329909D3527F003494 /* UdpSocket.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = UdpSocket.h; path = ../../../addons/ofxOsc/libs/oscpack/src/ip/UdpSocket.h; sourceTree = SOURCE_ROOT; };
@@ -308,13 +308,15 @@
8E07BBCA2BB3B2BF00CDD443 /* PatchboardBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PatchboardBase.h; path = ../../../../ofxOscilloscope/ofxPatchboard/Patchboard/src/PatchboardBase.h; sourceTree = ""; };
8E07BBCB2BB3B2BF00CDD443 /* PatchboardXml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PatchboardXml.h; path = ../../../../ofxOscilloscope/ofxPatchboard/Patchboard/src/PatchboardXml.h; sourceTree = ""; };
8E07BBCC2BB3B2BF00CDD443 /* PatchboardBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PatchboardBase.cpp; path = ../../../../ofxOscilloscope/ofxPatchboard/Patchboard/src/PatchboardBase.cpp; sourceTree = ""; };
- 8E07BBD02BB3B46400CDD443 /* EmotiBitLsl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EmotiBitLsl.cpp; path = ../src/EmotiBitLsl.cpp; sourceTree = ""; };
8E07BBD12BB3B46400CDD443 /* EmotiBitOfUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EmotiBitOfUtils.h; path = ../src/EmotiBitOfUtils.h; sourceTree = ""; };
- 8E07BBD22BB3B46400CDD443 /* EmotiBitLsl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EmotiBitLsl.h; path = ../src/EmotiBitLsl.h; sourceTree = ""; };
8E07BBD32BB3B46400CDD443 /* EmotiBitOfUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EmotiBitOfUtils.cpp; path = ../src/EmotiBitOfUtils.cpp; sourceTree = ""; };
8E07BBD62BB3B5D200CDD443 /* lslOutputSettings.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = lslOutputSettings.json; path = bin/data/lslOutputSettings.json; sourceTree = ""; };
8E6079E827C978BE00959DDB /* inputSettings.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = inputSettings.xml; path = bin/data/inputSettings.xml; sourceTree = ""; };
8E6079E927C978BE00959DDB /* ofxOscilloscopeSettings.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = ofxOscilloscopeSettings.xml; path = bin/data/ofxOscilloscopeSettings.xml; sourceTree = ""; };
+ 8E80A35F2CCDAAA000C65119 /* EmotiBitLsl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EmotiBitLsl.cpp; sourceTree = ""; };
+ 8E80A3602CCDAAA000C65119 /* EmotiBitWiFiHost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EmotiBitWiFiHost.h; sourceTree = ""; };
+ 8E80A3612CCDAAA000C65119 /* EmotiBitLsl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EmotiBitLsl.h; sourceTree = ""; };
+ 8E80A3622CCDAAA000C65119 /* EmotiBitWiFiHost.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EmotiBitWiFiHost.cpp; sourceTree = ""; };
8F225C97B6ECA8B22FFB4B76 /* rc5.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = rc5.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/rc5.h; sourceTree = SOURCE_ROOT; };
907C5B5E104864A2D3A25745 /* ofxToggle.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = ofxToggle.cpp; path = ../../../addons/ofxGui/src/ofxToggle.cpp; sourceTree = SOURCE_ROOT; };
941B2FB125B8E62400BB7E84 /* verdanab.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = verdanab.ttf; path = bin/data/verdanab.ttf; sourceTree = ""; };
@@ -366,7 +368,6 @@
BC8881B3C8C0A1C45F042E7A /* OscPrintReceivedElements.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = OscPrintReceivedElements.cpp; path = ../../../addons/ofxOsc/libs/oscpack/src/osc/OscPrintReceivedElements.cpp; sourceTree = SOURCE_ROOT; };
BF88F02779DD820913ACEA06 /* ofxTCPClient.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = ofxTCPClient.cpp; path = ../../../addons/ofxNetwork/src/ofxTCPClient.cpp; sourceTree = SOURCE_ROOT; };
C04436216C2B8A5144183E83 /* dtls1.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = dtls1.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/dtls1.h; sourceTree = SOURCE_ROOT; };
- C287B861CB748483403CAEAE /* EmotiBitWiFiHost.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = EmotiBitWiFiHost.h; path = ../../../addons/ofxEmotiBit/src/EmotiBitWiFiHost.h; sourceTree = SOURCE_ROOT; };
C2FAC65C491D4231379F3298 /* ofxOscReceiver.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = ofxOscReceiver.cpp; path = ../../../addons/ofxOsc/src/ofxOscReceiver.cpp; sourceTree = SOURCE_ROOT; };
C373CBF6422737D147BA8B70 /* objects.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = objects.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/objects.h; sourceTree = SOURCE_ROOT; };
C388FEB5AAE4ED4271BE782D /* ecdsa.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ecdsa.h; path = ../../../addons/ofxPoco/libs/openssl/include/openssl/ecdsa.h; sourceTree = SOURCE_ROOT; };
@@ -827,8 +828,6 @@
4CD5C6EA1AEB082DFF01E7BE /* src */ = {
isa = PBXGroup;
children = (
- 8E07BBD02BB3B46400CDD443 /* EmotiBitLsl.cpp */,
- 8E07BBD22BB3B46400CDD443 /* EmotiBitLsl.h */,
8E07BBD32BB3B46400CDD443 /* EmotiBitOfUtils.cpp */,
8E07BBD12BB3B46400CDD443 /* EmotiBitOfUtils.h */,
8E07BBAB2B1F824D00CDD443 /* SoftwareVersionChecker.cpp */,
@@ -838,8 +837,6 @@
B37D59256BC5BDEB408A0B4B /* DoubleBuffer.h */,
7A8815F94AF8B1A79DAF932B /* EmotiBitTestingHelper.cpp */,
974B6F6CECCC45548FC1A608 /* EmotiBitTestingHelper.h */,
- 2EEA793E39D386EF32CB1ADD /* EmotiBitWiFiHost.cpp */,
- C287B861CB748483403CAEAE /* EmotiBitWiFiHost.h */,
9938519AF7D3E0C48586F0C1 /* ofxEmotiBitVersion.h */,
);
name = src;
@@ -1549,6 +1546,10 @@
E4B69E1C0A3A1BDC003C02F2 /* src */ = {
isa = PBXGroup;
children = (
+ 8E80A35F2CCDAAA000C65119 /* EmotiBitLsl.cpp */,
+ 8E80A3612CCDAAA000C65119 /* EmotiBitLsl.h */,
+ 8E80A3622CCDAAA000C65119 /* EmotiBitWiFiHost.cpp */,
+ 8E80A3602CCDAAA000C65119 /* EmotiBitWiFiHost.h */,
E4B69E1D0A3A1BDC003C02F2 /* main.cpp */,
E4B69E1E0A3A1BDC003C02F2 /* ofApp.cpp */,
E4B69E1F0A3A1BDC003C02F2 /* ofApp.h */,
@@ -1629,7 +1630,7 @@
E4B69B580A3A1756003C02F2 /* Sources */,
E4B69B590A3A1756003C02F2 /* Frameworks */,
E4B6FFFD0C3F9AB9008CF71C /* ShellScript */,
- E4C2427710CC5ABF004149E2 /* CopyFiles */,
+ E4C2427710CC5ABF004149E2 /* Copy Files */,
8466F1851C04CA0E00918B1C /* ShellScript */,
948E6B5A2852AA4B000A8B76 /* Run Script */,
);
@@ -1802,9 +1803,8 @@
B990E5BE2C0E7A370094B63E /* EmotiBitFactoryTest.cpp in Sources */,
B990E5BF2C0E7A370094B63E /* jsoncpp.cpp in Sources */,
B990E5C02C0E7A370094B63E /* EmotiBitTestingHelper.cpp in Sources */,
- B990E5C12C0E7A370094B63E /* EmotiBitWiFiHost.cpp in Sources */,
- B990E5C22C0E7A370094B63E /* EmotiBitLsl.cpp in Sources */,
B990E5C32C0E7A370094B63E /* EmotiBitEdaCalibration.cpp in Sources */,
+ 8E80A3632CCDAAA000C65119 /* EmotiBitLsl.cpp in Sources */,
B990E5C42C0E7A370094B63E /* ofxLSLResolver.cpp in Sources */,
B990E5C52C0E7A370094B63E /* ofxBaseGui.cpp in Sources */,
B990E5C62C0E7A370094B63E /* ofxButton.cpp in Sources */,
@@ -1850,6 +1850,7 @@
B990E5EE2C0E7A370094B63E /* ofxOscilloscope.cpp in Sources */,
B990E5EF2C0E7A370094B63E /* ofxThreadedLogger.cpp in Sources */,
B990E5F02C0E7A370094B63E /* tinyxml.cpp in Sources */,
+ 8E80A3652CCDAAA000C65119 /* EmotiBitWiFiHost.cpp in Sources */,
B990E5F12C0E7A370094B63E /* EmotiBitVariants.cpp in Sources */,
B990E5F22C0E7A370094B63E /* tinyxmlerror.cpp in Sources */,
B990E5F32C0E7A370094B63E /* tinyxmlparser.cpp in Sources */,
@@ -1869,9 +1870,8 @@
8E016F802832CE28005D7C65 /* EmotiBitFactoryTest.cpp in Sources */,
8E016F6E2832CB73005D7C65 /* jsoncpp.cpp in Sources */,
5FD318D4DCF1B7169E9F1F64 /* EmotiBitTestingHelper.cpp in Sources */,
- 2CB15D77D4862C444CBAD4FA /* EmotiBitWiFiHost.cpp in Sources */,
- 8E07BBD42BB3B46400CDD443 /* EmotiBitLsl.cpp in Sources */,
8E016F7D2832CE28005D7C65 /* EmotiBitEdaCalibration.cpp in Sources */,
+ 8E80A3642CCDAAA000C65119 /* EmotiBitLsl.cpp in Sources */,
948E6B5328528CA5000A8B76 /* ofxLSLResolver.cpp in Sources */,
856AA354D08AB4B323081444 /* ofxBaseGui.cpp in Sources */,
5CBB2AB3A60F65431D7B555D /* ofxButton.cpp in Sources */,
@@ -1917,6 +1917,7 @@
0059E2448E2CB4FECB0BEF66 /* ofxOscilloscope.cpp in Sources */,
9CA591B9A40F2386FE099328 /* ofxThreadedLogger.cpp in Sources */,
933A2227713C720CEFF80FD9 /* tinyxml.cpp in Sources */,
+ 8E80A3662CCDAAA000C65119 /* EmotiBitWiFiHost.cpp in Sources */,
8E016F7C2832CE28005D7C65 /* EmotiBitVariants.cpp in Sources */,
9D44DC88EF9E7991B4A09951 /* tinyxmlerror.cpp in Sources */,
5A4349E9754D6FA14C0F2A3A /* tinyxmlparser.cpp in Sources */,
@@ -2139,6 +2140,7 @@
"$(inherited)",
../../../addons/ofxLSL/libs/labstreaminglayer/lib/osx/arm,
);
+ OTHER_CPLUSPLUSFLAGS = "-D__MACOSX_CORE__";
OTHER_LDFLAGS = (
"$(OF_CORE_LIBS)",
"$(OF_CORE_FRAMEWORKS)",
@@ -2220,6 +2222,7 @@
../../../addons/ofxLSL/libs/labstreaminglayer/lib/osx/arm,
);
ONLY_ACTIVE_ARCH = YES;
+ OTHER_CPLUSPLUSFLAGS = "-D__MACOSX_CORE__";
OTHER_LDFLAGS = (
"$(OF_CORE_LIBS)",
"$(OF_CORE_FRAMEWORKS)",
@@ -2520,6 +2523,7 @@
"$(inherited)",
../../../addons/ofxLSL/libs/labstreaminglayer/lib/osx/x86_64,
);
+ OTHER_CPLUSPLUSFLAGS = "-D__MACOSX_CORE__";
OTHER_LDFLAGS = (
"$(OF_CORE_LIBS)",
"$(OF_CORE_FRAMEWORKS)",
@@ -2600,6 +2604,8 @@
"$(inherited)",
../../../addons/ofxLSL/libs/labstreaminglayer/lib/osx/x86_64,
);
+ ONLY_ACTIVE_ARCH = YES;
+ OTHER_CPLUSPLUSFLAGS = "-D__MACOSX_CORE__";
OTHER_LDFLAGS = (
"$(OF_CORE_LIBS)",
"$(OF_CORE_FRAMEWORKS)",
diff --git a/EmotiBitOscilloscope/EmotiBitOscilloscope.xcodeproj/xcshareddata/xcschemes/Debug-arm64.xcscheme b/EmotiBitOscilloscope/EmotiBitOscilloscope.xcodeproj/xcshareddata/xcschemes/Debug-arm64.xcscheme
new file mode 100644
index 0000000..92b3adc
--- /dev/null
+++ b/EmotiBitOscilloscope/EmotiBitOscilloscope.xcodeproj/xcshareddata/xcschemes/Debug-arm64.xcscheme
@@ -0,0 +1,78 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/EmotiBitOscilloscope/EmotiBitOscilloscope.xcodeproj/xcshareddata/xcschemes/Debug-x86_64.xcscheme b/EmotiBitOscilloscope/EmotiBitOscilloscope.xcodeproj/xcshareddata/xcschemes/Debug-x86_64.xcscheme
new file mode 100644
index 0000000..105b092
--- /dev/null
+++ b/EmotiBitOscilloscope/EmotiBitOscilloscope.xcodeproj/xcshareddata/xcschemes/Debug-x86_64.xcscheme
@@ -0,0 +1,78 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/EmotiBitOscilloscope/EmotiBitOscilloscope.xcodeproj/xcshareddata/xcschemes/Release-x86_64.xcscheme b/EmotiBitOscilloscope/EmotiBitOscilloscope.xcodeproj/xcshareddata/xcschemes/Release-x86_64.xcscheme
new file mode 100644
index 0000000..25bb74e
--- /dev/null
+++ b/EmotiBitOscilloscope/EmotiBitOscilloscope.xcodeproj/xcshareddata/xcschemes/Release-x86_64.xcscheme
@@ -0,0 +1,78 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/EmotiBitLsl.cpp b/EmotiBitOscilloscope/src/EmotiBitLsl.cpp
similarity index 100%
rename from src/EmotiBitLsl.cpp
rename to EmotiBitOscilloscope/src/EmotiBitLsl.cpp
diff --git a/src/EmotiBitLsl.h b/EmotiBitOscilloscope/src/EmotiBitLsl.h
similarity index 100%
rename from src/EmotiBitLsl.h
rename to EmotiBitOscilloscope/src/EmotiBitLsl.h
diff --git a/src/EmotiBitWiFiHost.cpp b/EmotiBitOscilloscope/src/EmotiBitWiFiHost.cpp
similarity index 100%
rename from src/EmotiBitWiFiHost.cpp
rename to EmotiBitOscilloscope/src/EmotiBitWiFiHost.cpp
diff --git a/src/EmotiBitWiFiHost.h b/EmotiBitOscilloscope/src/EmotiBitWiFiHost.h
similarity index 100%
rename from src/EmotiBitWiFiHost.h
rename to EmotiBitOscilloscope/src/EmotiBitWiFiHost.h