diff --git a/.github/workflows/check-installer-project-version.yml b/.github/workflows/check-installer-project-version.yml index e92acc0d..39d6944c 100644 --- a/.github/workflows/check-installer-project-version.yml +++ b/.github/workflows/check-installer-project-version.yml @@ -1,10 +1,10 @@ name: check Installer project version on: - workflow_dispatch: pull_request: types: [opened, reopened, synchronized] branches: - dev + workflow_dispatch: jobs: checkout: diff --git a/.github/workflows/create-draft-release.yml b/.github/workflows/create-draft-release.yml new file mode 100644 index 00000000..2cf95cb3 --- /dev/null +++ b/.github/workflows/create-draft-release.yml @@ -0,0 +1,182 @@ +name: Create Draft Release + +on: + pull_request: + types: [closed] + branches: + - master + workflow_dispatch: + +jobs: + create-draft-release: + runs-on: [self-hosted, Linux] + if: github.event_name == 'workflow_dispatch' || (github.event.pull_request.merged == true && github.event.pull_request.head.ref == 'dev') + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Download Mac artifacts + uses: actions/github-script@v6 + id: download-mac-artifacts + with: + script: | + const { owner, repo } = context.repo; + const workflows = await github.rest.actions.listRepoWorkflows({ owner, repo }); + const macWorkflow = workflows.data.workflows.find(w => w.name === 'upload build artifact mac'); + + if (macWorkflow) { + const runs = await github.rest.actions.listWorkflowRuns({ + owner, + repo, + workflow_id: macWorkflow.id, + branch: 'dev', + per_page: 1, + status: 'success' + }); + + if (runs.data.workflow_runs.length > 0) { + const runId = runs.data.workflow_runs[0].id; + const artifacts = await github.rest.actions.listWorkflowRunArtifacts({ + owner, + repo, + run_id: runId + }); + + for (const artifact of artifacts.data.artifacts) { + if (artifact.name === 'EmotiBitSoftware-macos') { + const download = await github.rest.actions.downloadArtifact({ + owner, + repo, + artifact_id: artifact.id, + archive_format: 'zip' + }); + + const fs = require('fs'); + fs.writeFileSync('EmotiBitSoftware-macos.zip', Buffer.from(download.data)); + core.setOutput('mac-artifact-downloaded', 'true'); + break; + } + } + } + } + + - name: Download Windows artifacts + uses: actions/github-script@v6 + id: download-win-artifacts + with: + script: | + const { owner, repo } = context.repo; + const workflows = await github.rest.actions.listRepoWorkflows({ owner, repo }); + const winWorkflow = workflows.data.workflows.find(w => w.name === 'upload build artifact Windows'); + + if (winWorkflow) { + const runs = await github.rest.actions.listWorkflowRuns({ + owner, + repo, + workflow_id: winWorkflow.id, + branch: 'dev', + per_page: 1, + status: 'success' + }); + + if (runs.data.workflow_runs.length > 0) { + const runId = runs.data.workflow_runs[0].id; + const artifacts = await github.rest.actions.listWorkflowRunArtifacts({ + owner, + repo, + run_id: runId + }); + + for (const artifact of artifacts.data.artifacts) { + if (artifact.name === 'EmotiBitSoftware-Windows') { + const download = await github.rest.actions.downloadArtifact({ + owner, + repo, + artifact_id: artifact.id, + archive_format: 'zip' + }); + + const fs = require('fs'); + fs.writeFileSync('EmotiBitSoftware-Windows.zip', Buffer.from(download.data)); + core.setOutput('win-artifact-downloaded', 'true'); + break; + } + } + } + } + + - name: Generate release notes + id: generate-release-notes + run: | + RELEASE_NOTES=$(cat <<-END_OF_NOTES + # New features and bug fixes + + # Firmware Installed by FirmwareInstaller + EmotiBit firmware [`vx.x.x`](enter-url-here) + + # PRs completed + + # Installation + #### Windows + - Download the `EmotiBitSoftware-Windows.zip` linked below. + - Extract the zip file downloaded + - run the `.msi` installer file. + - If the **Windows Defender Smartscreen** pops up, click on `More info` and `Run anyway` + - The `EmotiBit Oscilloscope` and `EmotiBit DataParser` will be installed on your system. + - You can access the software from the `Start` menu under `EmotiBit` or from the desktop shortcut. + + #### macOS + - Download `EmotiBitSoftware-macOS` + - Extract the downloaded zip file. + - The extracted folder will contain `EmotiBit Oscilloscope` and `EmotiBit DataParser`. + - Right-click and select `Open` to run the executables + + #### Linux + - Download the source code linked below. Follow the steps in the [ReadMe](https://github.com/EmotiBit/ofxEmotiBit#readme). + + + END_OF_NOTES + ) + echo "release_notes<> $GITHUB_OUTPUT + echo "$RELEASE_NOTES" >> $GITHUB_OUTPUT + echo "EOF" >> $GITHUB_OUTPUT + + - name: Get version from source + id: get_version + run: | + VERSION=$(grep src/ofxEmotiBitVersion.h -e "ofxEmotiBitVersion" | grep -o '"[^"]*"' | tr -d '"') + echo "version=$VERSION" >> $GITHUB_OUTPUT + echo "tag=v$VERSION" >> $GITHUB_OUTPUT + + - name: Create config.txt + id: create-config + run: | + CONFIG_CONTENT=$(cat <<-END_OF_CONFIG + { + "WifiCredentials": [ + { + "ssid": "YOUR_WIFI_NAME_GOES_HERE", + "password": "YOUR_WIFI_PASSWORD_GOES_HERE" + } + ] + } + END_OF_CONFIG + ) + echo "$CONFIG_CONTENT" > config.txt + echo "Config file created successfully" + + - name: Create Draft Release + id: create-release + uses: softprops/action-gh-release@v1 + with: + draft: true + tag_name: ${{ steps.get_version.outputs.tag }} + name: Draft Release ${{ steps.get_version.outputs.tag }} + body: ${{ steps.generate-release-notes.outputs.release_notes }} + files: | + EmotiBitSoftware-macos.zip + EmotiBitSoftware-Windows.zip + config.txt + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.gitignore b/.gitignore index f6612091..46f38f61 100644 --- a/.gitignore +++ b/.gitignore @@ -51,5 +51,5 @@ *Results.txt */bin EmotiBitIcons/otherFormats -*/*xcodeproj/*data/* -*/*xcodeproj/*workspace/* \ No newline at end of file +*/*xcodeproj/*workspace/* +**/xcuser*/** diff --git a/EmotiBitDataParser/EmotiBitDataParser.xcodeproj/project.pbxproj b/EmotiBitDataParser/EmotiBitDataParser.xcodeproj/project.pbxproj index d995d19c..7816b8dd 100644 --- a/EmotiBitDataParser/EmotiBitDataParser.xcodeproj/project.pbxproj +++ b/EmotiBitDataParser/EmotiBitDataParser.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 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 */; }; 5CBB2AB3A60F65431D7B555D /* ofxButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C88333E71C9457E441C33474 /* ofxButton.cpp */; }; @@ -14,12 +15,12 @@ 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 */; }; - 8E80A3682CCDAE9300C65119 /* EmotiBitPacket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E80A3672CCDAE9300C65119 /* EmotiBitPacket.cpp */; }; + 8EF01A6B2E43AE9F00BF0971 /* EmotiBitPacket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8EF01A6A2E43AE9F00BF0971 /* EmotiBitPacket.cpp */; }; + 8EF01A6F2E43B07100BF0971 /* parsedDataFormat.json in Copy files to Resources */ = {isa = PBXBuildFile; fileRef = 8EF01A6D2E43B07100BF0971 /* parsedDataFormat.json */; }; + 8EF01A702E43B07100BF0971 /* verdana.ttf in Copy files to Resources */ = {isa = PBXBuildFile; fileRef = 8EF01A6E2E43B07100BF0971 /* verdana.ttf */; }; 9CA591B9A40F2386FE099328 /* ofxThreadedLogger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D6D75E57C2EB53518090D07A /* ofxThreadedLogger.cpp */; }; B266578FC55D23BFEBC042E7 /* ofxGuiGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECF8674C7975F1063C5E30CA /* ofxGuiGroup.cpp */; }; B56FE57CC35806596D38118C /* ofxSliderGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 802251BAF1B35B1D67B32FD0 /* ofxSliderGroup.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 */; }; E4B69E200A3A1BDC003C02F2 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4B69E1D0A3A1BDC003C02F2 /* main.cpp */; }; E4B69E210A3A1BDC003C02F2 /* ofApp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4B69E1E0A3A1BDC003C02F2 /* ofApp.cpp */; }; @@ -28,16 +29,16 @@ /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ - B990E6192C1CAADE0094B63E /* Copy Resources */ = { + 8EF01A6C2E43B03D00BF0971 /* Copy files to Resources */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; dstPath = ""; dstSubfolderSpec = 7; files = ( - B990E61C2C1CAB040094B63E /* parsedDataFormat.json in Copy Resources */, - B990E61D2C1CAB040094B63E /* verdana.ttf in Copy Resources */, + 8EF01A6F2E43B07100BF0971 /* parsedDataFormat.json in Copy files to Resources */, + 8EF01A702E43B07100BF0971 /* verdana.ttf in Copy files to Resources */, ); - name = "Copy Resources"; + name = "Copy files to Resources"; runOnlyForDeploymentPostprocessing = 0; }; E4C2427710CC5ABF004149E2 /* CopyFiles */ = { @@ -53,36 +54,105 @@ /* Begin PBXFileReference section */ 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; }; + 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; }; 15F2C6477A769C03A56D1401 /* ofxSlider.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = ofxSlider.cpp; path = ../../../addons/ofxGui/src/ofxSlider.cpp; 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; }; + 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; }; 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; }; + 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; }; 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; }; + 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; }; + 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; }; + 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; }; 52AFA1F08C420992CAAAE648 /* ofxSlider.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxSlider.h; path = ../../../addons/ofxGui/src/ofxSlider.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; }; + 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; }; 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; }; - 8E80A3672CCDAE9300C65119 /* EmotiBitPacket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EmotiBitPacket.cpp; path = ../../EmotiBit_XPlat_Utils/src/EmotiBitPacket.cpp; sourceTree = ""; }; + 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; }; + 8EF01A6A2E43AE9F00BF0971 /* EmotiBitPacket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EmotiBitPacket.cpp; path = ../../../addons/EmotiBit_XPlat_Utils/src/EmotiBitPacket.cpp; sourceTree = ""; }; + 8EF01A6D2E43B07100BF0971 /* parsedDataFormat.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = parsedDataFormat.json; path = bin/data/parsedDataFormat.json; sourceTree = ""; }; + 8EF01A6E2E43B07100BF0971 /* verdana.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = verdana.ttf; path = bin/data/verdana.ttf; 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; }; 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; }; + 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; }; 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; }; + 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; }; + 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; }; + 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; }; + 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; }; - 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; }; + 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; }; + 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; }; 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; }; @@ -265,8 +335,15 @@ 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; }; + 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 */ @@ -280,6 +357,15 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 0117D94CE0C695E5E5482BEC /* ofxPoco */ = { + isa = PBXGroup; + children = ( + 959BC13926B6C962531CEF17 /* libs */, + 0EFE45161A4E28BDE46D84D0 /* src */, + ); + name = ofxPoco; + sourceTree = ""; + }; 0B8ED02ED04845BC31B3E518 /* ofxEmotiBit */ = { isa = PBXGroup; children = ( @@ -288,6 +374,23 @@ name = ofxEmotiBit; sourceTree = ""; }; + 0EFE45161A4E28BDE46D84D0 /* src */ = { + isa = PBXGroup; + children = ( + E9998694E5001F9CF0B13BF0 /* ofxXmlPoco.cpp */, + 7200EB1EC64977ED08AC0111 /* ofxXmlPoco.h */, + ); + name = src; + sourceTree = ""; + }; + 13C2436A78CDB4354594CA7D /* include */ = { + isa = PBXGroup; + children = ( + 70E25EBAAB745F09329DDB44 /* openssl */, + ); + name = include; + sourceTree = ""; + }; 2865DAEF86B1907A704CA70B /* ofxJSON */ = { isa = PBXGroup; children = ( @@ -347,6 +450,103 @@ name = local_addons; 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 = ""; + }; + 8EF01A692E43AE8500BF0971 /* EmotiBit_XPlat_Utils */ = { + isa = PBXGroup; + children = ( + 8EF01A6A2E43AE9F00BF0971 /* EmotiBitPacket.cpp */, + ); + name = EmotiBit_XPlat_Utils; + sourceTree = ""; + }; + 959BC13926B6C962531CEF17 /* libs */ = { + isa = PBXGroup; + children = ( + B2C98B62869583DB9FE30DA7 /* openssl */, + ); + name = libs; + sourceTree = ""; + }; 977A836DD2C489CCC5E330FF /* jsoncpp */ = { isa = PBXGroup; children = ( @@ -385,29 +585,22 @@ name = src; sourceTree = ""; }; - B990E6102C1272A70094B63E /* EmotiBit_XPlat_Utils */ = { - isa = PBXGroup; - children = ( - B990E6122C17F4B70094B63E /* src */, - ); - name = EmotiBit_XPlat_Utils; - sourceTree = ""; - }; - B990E6122C17F4B70094B63E /* src */ = { + B2C98B62869583DB9FE30DA7 /* openssl */ = { isa = PBXGroup; children = ( - 8E80A3672CCDAE9300C65119 /* EmotiBitPacket.cpp */, + 13C2436A78CDB4354594CA7D /* include */, ); - name = src; + name = openssl; sourceTree = ""; }; BB4B014C10F69532006C3DED /* addons */ = { isa = PBXGroup; children = ( - B990E6102C1272A70094B63E /* EmotiBit_XPlat_Utils */, + 8EF01A692E43AE8500BF0971 /* EmotiBit_XPlat_Utils */, 0B8ED02ED04845BC31B3E518 /* ofxEmotiBit */, 480A780D8D0308AE4A368801 /* ofxGui */, 2865DAEF86B1907A704CA70B /* ofxJSON */, + 0117D94CE0C695E5E5482BEC /* ofxPoco */, 3286A6A80FB3354E8DF1D5B8 /* ofxThreadedLogger */, ); name = addons; @@ -723,8 +916,8 @@ E4B69B4A0A3A1720003C02F2 = { isa = PBXGroup; children = ( - B990E61A2C1CAB040094B63E /* parsedDataFormat.json */, - B990E61B2C1CAB040094B63E /* verdana.ttf */, + 8EF01A6D2E43B07100BF0971 /* parsedDataFormat.json */, + 8EF01A6E2E43B07100BF0971 /* verdana.ttf */, E4B6FCAD0C3E899E008CF71C /* openFrameworks-Info.plist */, E4EB6923138AFD0F00A09F29 /* Project.xcconfig */, E4B69E1C0A3A1BDC003C02F2 /* src */, @@ -766,7 +959,7 @@ E4B6FFFD0C3F9AB9008CF71C /* ShellScript */, E4C2427710CC5ABF004149E2 /* CopyFiles */, 8466F1851C04CA0E00918B1C /* ShellScript */, - B990E6192C1CAADE0094B63E /* Copy Resources */, + 8EF01A6C2E43B03D00BF0971 /* Copy files to Resources */, ); buildRules = ( ); @@ -852,7 +1045,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 8E80A3682CCDAE9300C65119 /* EmotiBitPacket.cpp in Sources */, + 8EF01A6B2E43AE9F00BF0971 /* EmotiBitPacket.cpp in Sources */, E4B69E200A3A1BDC003C02F2 /* main.cpp in Sources */, E4B69E210A3A1BDC003C02F2 /* ofApp.cpp in Sources */, 856AA354D08AB4B323081444 /* ofxBaseGui.cpp in Sources */, @@ -867,6 +1060,7 @@ 1CD33E884D9E3358252E82A1 /* ofxToggle.cpp in Sources */, FB84AAF8D1B7A95266DB5C09 /* jsoncpp.cpp in Sources */, BEDFEE7400C58EA4E412B757 /* ofxJSONElement.cpp in Sources */, + 1C36947250DCB09A8A375C0C /* ofxXmlPoco.cpp in Sources */, 9CA591B9A40F2386FE099328 /* ofxThreadedLogger.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -908,20 +1102,10 @@ ../../../addons/ofxJSON/libs/jsoncpp/include/json, ../../../addons/ofxJSON/libs/jsoncpp/src, ../../../addons/ofxJSON/src, - ../../../addons/ofxNetwork/src, ../../../addons/ofxPoco/libs/poco/include, ../../../addons/ofxPoco/src, ../../../addons/ofxPoco/libs/openssl/include, - ../../../addons/ofxNetworkUtils/libs, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include/ofx, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include/ofx/Net, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/src, - ../../../addons/ofxNetworkUtils/src, ../../../addons/ofxThreadedLogger/src, - ../../../addons/ofxXmlSettings/libs, - ../../../addons/ofxXmlSettings/src, ); MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_CODE_SIGN_FLAGS = "--deep"; @@ -953,28 +1137,21 @@ ../../../addons/ofxJSON/libs/jsoncpp/include/json, ../../../addons/ofxJSON/libs/jsoncpp/src, ../../../addons/ofxJSON/src, - ../../../addons/ofxNetwork/src, ../../../addons/ofxPoco/libs/poco/include, ../../../addons/ofxPoco/src, ../../../addons/ofxPoco/libs/openssl/include, - ../../../addons/ofxNetworkUtils/libs, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include/ofx, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include/ofx/Net, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/src, - ../../../addons/ofxNetworkUtils/src, ../../../addons/ofxThreadedLogger/src, - ../../../addons/ofxXmlSettings/libs, - ../../../addons/ofxXmlSettings/src, ../../../addons/EmotiBit_XPlat_Utils/src, - ../../../addons/ofxOscilloscope/src, ); ICON = "$(ICON_NAME_RELEASE)"; ICON_FILE = "$(ICON_FILE_PATH)$(ICON)"; + ICON_FILE_PATH = ../EmotiBitIcons/macOS/; + ICON_NAME_DEBUG = EmotiBit.icns; + ICON_NAME_RELEASE = EmotiBit.icns; INFOPLIST_FILE = "openFrameworks-Info.plist"; INSTALL_PATH = /Applications; LIBRARY_SEARCH_PATHS = "$(inherited)"; + MACOSX_DEPLOYMENT_TARGET = 10.14; OTHER_LDFLAGS = ( "$(OF_CORE_LIBS)", "$(OF_CORE_FRAMEWORKS)", @@ -1027,20 +1204,10 @@ ../../../addons/ofxJSON/libs/jsoncpp/include/json, ../../../addons/ofxJSON/libs/jsoncpp/src, ../../../addons/ofxJSON/src, - ../../../addons/ofxNetwork/src, ../../../addons/ofxPoco/libs/poco/include, ../../../addons/ofxPoco/src, ../../../addons/ofxPoco/libs/openssl/include, - ../../../addons/ofxNetworkUtils/libs, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include/ofx, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include/ofx/Net, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/src, - ../../../addons/ofxNetworkUtils/src, ../../../addons/ofxThreadedLogger/src, - ../../../addons/ofxXmlSettings/libs, - ../../../addons/ofxXmlSettings/src, ); MACOSX_DEPLOYMENT_TARGET = 10.9; ONLY_ACTIVE_ARCH = YES; @@ -1083,20 +1250,10 @@ ../../../addons/ofxJSON/libs/jsoncpp/include/json, ../../../addons/ofxJSON/libs/jsoncpp/src, ../../../addons/ofxJSON/src, - ../../../addons/ofxNetwork/src, ../../../addons/ofxPoco/libs/poco/include, ../../../addons/ofxPoco/src, ../../../addons/ofxPoco/libs/openssl/include, - ../../../addons/ofxNetworkUtils/libs, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include/ofx, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include/ofx/Net, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/src, - ../../../addons/ofxNetworkUtils/src, ../../../addons/ofxThreadedLogger/src, - ../../../addons/ofxXmlSettings/libs, - ../../../addons/ofxXmlSettings/src, ); MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_CODE_SIGN_FLAGS = "--deep"; @@ -1128,28 +1285,21 @@ ../../../addons/ofxJSON/libs/jsoncpp/include/json, ../../../addons/ofxJSON/libs/jsoncpp/src, ../../../addons/ofxJSON/src, - ../../../addons/ofxNetwork/src, ../../../addons/ofxPoco/libs/poco/include, ../../../addons/ofxPoco/src, ../../../addons/ofxPoco/libs/openssl/include, - ../../../addons/ofxNetworkUtils/libs, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include/ofx, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include/ofx/Net, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/src, - ../../../addons/ofxNetworkUtils/src, ../../../addons/ofxThreadedLogger/src, - ../../../addons/ofxXmlSettings/libs, - ../../../addons/ofxXmlSettings/src, ../../../addons/EmotiBit_XPlat_Utils/src, - ../../../addons/ofxOscilloscope/src, ); ICON = "$(ICON_NAME_DEBUG)"; ICON_FILE = "$(ICON_FILE_PATH)$(ICON)"; + ICON_FILE_PATH = ../EmotiBitIcons/macOS/; + ICON_NAME_DEBUG = EmotiBit.icns; + ICON_NAME_RELEASE = EmotiBit.icns; INFOPLIST_FILE = "openFrameworks-Info.plist"; INSTALL_PATH = /Applications; LIBRARY_SEARCH_PATHS = "$(inherited)"; + MACOSX_DEPLOYMENT_TARGET = 10.14; OTHER_LDFLAGS = ( "$(OF_CORE_LIBS)", "$(OF_CORE_FRAMEWORKS)", @@ -1191,28 +1341,21 @@ ../../../addons/ofxJSON/libs/jsoncpp/include/json, ../../../addons/ofxJSON/libs/jsoncpp/src, ../../../addons/ofxJSON/src, - ../../../addons/ofxNetwork/src, ../../../addons/ofxPoco/libs/poco/include, ../../../addons/ofxPoco/src, ../../../addons/ofxPoco/libs/openssl/include, - ../../../addons/ofxNetworkUtils/libs, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include/ofx, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include/ofx/Net, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/src, - ../../../addons/ofxNetworkUtils/src, ../../../addons/ofxThreadedLogger/src, - ../../../addons/ofxXmlSettings/libs, - ../../../addons/ofxXmlSettings/src, ../../../addons/EmotiBit_XPlat_Utils/src, - ../../../addons/ofxOscilloscope/src, ); ICON = "$(ICON_NAME_RELEASE)"; ICON_FILE = "$(ICON_FILE_PATH)$(ICON)"; + ICON_FILE_PATH = ../EmotiBitIcons/macOS/; + ICON_NAME_DEBUG = EmotiBit.icns; + ICON_NAME_RELEASE = EmotiBit.icns; INFOPLIST_FILE = "openFrameworks-Info.plist"; INSTALL_PATH = /Applications; LIBRARY_SEARCH_PATHS = "$(inherited)"; + MACOSX_DEPLOYMENT_TARGET = 10.14; OTHER_LDFLAGS = ( "$(OF_CORE_LIBS)", "$(OF_CORE_FRAMEWORKS)", diff --git a/EmotiBitDataParser/EmotiBitDataParser.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme b/EmotiBitDataParser/EmotiBitDataParser.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme index e27329dc..929dc4dc 100644 --- a/EmotiBitDataParser/EmotiBitDataParser.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme +++ b/EmotiBitDataParser/EmotiBitDataParser.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme @@ -1,6 +1,6 @@ + + + + @@ -56,7 +65,7 @@ shouldUseLaunchSchemeArgsEnv = "YES" savedToolIdentifier = "" useCustomWorkingDirectory = "NO" - debugDocumentVersioning = "YES"> + debugDocumentVersioning = "NO"> diff --git a/EmotiBitDataParser/EmotiBitDataParser.xcodeproj/xcshareddata/xcschemes/Release.xcscheme b/EmotiBitDataParser/EmotiBitDataParser.xcodeproj/xcshareddata/xcschemes/Release.xcscheme index ad541f20..4ea14365 100644 --- a/EmotiBitDataParser/EmotiBitDataParser.xcodeproj/xcshareddata/xcschemes/Release.xcscheme +++ b/EmotiBitDataParser/EmotiBitDataParser.xcodeproj/xcshareddata/xcschemes/Release.xcscheme @@ -1,6 +1,6 @@ + + + + @@ -56,7 +65,7 @@ shouldUseLaunchSchemeArgsEnv = "YES" savedToolIdentifier = "" useCustomWorkingDirectory = "NO" - debugDocumentVersioning = "YES"> + debugDocumentVersioning = "NO"> + buildConfiguration = "Release"> English CFBundleExecutable ${EXECUTABLE_NAME} + CFBundleIconFile + ${ICON} CFBundleIdentifier cc.openFrameworks.${EXECUTABLE_NAME} CFBundleInfoDictionaryVersion @@ -16,10 +18,10 @@ ???? CFBundleVersion 1.0 - CFBundleIconFile - ${ICON} NSCameraUsageDescription This app needs to access the camera + NSHighResolutionCapable + NSMicrophoneUsageDescription This app needs to access the microphone diff --git a/EmotiBitFirmwareInstaller/EmotiBitFirmwareInstaller.xcodeproj/project.pbxproj b/EmotiBitFirmwareInstaller/EmotiBitFirmwareInstaller.xcodeproj/project.pbxproj index 6fbb6d59..e4d4c189 100644 --- a/EmotiBitFirmwareInstaller/EmotiBitFirmwareInstaller.xcodeproj/project.pbxproj +++ b/EmotiBitFirmwareInstaller/EmotiBitFirmwareInstaller.xcodeproj/project.pbxproj @@ -9,7 +9,6 @@ /* Begin PBXBuildFile section */ 00C132F18095103B36BC4B5C /* memory.c in Sources */ = {isa = PBXBuildFile; fileRef = ADC45E383B2885CD8ED44C32 /* memory.c */; }; 04BC555ECE44AFF182D37D27 /* SerialEvents.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FF1FC9CD893EAFB39035E3C6 /* SerialEvents.cpp */; }; - 125506CD3E5F428AAFE5CC65 /* ofxTCPManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F399B91E98DC31CDA6DDACB4 /* ofxTCPManager.cpp */; }; 1298066D39CE7EC3DA60256A /* snappy-stubs-internal.cc in Sources */ = {isa = PBXBuildFile; fileRef = 2FB74FF42B08FC378F74B2B7 /* snappy-stubs-internal.cc */; }; 199E20C3CE29DBDA5F9DA16C /* BufferedSerialDevice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDB137BD0187E28CD8B59874 /* BufferedSerialDevice.cpp */; }; 1C36947250DCB09A8A375C0C /* ofxXmlPoco.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9998694E5001F9CF0B13BF0 /* ofxXmlPoco.cpp */; }; @@ -37,16 +36,12 @@ 52879B293457F714C2FCDE30 /* bit_reader.c in Sources */ = {isa = PBXBuildFile; fileRef = 435F153348292B6921D118D7 /* bit_reader.c */; }; 52E0D9D8CC9D0F3AB04182F5 /* entropy_encode.c in Sources */ = {isa = PBXBuildFile; fileRef = CA68874B4EA8C0D647FA49C8 /* entropy_encode.c */; }; 55DE46182F529D5E0D756503 /* win.cc in Sources */ = {isa = PBXBuildFile; fileRef = D1B098B33ACA6D5EF0DE53FB /* win.cc */; }; - 5A4349E9754D6FA14C0F2A3A /* tinyxmlparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FC5DA1C87211D4F6377DA719 /* tinyxmlparser.cpp */; }; 5AE4CDDF24D05CAD3D2863A7 /* streams.cc in Sources */ = {isa = PBXBuildFile; fileRef = 3457BE6FA2A60931AED56935 /* streams.cc */; }; 5B0B37678CB86DF7936E36E6 /* dictionary.c in Sources */ = {isa = PBXBuildFile; fileRef = 784C0DB32ADDBDBF29DB5910 /* dictionary.c */; }; 5BB82711925A3764235C2CEB /* FileExtensionFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BD291FB03292C6D352C26FE /* FileExtensionFilter.cpp */; }; 5CBB2AB3A60F65431D7B555D /* ofxButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C88333E71C9457E441C33474 /* ofxButton.cpp */; }; 62509F39EA6197BEA0194276 /* ByteBufferReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 021CAF811F031FFBDFB18797 /* ByteBufferReader.cpp */; }; - 63B57AC5BF4EF088491E0317 /* ofxXmlSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50DF87D612C5AAE17AAFA6C0 /* ofxXmlSettings.cpp */; }; - 661A1991F5CE4CCC2919D8E7 /* ofxNetworkUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AE30B18B42BAF0E92CB140E5 /* ofxNetworkUtils.cpp */; }; 66A80FD312926DEB8C9FE7F6 /* ByteBufferUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE5B3B19544657B6F9CCCA03 /* ByteBufferUtils.cpp */; }; - 66CA411C5A9664E27326BF36 /* ofxTCPServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C085E327DAB912CFA2A443D /* ofxTCPServer.cpp */; }; 72BCC46DF35982704F1906BD /* brotli_bit_stream.c in Sources */ = {isa = PBXBuildFile; fileRef = 863E9634DCC98853BF984072 /* brotli_bit_stream.c */; }; 790CD6606BE3D38A9AD52AF1 /* URIEncoding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 60F63F5C68476F0C9095B247 /* URIEncoding.cpp */; }; 79B473EA502400F08F6C420D /* static_dict.c in Sources */ = {isa = PBXBuildFile; fileRef = 838AF229C2183CBDCC150342 /* static_dict.c */; }; @@ -61,35 +56,29 @@ 86B56E23D787A5F24641398F /* LinkFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 370DA13018950E5BFF8CF171 /* LinkFilter.cpp */; }; 899BAF53175868463FE1B029 /* RecursiveDirectoryIteratorStategies.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F27637AABA89A235C5974D56 /* RecursiveDirectoryIteratorStategies.cpp */; }; 89D1BB84C86305D9A5C34DC4 /* list_ports_osx.cc in Sources */ = {isa = PBXBuildFile; fileRef = 857A942126908B1806B67CE6 /* list_ports_osx.cc */; }; + 8EF01AA42E43E59600BF0971 /* EmotiBit.png in Copy Files to Resources */ = {isa = PBXBuildFile; fileRef = 8EF01A9E2E43E59600BF0971 /* EmotiBit.png */; }; + 8EF01AA52E43E59600BF0971 /* verdana.ttf in Copy Files to Resources */ = {isa = PBXBuildFile; fileRef = 8EF01A9F2E43E59600BF0971 /* verdana.ttf */; }; + 8EF01AA62E43E59600BF0971 /* EmotiBit_stock_firmware.ino.feather_esp32.bin in Copy Files to Resources */ = {isa = PBXBuildFile; fileRef = 8EF01AA02E43E59600BF0971 /* EmotiBit_stock_firmware.ino.feather_esp32.bin */; }; + 8EF01AA72E43E59600BF0971 /* verdanab.ttf in Copy Files to Resources */ = {isa = PBXBuildFile; fileRef = 8EF01AA12E43E59600BF0971 /* verdanab.ttf */; }; + 8EF01AA82E43E59600BF0971 /* bossac in Copy Files to Resources */ = {isa = PBXBuildFile; fileRef = 8EF01AA22E43E59600BF0971 /* bossac */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + 8EF01AA92E43E59600BF0971 /* EmotiBit_stock_firmware.ino.feather_m0.bin in Copy Files to Resources */ = {isa = PBXBuildFile; fileRef = 8EF01AA32E43E59600BF0971 /* EmotiBit_stock_firmware.ino.feather_m0.bin */; }; + 8EF01AAF2E43E5C200BF0971 /* m2m_aio_3a0.bin in Copy Files to Resources/WINC */ = {isa = PBXBuildFile; fileRef = 8EF01AAB2E43E5C200BF0971 /* m2m_aio_3a0.bin */; }; + 8EF01AB02E43E5C200BF0971 /* FirmwareUpdater.ino.feather_m0.bin in Copy Files to Resources/WINC */ = {isa = PBXBuildFile; fileRef = 8EF01AAC2E43E5C200BF0971 /* FirmwareUpdater.ino.feather_m0.bin */; }; + 8EF01AB12E43E5C200BF0971 /* FirmwareUploader in Copy Files to Resources/WINC */ = {isa = PBXBuildFile; fileRef = 8EF01AAD2E43E5C200BF0971 /* FirmwareUploader */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + 8EF01AB22E43E5C200BF0971 /* LICENSE.txt in Copy Files to Resources/WINC */ = {isa = PBXBuildFile; fileRef = 8EF01AAE2E43E5C200BF0971 /* LICENSE.txt */; }; + 8EF01AB82E43E5EB00BF0971 /* correctHibernateSwitch.jpg in Copy Files to Resources/instructions */ = {isa = PBXBuildFile; fileRef = 8EF01AB42E43E5EB00BF0971 /* correctHibernateSwitch.jpg */; }; + 8EF01AB92E43E5EB00BF0971 /* un-plugInEmotiBit.jpg in Copy Files to Resources/instructions */ = {isa = PBXBuildFile; fileRef = 8EF01AB52E43E5EB00BF0971 /* un-plugInEmotiBit.jpg */; }; + 8EF01ABA2E43E5EB00BF0971 /* pressResetButton.jpg in Copy Files to Resources/instructions */ = {isa = PBXBuildFile; fileRef = 8EF01AB62E43E5EB00BF0971 /* pressResetButton.jpg */; }; + 8EF01ABB2E43E5EB00BF0971 /* plugInEmotiBit.jpg in Copy Files to Resources/instructions */ = {isa = PBXBuildFile; fileRef = 8EF01AB72E43E5EB00BF0971 /* plugInEmotiBit.jpg */; }; + 8EF01AC02E43E60F00BF0971 /* EmotiBit_stock_firmware.partitions.bin in Copy Files to Resources/esp32 */ = {isa = PBXBuildFile; fileRef = 8EF01ABD2E43E60F00BF0971 /* EmotiBit_stock_firmware.partitions.bin */; }; + 8EF01AC12E43E60F00BF0971 /* boot_app0.bin in Copy Files to Resources/esp32 */ = {isa = PBXBuildFile; fileRef = 8EF01ABE2E43E60F00BF0971 /* boot_app0.bin */; }; + 8EF01AC22E43E60F00BF0971 /* EmotiBit_stock_firmware.ino.bootloader.bin in Copy Files to Resources/esp32 */ = {isa = PBXBuildFile; fileRef = 8EF01ABF2E43E60F00BF0971 /* EmotiBit_stock_firmware.ino.bootloader.bin */; }; + 8EF01AC52E43E62A00BF0971 /* esptool in Copy Files to Resources/exec/mac */ = {isa = PBXBuildFile; fileRef = 8EF01AC42E43E62A00BF0971 /* esptool */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 8FCD72DD7D027102A10390B3 /* backward_references.c in Sources */ = {isa = PBXBuildFile; fileRef = 4212102D1CF2815EEEC62736 /* backward_references.c */; }; - 933A2227713C720CEFF80FD9 /* tinyxml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B40EDA85BEB63E46785BC29 /* tinyxml.cpp */; }; 93640C223A2F5BEAD6DA2E35 /* Compression.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2FC8E2266FE2F5545775A16D /* Compression.cpp */; }; - 9491A58D288610930052D418 /* EmotiBit_stock_firmware.ino.feather_esp32.bin in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9491A589288610920052D418 /* EmotiBit_stock_firmware.ino.feather_esp32.bin */; }; - 94D8E5BE288751EB0071C7AF /* EmotiBit_stock_firmware.ino.bootloader.bin in CopyFiles */ = {isa = PBXBuildFile; fileRef = 94D8E5BB288751EB0071C7AF /* EmotiBit_stock_firmware.ino.bootloader.bin */; }; - 94D8E5BF288751EB0071C7AF /* EmotiBit_stock_firmware.partitions.bin in CopyFiles */ = {isa = PBXBuildFile; fileRef = 94D8E5BC288751EB0071C7AF /* EmotiBit_stock_firmware.partitions.bin */; }; - 94D8E5C0288751EB0071C7AF /* boot_app0.bin in CopyFiles */ = {isa = PBXBuildFile; fileRef = 94D8E5BD288751EB0071C7AF /* boot_app0.bin */; }; - 94D8E5C32887522A0071C7AF /* esptool in CopyFiles */ = {isa = PBXBuildFile; fileRef = 94D8E5C22887522A0071C7AF /* esptool */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; - 94D8E5C8288753D70071C7AF /* plugInEmotiBit.jpg in CopyFiles */ = {isa = PBXBuildFile; fileRef = 94D8E5C5288753D70071C7AF /* plugInEmotiBit.jpg */; }; - 94D8E5C9288753D70071C7AF /* correctHibernateSwitch.jpg in CopyFiles */ = {isa = PBXBuildFile; fileRef = 94D8E5C6288753D70071C7AF /* correctHibernateSwitch.jpg */; }; - 94D8E5CA288753D70071C7AF /* pressResetButton.jpg in CopyFiles */ = {isa = PBXBuildFile; fileRef = 94D8E5C7288753D70071C7AF /* pressResetButton.jpg */; }; - 94D8E5D02887543B0071C7AF /* FirmwareUploader in CopyFiles */ = {isa = PBXBuildFile; fileRef = 94D8E5CC2887543A0071C7AF /* FirmwareUploader */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; - 94D8E5D12887543B0071C7AF /* FirmwareUpdater.ino.feather_m0.bin in CopyFiles */ = {isa = PBXBuildFile; fileRef = 94D8E5CD2887543A0071C7AF /* FirmwareUpdater.ino.feather_m0.bin */; }; - 94D8E5D22887543B0071C7AF /* m2m_aio_3a0.bin in CopyFiles */ = {isa = PBXBuildFile; fileRef = 94D8E5CE2887543A0071C7AF /* m2m_aio_3a0.bin */; }; - 94D8E5D32887543B0071C7AF /* LICENSE.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 94D8E5CF2887543A0071C7AF /* LICENSE.txt */; }; - 94D8E5D528931E780071C7AF /* un-plugInEmotiBit.jpg in CopyFiles */ = {isa = PBXBuildFile; fileRef = 94D8E5D428931E780071C7AF /* un-plugInEmotiBit.jpg */; }; - 94E22CF92882062400C8F3C0 /* EmotiBitPacket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 94E22CF72882062400C8F3C0 /* EmotiBitPacket.cpp */; }; - 94E22D032882070C00C8F3C0 /* verdana.ttf in CopyFiles */ = {isa = PBXBuildFile; fileRef = 94E22CFB2882070B00C8F3C0 /* verdana.ttf */; }; - 94E22D052882070C00C8F3C0 /* EmotiBit.png in CopyFiles */ = {isa = PBXBuildFile; fileRef = 94E22CFD2882070C00C8F3C0 /* EmotiBit.png */; }; - 94E22D062882070C00C8F3C0 /* EmotiBit_stock_firmware.ino.feather_m0.bin in CopyFiles */ = {isa = PBXBuildFile; fileRef = 94E22CFE2882070C00C8F3C0 /* EmotiBit_stock_firmware.ino.feather_m0.bin */; }; - 94E22D072882070C00C8F3C0 /* verdanab.ttf in CopyFiles */ = {isa = PBXBuildFile; fileRef = 94E22CFF2882070C00C8F3C0 /* verdanab.ttf */; }; - 94E22D092882070C00C8F3C0 /* bossac in CopyFiles */ = {isa = PBXBuildFile; fileRef = 94E22D012882070C00C8F3C0 /* bossac */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; - 960D20B191346612D5C05A6A /* ofxTCPClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BF88F02779DD820913ACEA06 /* ofxTCPClient.cpp */; }; 9B0C4048D6313FF975C15606 /* decode.c in Sources */ = {isa = PBXBuildFile; fileRef = 7DBD4311D51383233476A246 /* decode.c */; }; 9C1D533ACA24526D098B688F /* compressor.cc in Sources */ = {isa = PBXBuildFile; fileRef = AF2EFC111D54B546BA67C5F8 /* compressor.cc */; }; 9C3C88078AAE29F745463AA1 /* encode_parallel.cc in Sources */ = {isa = PBXBuildFile; fileRef = 65DC6B9109EFA2E2C8C4BCA8 /* encode_parallel.cc */; }; - 9CA591B9A40F2386FE099328 /* ofxThreadedLogger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D6D75E57C2EB53518090D07A /* ofxThreadedLogger.cpp */; }; - 9D44DC88EF9E7991B4A09951 /* tinyxmlerror.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 832BDC407620CDBA568B713D /* tinyxmlerror.cpp */; }; - A7CF97A6E1DAE4A002CA6F82 /* ofxBiquadFilterInstance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F32C175B3E53B0864752B5D7 /* ofxBiquadFilterInstance.cpp */; }; B1BF03D79762719793CC9F1A /* SLIPEncoding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D1616DA13ECD5FC9DB4D5714 /* SLIPEncoding.cpp */; }; B266578FC55D23BFEBC042E7 /* ofxGuiGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECF8674C7975F1063C5E30CA /* ofxGuiGroup.cpp */; }; B3E6D60405574847412D7441 /* HiddenFileFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FCAF85B857266C511DB50341 /* HiddenFileFilter.cpp */; }; @@ -100,18 +89,17 @@ BC187E3BEC1C894471B93EA6 /* JSONUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6D6C4E1EAB3146AB043AAE52 /* JSONUtils.cpp */; }; BDCF478C4EBDE821E6E29C6C /* ThreadedSystemCall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9F76D6604BBFA486BAD0F8BA /* ThreadedSystemCall.cpp */; }; BE177617474F11F05E9260FC /* DirectoryWatcherManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0B6179498D0110BD2E161373 /* DirectoryWatcherManager.cpp */; }; + BEDFEE7400C58EA4E412B757 /* ofxJSONElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F2B099E6BD1199664C48B177 /* ofxJSONElement.cpp */; }; BFE92C3743ECA623B4D2F6A6 /* Thread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B81392DD7D58DEEDA83783B0 /* Thread.cpp */; }; C9B84C2206A19C8EF7FF2FC2 /* compress_fragment.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CC4516F27183BD1973BBE37 /* compress_fragment.c */; }; CDB5B1D2D12F42502906F30F /* DeviceFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00F3330A5DEBD082CEE0C12C /* DeviceFilter.cpp */; }; CEFD3CCAB8B3251DFCAAA0EE /* DirectoryUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A967D1FAFA98A7CBBFA4F55 /* DirectoryUtils.cpp */; }; D81A435CE7FDF51B41956210 /* snappy-sinksource.cc in Sources */ = {isa = PBXBuildFile; fileRef = 9A430D6BD10DC31AE2D07DA0 /* snappy-sinksource.cc */; }; - D820615CFDD5F497033D7C5A /* ofxBiquadFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 55E6502FFB31969C644E02C1 /* ofxBiquadFilter.cpp */; }; D932A5A24FCF08AE510A265D /* ByteBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93384835C77BD4299F8A7F90 /* ByteBuffer.cpp */; }; D962D295AC954F2275EC80AB /* state.c in Sources */ = {isa = PBXBuildFile; fileRef = 93E26814A54A32C6C2B713FE /* state.c */; }; DABEB23B35B4884860B1A814 /* unix.cc in Sources */ = {isa = PBXBuildFile; fileRef = E4F6F31D084699BAD89878B9 /* unix.cc */; }; DB1B6C56A8D6E1DF0AB8B5DA /* SerialDeviceUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A28F98E9F26E32A14FAE918C /* SerialDeviceUtils.cpp */; }; DFA0F30B1193D5DC1BB53E5E /* Base64Encoding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9D639BA31583580D80CFE15D /* Base64Encoding.cpp */; }; - E2564CF7DDB3713772BB682E /* ofxUDPManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 35BB9BB90DBABFD3B39F8DB6 /* ofxUDPManager.cpp */; }; E2C54FD4C85A860582282F7C /* RecursiveDirectoryIterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E95C4518AEDCDBEA357754B0 /* RecursiveDirectoryIterator.cpp */; }; E4029ECB5B38A0B16AA4C898 /* StreamFilters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 964894707DA74D07D5296965 /* StreamFilters.cpp */; }; E44BD2C35ED1D7A0E32AD356 /* literal_cost.c in Sources */ = {isa = PBXBuildFile; fileRef = 6D2A056D5D95C22910B771AB /* literal_cost.c */; }; @@ -122,70 +110,85 @@ EB4F14C4AE3B3EFD04520383 /* DirectoryWatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 12A42DF3BFDE28A4818C2EC4 /* DirectoryWatcher.cpp */; }; F285EB3169F1566CA3D93C20 /* ofxPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E112B3AEBEA2C091BF2B40AE /* ofxPanel.cpp */; }; F953E11952BFF8C207418550 /* HexBinaryEncoding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22565CAF8FFEF25C805A438F /* HexBinaryEncoding.cpp */; }; + FB84AAF8D1B7A95266DB5C09 /* jsoncpp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 21BDE665988474F1B1F4D302 /* jsoncpp.cpp */; }; FE9170FE54D704DF97B0E5BD /* COBSEncoding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4164C6C6CE5115889A99F42C /* COBSEncoding.cpp */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ - 94D8E5BA2887519A0071C7AF /* CopyFiles */ = { + 8EF01A9D2E43E57000BF0971 /* Copy Files to Resources */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; - dstPath = esp32; + dstPath = ""; dstSubfolderSpec = 7; files = ( - 94D8E5BE288751EB0071C7AF /* EmotiBit_stock_firmware.ino.bootloader.bin in CopyFiles */, - 94D8E5BF288751EB0071C7AF /* EmotiBit_stock_firmware.partitions.bin in CopyFiles */, - 94D8E5C0288751EB0071C7AF /* boot_app0.bin in CopyFiles */, - ); + 8EF01AA42E43E59600BF0971 /* EmotiBit.png in Copy Files to Resources */, + 8EF01AA52E43E59600BF0971 /* verdana.ttf in Copy Files to Resources */, + 8EF01AA62E43E59600BF0971 /* EmotiBit_stock_firmware.ino.feather_esp32.bin in Copy Files to Resources */, + 8EF01AA72E43E59600BF0971 /* verdanab.ttf in Copy Files to Resources */, + 8EF01AA82E43E59600BF0971 /* bossac in Copy Files to Resources */, + 8EF01AA92E43E59600BF0971 /* EmotiBit_stock_firmware.ino.feather_m0.bin in Copy Files to Resources */, + ); + name = "Copy Files to Resources"; runOnlyForDeploymentPostprocessing = 0; }; - 94D8E5C1288751EF0071C7AF /* CopyFiles */ = { + 8EF01AAA2E43E59900BF0971 /* Copy Files to Resources/WINC */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; - dstPath = exec/mac; + dstPath = WINC; dstSubfolderSpec = 7; files = ( - 94D8E5C32887522A0071C7AF /* esptool in CopyFiles */, + 8EF01AAF2E43E5C200BF0971 /* m2m_aio_3a0.bin in Copy Files to Resources/WINC */, + 8EF01AB02E43E5C200BF0971 /* FirmwareUpdater.ino.feather_m0.bin in Copy Files to Resources/WINC */, + 8EF01AB12E43E5C200BF0971 /* FirmwareUploader in Copy Files to Resources/WINC */, + 8EF01AB22E43E5C200BF0971 /* LICENSE.txt in Copy Files to Resources/WINC */, ); + name = "Copy Files to Resources/WINC"; runOnlyForDeploymentPostprocessing = 0; }; - 94D8E5C4288753AC0071C7AF /* CopyFiles */ = { + 8EF01AB32E43E5C500BF0971 /* Copy Files to Resources/instructions */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; dstPath = instructions; dstSubfolderSpec = 7; files = ( - 94D8E5D528931E780071C7AF /* un-plugInEmotiBit.jpg in CopyFiles */, - 94D8E5C8288753D70071C7AF /* plugInEmotiBit.jpg in CopyFiles */, - 94D8E5C9288753D70071C7AF /* correctHibernateSwitch.jpg in CopyFiles */, - 94D8E5CA288753D70071C7AF /* pressResetButton.jpg in CopyFiles */, + 8EF01AB82E43E5EB00BF0971 /* correctHibernateSwitch.jpg in Copy Files to Resources/instructions */, + 8EF01AB92E43E5EB00BF0971 /* un-plugInEmotiBit.jpg in Copy Files to Resources/instructions */, + 8EF01ABA2E43E5EB00BF0971 /* pressResetButton.jpg in Copy Files to Resources/instructions */, + 8EF01ABB2E43E5EB00BF0971 /* plugInEmotiBit.jpg in Copy Files to Resources/instructions */, ); + name = "Copy Files to Resources/instructions"; runOnlyForDeploymentPostprocessing = 0; }; - 94D8E5CB288754070071C7AF /* CopyFiles */ = { + 8EF01ABC2E43E5F100BF0971 /* Copy Files to Resources/esp32 */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; - dstPath = WINC; + dstPath = esp32; dstSubfolderSpec = 7; files = ( - 94D8E5D02887543B0071C7AF /* FirmwareUploader in CopyFiles */, - 94D8E5D12887543B0071C7AF /* FirmwareUpdater.ino.feather_m0.bin in CopyFiles */, - 94D8E5D22887543B0071C7AF /* m2m_aio_3a0.bin in CopyFiles */, - 94D8E5D32887543B0071C7AF /* LICENSE.txt in CopyFiles */, + 8EF01AC02E43E60F00BF0971 /* EmotiBit_stock_firmware.partitions.bin in Copy Files to Resources/esp32 */, + 8EF01AC12E43E60F00BF0971 /* boot_app0.bin in Copy Files to Resources/esp32 */, + 8EF01AC22E43E60F00BF0971 /* EmotiBit_stock_firmware.ino.bootloader.bin in Copy Files to Resources/esp32 */, ); + name = "Copy Files to Resources/esp32"; + runOnlyForDeploymentPostprocessing = 0; + }; + 8EF01AC32E43E61400BF0971 /* Copy Files to Resources/exec/mac */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = exec/mac; + dstSubfolderSpec = 7; + files = ( + 8EF01AC52E43E62A00BF0971 /* esptool in Copy Files to Resources/exec/mac */, + ); + name = "Copy Files to Resources/exec/mac"; runOnlyForDeploymentPostprocessing = 0; }; E4C2427710CC5ABF004149E2 /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; dstPath = ""; - dstSubfolderSpec = 7; + dstSubfolderSpec = 10; files = ( - 9491A58D288610930052D418 /* EmotiBit_stock_firmware.ino.feather_esp32.bin in CopyFiles */, - 94E22D032882070C00C8F3C0 /* verdana.ttf in CopyFiles */, - 94E22D052882070C00C8F3C0 /* EmotiBit.png in CopyFiles */, - 94E22D062882070C00C8F3C0 /* EmotiBit_stock_firmware.ino.feather_m0.bin in CopyFiles */, - 94E22D072882070C00C8F3C0 /* verdanab.ttf in CopyFiles */, - 94E22D092882070C00C8F3C0 /* bossac in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -193,7 +196,6 @@ /* Begin PBXFileReference section */ 00F3330A5DEBD082CEE0C12C /* DeviceFilter.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = DeviceFilter.cpp; path = ../../../addons/ofxIO/libs/ofxIO/src/DeviceFilter.cpp; sourceTree = SOURCE_ROOT; }; - 01DCC0911400F9ACF5B65578 /* ofxXmlSettings.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxXmlSettings.h; path = ../../../addons/ofxXmlSettings/src/ofxXmlSettings.h; sourceTree = SOURCE_ROOT; }; 021CAF811F031FFBDFB18797 /* ByteBufferReader.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = ByteBufferReader.cpp; path = ../../../addons/ofxIO/libs/ofxIO/src/ByteBufferReader.cpp; sourceTree = SOURCE_ROOT; }; 02CD15E418A33892225A879B /* state.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = state.h; path = ../../../addons/ofxIO/libs/brotli/src/dec/state.h; sourceTree = SOURCE_ROOT; }; 06D50E9C290B37C024652A02 /* types.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = types.h; path = ../../../addons/ofxIO/libs/brotli/src/common/types.h; sourceTree = SOURCE_ROOT; }; @@ -216,7 +218,7 @@ 13EF5AFAAD1F10B9A60863B8 /* dictionary_hash.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = dictionary_hash.h; path = ../../../addons/ofxIO/libs/brotli/src/enc/dictionary_hash.h; sourceTree = SOURCE_ROOT; }; 14290ED8DE68778AE3023FBC /* LinkFilter.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = LinkFilter.h; path = ../../../addons/ofxIO/libs/ofxIO/include/ofx/IO/LinkFilter.h; 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; }; @@ -224,42 +226,37 @@ 181F02B531162F6039F6ADC2 /* DirectoryWatcher.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = DirectoryWatcher.h; path = ../../../addons/ofxIO/libs/ofxIO/include/ofx/DirectoryWatcher.h; 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; }; 1C011DA756FF131FC46A2907 /* FileExtensionFilter.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = FileExtensionFilter.h; path = ../../../addons/ofxIO/libs/ofxIO/include/ofx/IO/FileExtensionFilter.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; }; 1E8B79D0091B95C305295952 /* URIEncoding.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = URIEncoding.h; path = ../../../addons/ofxIO/libs/ofxIO/include/ofx/IO/URIEncoding.h; sourceTree = SOURCE_ROOT; }; 20729DD0AE1CA44D2A7CBE8F /* ThreadsafeLoggerChannel.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ThreadsafeLoggerChannel.h; path = ../../../addons/ofxIO/libs/ofxIO/include/ofx/IO/ThreadsafeLoggerChannel.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; }; 22565CAF8FFEF25C805A438F /* HexBinaryEncoding.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = HexBinaryEncoding.cpp; path = ../../../addons/ofxIO/libs/ofxIO/src/HexBinaryEncoding.cpp; sourceTree = SOURCE_ROOT; }; 23C4AB2D5C847C1D6A7A69A8 /* port.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = port.h; path = ../../../addons/ofxIO/libs/brotli/src/enc/port.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; }; + 26A541233BC6F736E758F718 /* ofxJSONElement.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxJSONElement.h; path = ../../../addons/ofxJSON/src/ofxJSONElement.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; }; - 27CAA440EF9F67BEE7464F89 /* ofxBiquadFilterInstance.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxBiquadFilterInstance.h; path = ../../../addons/ofxBiquadFilter/src/ofxBiquadFilterInstance.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; }; 296E908620C8DC7216F403A6 /* dictionary.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = dictionary.h; path = ../../../addons/ofxIO/libs/brotli/src/common/dictionary.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; }; 2A8D9C10CB2FDB071CC1639F /* quality.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = quality.h; path = ../../../addons/ofxIO/libs/brotli/src/enc/quality.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; }; 2BC552B95352F479531DC424 /* snappy-stubs-internal.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = "snappy-stubs-internal.h"; path = "../../../addons/ofxIO/libs/snappy/src/snappy-stubs-internal.h"; sourceTree = SOURCE_ROOT; }; 2C49C0820819184530BC1AC8 /* backward_references.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = backward_references.h; path = ../../../addons/ofxIO/libs/brotli/src/enc/backward_references.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; }; 2D170F102215CF0511959D79 /* ByteBuffer.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ByteBuffer.h; path = ../../../addons/ofxIO/libs/ofxIO/include/ofx/IO/ByteBuffer.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; }; 2E1B067CF92CF6003406D36E /* bit_cost.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = bit_cost.h; path = ../../../addons/ofxIO/libs/brotli/src/enc/bit_cost.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; }; 2F6C7F53A990035EB21AC78C /* LRUCache.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = LRUCache.h; path = ../../../addons/ofxIO/libs/ofxIO/include/ofx/LRUCache.h; sourceTree = SOURCE_ROOT; }; 2FB74FF42B08FC378F74B2B7 /* snappy-stubs-internal.cc */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = "snappy-stubs-internal.cc"; path = "../../../addons/ofxIO/libs/snappy/src/snappy-stubs-internal.cc"; sourceTree = SOURCE_ROOT; }; 2FC8E2266FE2F5545775A16D /* Compression.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = Compression.cpp; path = ../../../addons/ofxIO/libs/ofxIO/src/Compression.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; }; 321A94B5DA29E6354C6A0717 /* Hash.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = Hash.h; path = ../../../addons/ofxIO/libs/ofxIO/include/ofx/IO/Hash.h; sourceTree = SOURCE_ROOT; }; 329AFDF48160D0227126AD22 /* histogram.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = histogram.h; path = ../../../addons/ofxIO/libs/brotli/src/enc/histogram.h; sourceTree = SOURCE_ROOT; }; 32CC9FC8F28CF3D4C0E1192B /* ObjectPool.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ObjectPool.h; path = ../../../addons/ofxIO/libs/ofxIO/include/ofx/IO/ObjectPool.h; sourceTree = SOURCE_ROOT; }; 3457BE6FA2A60931AED56935 /* streams.cc */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = streams.cc; path = ../../../addons/ofxIO/libs/brotli/src/enc/streams.cc; 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; }; 370DA13018950E5BFF8CF171 /* LinkFilter.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = LinkFilter.cpp; path = ../../../addons/ofxIO/libs/ofxIO/src/LinkFilter.cpp; sourceTree = SOURCE_ROOT; }; 3740B546F5FA81F9B404F565 /* write_bits.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = write_bits.h; path = ../../../addons/ofxIO/libs/brotli/src/enc/write_bits.h; 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; }; @@ -287,14 +284,12 @@ 4D38898647BBFEEBB89C1569 /* alphanum.hpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = alphanum.hpp; path = ../../../addons/ofxIO/libs/alphanum/include/alphanum.hpp; sourceTree = SOURCE_ROOT; }; 4EAC68CB142D702F9E3FD73E /* HexBinaryEncoding.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = HexBinaryEncoding.h; path = ../../../addons/ofxIO/libs/ofxIO/include/ofx/IO/HexBinaryEncoding.h; sourceTree = SOURCE_ROOT; }; 5066E964AC843C201FA667AB /* hash_longest_match_inc.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = hash_longest_match_inc.h; path = ../../../addons/ofxIO/libs/brotli/src/enc/hash_longest_match_inc.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; }; 50FC1C7AE5280445EB0FD2B8 /* metablock.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 4; name = metablock.c; path = ../../../addons/ofxIO/libs/brotli/src/enc/metablock.c; sourceTree = SOURCE_ROOT; }; 5114D2AF276E4E6E9A67B342 /* PathFilterCollection.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = PathFilterCollection.cpp; path = ../../../addons/ofxIO/libs/ofxIO/src/PathFilterCollection.cpp; sourceTree = SOURCE_ROOT; }; 5235265B9D62AC76B086F9D7 /* port.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = port.h; path = ../../../addons/ofxIO/libs/brotli/src/dec/port.h; 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; }; 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; }; 557678EEFF0D0C6D692D0DEC /* DeviceFilter.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = DeviceFilter.h; path = ../../../addons/ofxIO/libs/ofxIO/include/ofx/IO/DeviceFilter.h; sourceTree = SOURCE_ROOT; }; - 55E6502FFB31969C644E02C1 /* ofxBiquadFilter.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = ofxBiquadFilter.cpp; path = ../../../addons/ofxBiquadFilter/src/ofxBiquadFilter.cpp; sourceTree = SOURCE_ROOT; }; 56C67B5A6E5B16314FBD1BCA /* hash_forgetful_chain_inc.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = hash_forgetful_chain_inc.h; path = ../../../addons/ofxIO/libs/brotli/src/enc/hash_forgetful_chain_inc.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; }; @@ -309,6 +304,7 @@ 60F63F5C68476F0C9095B247 /* URIEncoding.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = URIEncoding.cpp; path = ../../../addons/ofxIO/libs/ofxIO/src/URIEncoding.cpp; sourceTree = SOURCE_ROOT; }; 6103A267643600648210B5B5 /* PollingThread.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = PollingThread.h; path = ../../../addons/ofxIO/libs/ofxIO/include/ofx/IO/PollingThread.h; sourceTree = SOURCE_ROOT; }; 610E50019572215015A4B6DF /* BackoffStrategy.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = BackoffStrategy.h; path = ../../../addons/ofxIO/libs/ofxIO/include/ofx/IO/BackoffStrategy.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; }; @@ -345,7 +341,6 @@ 7E25FB5473A2AF9C1578BDB6 /* find_match_length.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = find_match_length.h; path = ../../../addons/ofxIO/libs/brotli/src/enc/find_match_length.h; sourceTree = SOURCE_ROOT; }; 800D9CCA0F0B3D70CF25C2FF /* ofxSerial.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxSerial.h; path = ../../../addons/ofxSerial/src/ofxSerial.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; }; 838AF229C2183CBDCC150342 /* static_dict.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 4; name = static_dict.c; path = ../../../addons/ofxIO/libs/brotli/src/enc/static_dict.c; sourceTree = SOURCE_ROOT; }; 857A942126908B1806B67CE6 /* list_ports_osx.cc */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = list_ports_osx.cc; path = ../../../addons/ofxSerial/libs/serial/src/impl/list_ports/list_ports_osx.cc; sourceTree = SOURCE_ROOT; }; 85B399C99F9879F6C78EDE1B /* snappy-stubs-public.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = "snappy-stubs-public.h"; path = "../../../addons/ofxIO/libs/snappy/src/snappy-stubs-public.h"; sourceTree = SOURCE_ROOT; }; @@ -361,36 +356,34 @@ 8D2178E97885D60A7552A030 /* FilteredStreams.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = FilteredStreams.cpp; path = ../../../addons/ofxIO/libs/ofxIO/src/FilteredStreams.cpp; sourceTree = SOURCE_ROOT; }; 8D76B424A6DF4D70AACCDBAE /* SearchPath.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = SearchPath.cpp; path = ../../../addons/ofxIO/libs/ofxIO/src/SearchPath.cpp; sourceTree = SOURCE_ROOT; }; 8DCD8ACB4BC032E3F12F5AC8 /* compress_fragment_two_pass.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 4; name = compress_fragment_two_pass.c; path = ../../../addons/ofxIO/libs/brotli/src/enc/compress_fragment_two_pass.c; sourceTree = SOURCE_ROOT; }; + 8EF01A9E2E43E59600BF0971 /* EmotiBit.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = EmotiBit.png; path = bin/data/EmotiBit.png; sourceTree = ""; }; + 8EF01A9F2E43E59600BF0971 /* verdana.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = verdana.ttf; path = bin/data/verdana.ttf; sourceTree = ""; }; + 8EF01AA02E43E59600BF0971 /* EmotiBit_stock_firmware.ino.feather_esp32.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = EmotiBit_stock_firmware.ino.feather_esp32.bin; path = bin/data/EmotiBit_stock_firmware.ino.feather_esp32.bin; sourceTree = ""; }; + 8EF01AA12E43E59600BF0971 /* verdanab.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = verdanab.ttf; path = bin/data/verdanab.ttf; sourceTree = ""; }; + 8EF01AA22E43E59600BF0971 /* bossac */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = bossac; path = bin/data/bossac; sourceTree = ""; }; + 8EF01AA32E43E59600BF0971 /* EmotiBit_stock_firmware.ino.feather_m0.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = EmotiBit_stock_firmware.ino.feather_m0.bin; path = bin/data/EmotiBit_stock_firmware.ino.feather_m0.bin; sourceTree = ""; }; + 8EF01AAB2E43E5C200BF0971 /* m2m_aio_3a0.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = m2m_aio_3a0.bin; path = bin/data/WINC/m2m_aio_3a0.bin; sourceTree = ""; }; + 8EF01AAC2E43E5C200BF0971 /* FirmwareUpdater.ino.feather_m0.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = FirmwareUpdater.ino.feather_m0.bin; path = bin/data/WINC/FirmwareUpdater.ino.feather_m0.bin; sourceTree = ""; }; + 8EF01AAD2E43E5C200BF0971 /* FirmwareUploader */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = FirmwareUploader; path = bin/data/WINC/FirmwareUploader; sourceTree = ""; }; + 8EF01AAE2E43E5C200BF0971 /* LICENSE.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = LICENSE.txt; path = bin/data/WINC/LICENSE.txt; sourceTree = ""; }; + 8EF01AB42E43E5EB00BF0971 /* correctHibernateSwitch.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = correctHibernateSwitch.jpg; path = bin/data/instructions/correctHibernateSwitch.jpg; sourceTree = ""; }; + 8EF01AB52E43E5EB00BF0971 /* un-plugInEmotiBit.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = "un-plugInEmotiBit.jpg"; path = "bin/data/instructions/un-plugInEmotiBit.jpg"; sourceTree = ""; }; + 8EF01AB62E43E5EB00BF0971 /* pressResetButton.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = pressResetButton.jpg; path = bin/data/instructions/pressResetButton.jpg; sourceTree = ""; }; + 8EF01AB72E43E5EB00BF0971 /* plugInEmotiBit.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = plugInEmotiBit.jpg; path = bin/data/instructions/plugInEmotiBit.jpg; sourceTree = ""; }; + 8EF01ABD2E43E60F00BF0971 /* EmotiBit_stock_firmware.partitions.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = EmotiBit_stock_firmware.partitions.bin; path = bin/data/esp32/EmotiBit_stock_firmware.partitions.bin; sourceTree = ""; }; + 8EF01ABE2E43E60F00BF0971 /* boot_app0.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = boot_app0.bin; path = bin/data/esp32/boot_app0.bin; sourceTree = ""; }; + 8EF01ABF2E43E60F00BF0971 /* EmotiBit_stock_firmware.ino.bootloader.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = EmotiBit_stock_firmware.ino.bootloader.bin; path = bin/data/esp32/EmotiBit_stock_firmware.ino.bootloader.bin; sourceTree = ""; }; + 8EF01AC42E43E62A00BF0971 /* esptool */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = esptool; path = bin/data/exec/mac/esptool; 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; }; 93384835C77BD4299F8A7F90 /* ByteBuffer.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = ByteBuffer.cpp; path = ../../../addons/ofxIO/libs/ofxIO/src/ByteBuffer.cpp; sourceTree = SOURCE_ROOT; }; 93E26814A54A32C6C2B713FE /* state.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 4; name = state.c; path = ../../../addons/ofxIO/libs/brotli/src/dec/state.c; sourceTree = SOURCE_ROOT; }; 94519B019B0E47223B31FB5B /* context.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = context.h; path = ../../../addons/ofxIO/libs/brotli/src/enc/context.h; sourceTree = SOURCE_ROOT; }; - 9491A589288610920052D418 /* EmotiBit_stock_firmware.ino.feather_esp32.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = EmotiBit_stock_firmware.ino.feather_esp32.bin; path = bin/data/EmotiBit_stock_firmware.ino.feather_esp32.bin; sourceTree = ""; }; - 94D8E5BB288751EB0071C7AF /* EmotiBit_stock_firmware.ino.bootloader.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = EmotiBit_stock_firmware.ino.bootloader.bin; path = bin/data/esp32/EmotiBit_stock_firmware.ino.bootloader.bin; sourceTree = ""; }; - 94D8E5BC288751EB0071C7AF /* EmotiBit_stock_firmware.partitions.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = EmotiBit_stock_firmware.partitions.bin; path = bin/data/esp32/EmotiBit_stock_firmware.partitions.bin; sourceTree = ""; }; - 94D8E5BD288751EB0071C7AF /* boot_app0.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = boot_app0.bin; path = bin/data/esp32/boot_app0.bin; sourceTree = ""; }; - 94D8E5C22887522A0071C7AF /* esptool */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = esptool; path = bin/data/exec/mac/esptool; sourceTree = ""; }; - 94D8E5C5288753D70071C7AF /* plugInEmotiBit.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = plugInEmotiBit.jpg; path = bin/data/instructions/plugInEmotiBit.jpg; sourceTree = ""; }; - 94D8E5C6288753D70071C7AF /* correctHibernateSwitch.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = correctHibernateSwitch.jpg; path = bin/data/instructions/correctHibernateSwitch.jpg; sourceTree = ""; }; - 94D8E5C7288753D70071C7AF /* pressResetButton.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = pressResetButton.jpg; path = bin/data/instructions/pressResetButton.jpg; sourceTree = ""; }; - 94D8E5CC2887543A0071C7AF /* FirmwareUploader */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = FirmwareUploader; path = bin/data/WINC/FirmwareUploader; sourceTree = ""; }; - 94D8E5CD2887543A0071C7AF /* FirmwareUpdater.ino.feather_m0.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = FirmwareUpdater.ino.feather_m0.bin; path = bin/data/WINC/FirmwareUpdater.ino.feather_m0.bin; sourceTree = ""; }; - 94D8E5CE2887543A0071C7AF /* m2m_aio_3a0.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = m2m_aio_3a0.bin; path = bin/data/WINC/m2m_aio_3a0.bin; sourceTree = ""; }; - 94D8E5CF2887543A0071C7AF /* LICENSE.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = LICENSE.txt; path = bin/data/WINC/LICENSE.txt; sourceTree = ""; }; - 94D8E5D428931E780071C7AF /* un-plugInEmotiBit.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = "un-plugInEmotiBit.jpg"; path = "bin/data/instructions/un-plugInEmotiBit.jpg"; sourceTree = ""; }; - 94E22CF72882062400C8F3C0 /* EmotiBitPacket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EmotiBitPacket.cpp; path = ../../EmotiBit_XPlat_Utils/src/EmotiBitPacket.cpp; sourceTree = ""; }; - 94E22CF82882062400C8F3C0 /* EmotiBitPacket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EmotiBitPacket.h; path = ../../EmotiBit_XPlat_Utils/src/EmotiBitPacket.h; sourceTree = ""; }; - 94E22CFA2882070B00C8F3C0 /* exec */ = {isa = PBXFileReference; lastKnownFileType = folder; name = exec; path = bin/data/exec; sourceTree = ""; }; - 94E22CFB2882070B00C8F3C0 /* verdana.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = verdana.ttf; path = bin/data/verdana.ttf; sourceTree = ""; }; - 94E22CFD2882070C00C8F3C0 /* EmotiBit.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = EmotiBit.png; path = bin/data/EmotiBit.png; sourceTree = ""; }; - 94E22CFE2882070C00C8F3C0 /* EmotiBit_stock_firmware.ino.feather_m0.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = EmotiBit_stock_firmware.ino.feather_m0.bin; path = bin/data/EmotiBit_stock_firmware.ino.feather_m0.bin; sourceTree = ""; }; - 94E22CFF2882070C00C8F3C0 /* verdanab.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = verdanab.ttf; path = bin/data/verdanab.ttf; sourceTree = ""; }; - 94E22D012882070C00C8F3C0 /* bossac */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = bossac; path = bin/data/bossac; sourceTree = ""; }; 9604B925D32EE39065747725 /* ofxBaseGui.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = ofxBaseGui.cpp; path = ../../../addons/ofxGui/src/ofxBaseGui.cpp; sourceTree = SOURCE_ROOT; }; 9634FA545F1B9E5582A31E4D /* static_dict_lut.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = static_dict_lut.h; path = ../../../addons/ofxIO/libs/brotli/src/enc/static_dict_lut.h; sourceTree = SOURCE_ROOT; }; 964894707DA74D07D5296965 /* StreamFilters.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = StreamFilters.cpp; path = ../../../addons/ofxIO/libs/ofxIO/src/StreamFilters.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; }; 9A430D6BD10DC31AE2D07DA0 /* snappy-sinksource.cc */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = "snappy-sinksource.cc"; path = "../../../addons/ofxIO/libs/snappy/src/snappy-sinksource.cc"; sourceTree = SOURCE_ROOT; }; 9A967D1FAFA98A7CBBFA4F55 /* DirectoryUtils.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = DirectoryUtils.cpp; path = ../../../addons/ofxIO/libs/ofxIO/src/DirectoryUtils.cpp; sourceTree = SOURCE_ROOT; }; @@ -415,12 +408,10 @@ 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; }; ABF95295416CA5F04F3FC570 /* version.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = version.h; path = ../../../addons/ofxIO/libs/brotli/src/tools/version.h; sourceTree = SOURCE_ROOT; }; ADC45E383B2885CD8ED44C32 /* memory.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 4; name = memory.c; path = ../../../addons/ofxIO/libs/brotli/src/enc/memory.c; 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; }; AF2EFC111D54B546BA67C5F8 /* compressor.cc */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = compressor.cc; path = ../../../addons/ofxIO/libs/brotli/src/enc/compressor.cc; 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; }; 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; }; 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; }; @@ -438,7 +429,6 @@ BE10E456A9066BE3516AD23E /* encode.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 4; name = encode.c; path = ../../../addons/ofxIO/libs/brotli/src/enc/encode.c; sourceTree = SOURCE_ROOT; }; BEFFAA5B8275E0AE066FC2E3 /* DirectoryWatcherManager.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = DirectoryWatcherManager.h; path = ../../../addons/ofxIO/libs/ofxIO/include/ofx/IO/DirectoryWatcherManager.h; sourceTree = SOURCE_ROOT; }; BF0BB2F28A4522316B1563A5 /* COBSEncoding.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = COBSEncoding.h; path = ../../../addons/ofxIO/libs/ofxIO/include/ofx/IO/COBSEncoding.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; }; C11115BCD18AB012DE4B9911 /* block_splitter.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 4; name = block_splitter.c; path = ../../../addons/ofxIO/libs/brotli/src/enc/block_splitter.c; sourceTree = SOURCE_ROOT; }; C3556B2A7A1CEBA6A9A1FF3A /* backward_references_inc.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = backward_references_inc.h; path = ../../../addons/ofxIO/libs/brotli/src/enc/backward_references_inc.h; sourceTree = SOURCE_ROOT; }; @@ -451,11 +441,9 @@ C70D8946940288799E82131E /* ofxSliderGroup.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxSliderGroup.h; path = ../../../addons/ofxGui/src/ofxSliderGroup.h; sourceTree = SOURCE_ROOT; }; C7F5BBFD733EDFD4D54B3903 /* encode.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = encode.h; path = ../../../addons/ofxIO/libs/brotli/src/enc/encode.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; }; C8F2762F4CCE12D7C1022DAA /* Compression.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = Compression.h; path = ../../../addons/ofxIO/libs/ofxIO/include/ofx/IO/Compression.h; sourceTree = SOURCE_ROOT; }; C9BE77ADAEF79E623523E9D9 /* ByteBufferWriter.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = ByteBufferWriter.cpp; path = ../../../addons/ofxIO/libs/ofxIO/src/ByteBufferWriter.cpp; 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; }; CA68874B4EA8C0D647FA49C8 /* entropy_encode.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 4; name = entropy_encode.c; path = ../../../addons/ofxIO/libs/brotli/src/enc/entropy_encode.c; sourceTree = SOURCE_ROOT; }; CB977F55D4B0D819421437AD /* histogram.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 4; name = histogram.c; path = ../../../addons/ofxIO/libs/brotli/src/enc/histogram.c; sourceTree = SOURCE_ROOT; }; CBFC3084D8F4BE08DBD30DB2 /* streams.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = streams.h; path = ../../../addons/ofxIO/libs/brotli/src/enc/streams.h; sourceTree = SOURCE_ROOT; }; @@ -470,8 +458,6 @@ D2388420E859BBA28ED2B4EE /* PacketSerialDevice.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = PacketSerialDevice.h; path = ../../../addons/ofxSerial/libs/ofxSerial/include/ofx/IO/PacketSerialDevice.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; }; D5D4C03F38EE3F12B6391564 /* metablock.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = metablock.h; path = ../../../addons/ofxIO/libs/brotli/src/enc/metablock.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; }; @@ -481,7 +467,6 @@ DE95F05F5EC909D2167369E6 /* memory.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = memory.h; path = ../../../addons/ofxIO/libs/brotli/src/enc/memory.h; sourceTree = SOURCE_ROOT; }; DF94455EC11AD40A5D4EC9CB /* ObjectPool.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ObjectPool.h; path = ../../../addons/ofxIO/libs/ofxIO/include/ofx/ObjectPool.h; sourceTree = SOURCE_ROOT; }; DFDFD6F8619819B10AB9F44C /* utf8_util.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 4; name = utf8_util.c; path = ../../../addons/ofxIO/libs/brotli/src/enc/utf8_util.c; sourceTree = SOURCE_ROOT; }; - E07EAAF2349F618F25388C86 /* ofxBiquadFilter.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxBiquadFilter.h; path = ../../../addons/ofxBiquadFilter/src/ofxBiquadFilter.h; sourceTree = SOURCE_ROOT; }; E095C2EA5FC7D19E05B8EC63 /* histogram_inc.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = histogram_inc.h; path = ../../../addons/ofxIO/libs/brotli/src/enc/histogram_inc.h; sourceTree = SOURCE_ROOT; }; E101D2F61DA6A9D35B4C53CE /* cluster_inc.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = cluster_inc.h; path = ../../../addons/ofxIO/libs/brotli/src/enc/cluster_inc.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; }; @@ -687,16 +672,13 @@ F0B7B8B3CBC6603E4EBB50CB /* list_ports_linux.cc */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = list_ports_linux.cc; path = ../../../addons/ofxSerial/libs/serial/src/impl/list_ports/list_ports_linux.cc; sourceTree = SOURCE_ROOT; }; F0F87B444C101B92DBC3AE0D /* bit_cost_inc.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = bit_cost_inc.h; path = ../../../addons/ofxIO/libs/brotli/src/enc/bit_cost_inc.h; sourceTree = SOURCE_ROOT; }; F27637AABA89A235C5974D56 /* RecursiveDirectoryIteratorStategies.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = RecursiveDirectoryIteratorStategies.cpp; path = ../../../addons/ofxIO/libs/ofxIO/src/RecursiveDirectoryIteratorStategies.cpp; sourceTree = SOURCE_ROOT; }; - F32C175B3E53B0864752B5D7 /* ofxBiquadFilterInstance.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = ofxBiquadFilterInstance.cpp; path = ../../../addons/ofxBiquadFilter/src/ofxBiquadFilterInstance.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; }; + F2B099E6BD1199664C48B177 /* ofxJSONElement.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = ofxJSONElement.cpp; path = ../../../addons/ofxJSON/src/ofxJSONElement.cpp; sourceTree = SOURCE_ROOT; }; F4030B6B8EDE26878C8D74F1 /* ByteBufferWriter.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ByteBufferWriter.h; path = ../../../addons/ofxIO/libs/ofxIO/include/ofx/IO/ByteBufferWriter.h; sourceTree = SOURCE_ROOT; }; F57139F864890F6358112C25 /* win.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = win.h; path = ../../../addons/ofxSerial/libs/serial/include/serial/impl/win.h; sourceTree = SOURCE_ROOT; }; F5E31A831B4A68051A87AB3F /* lz4.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = lz4.h; path = ../../../addons/ofxIO/libs/lz4/src/lz4.h; 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; }; F6A8A6F386993F7C4710ACE5 /* block_splitter.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = block_splitter.h; path = ../../../addons/ofxIO/libs/brotli/src/enc/block_splitter.h; sourceTree = SOURCE_ROOT; }; F6CE5F63C4EA95C35B48EC0C /* decode.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = decode.h; path = ../../../addons/ofxIO/libs/brotli/src/dec/decode.h; sourceTree = SOURCE_ROOT; }; FB0997B62B97D7513CD396A2 /* BufferedSerialDevice.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = BufferedSerialDevice.h; path = ../../../addons/ofxSerial/libs/ofxSerial/include/ofx/IO/BufferedSerialDevice.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; }; FCAF85B857266C511DB50341 /* HiddenFileFilter.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = HiddenFileFilter.cpp; path = ../../../addons/ofxIO/libs/ofxIO/src/HiddenFileFilter.cpp; sourceTree = SOURCE_ROOT; }; FD35DEC21FE06BF7F1516022 /* RegexPathFilter.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = RegexPathFilter.h; path = ../../../addons/ofxIO/libs/ofxIO/include/ofx/IO/RegexPathFilter.h; sourceTree = SOURCE_ROOT; }; FD704D8B846AF9B45BA670ED /* port.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = port.h; path = ../../../addons/ofxIO/libs/brotli/src/common/port.h; sourceTree = SOURCE_ROOT; }; @@ -736,6 +718,14 @@ name = src; sourceTree = ""; }; + 0B8ED02ED04845BC31B3E518 /* ofxEmotiBit */ = { + isa = PBXGroup; + children = ( + 4CD5C6EA1AEB082DFF01E7BE /* src */, + ); + name = ofxEmotiBit; + sourceTree = ""; + }; 0B9802A8A246D3F781E0EF07 /* impl */ = { isa = PBXGroup; children = ( @@ -774,34 +764,6 @@ name = IO; sourceTree = ""; }; - 18240ECCE4076FB0833A8578 /* ofxNetwork */ = { - isa = PBXGroup; - children = ( - 219374A14594D121F27FED3A /* src */, - ); - name = ofxNetwork; - sourceTree = ""; - }; - 1AD5D3177F0439A5787274C9 /* src */ = { - isa = PBXGroup; - children = ( - 55E6502FFB31969C644E02C1 /* ofxBiquadFilter.cpp */, - E07EAAF2349F618F25388C86 /* ofxBiquadFilter.h */, - F32C175B3E53B0864752B5D7 /* ofxBiquadFilterInstance.cpp */, - 27CAA440EF9F67BEE7464F89 /* ofxBiquadFilterInstance.h */, - ); - name = src; - sourceTree = ""; - }; - 1F4FB5C423662B96ADFDCC0B /* ofxXmlSettings */ = { - isa = PBXGroup; - children = ( - 6E54289412D2D94F45A05113 /* libs */, - 6ECEF0D76BC33727823EADFF /* src */, - ); - name = ofxXmlSettings; - sourceTree = ""; - }; 1FE55F3FCBD156AC7D591F69 /* libs */ = { isa = PBXGroup; children = ( @@ -814,32 +776,23 @@ name = libs; sourceTree = ""; }; - 219374A14594D121F27FED3A /* src */ = { + 2865DAEF86B1907A704CA70B /* ofxJSON */ = { 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 */, + F40E80CB2D443CBA9581DD03 /* libs */, + 292AF6148769654D0DF26018 /* src */, ); - name = src; + name = ofxJSON; sourceTree = ""; }; - 27005CFF506A34FD3734C3CE /* ofxBiquadFilter */ = { + 292AF6148769654D0DF26018 /* src */ = { isa = PBXGroup; children = ( - 1AD5D3177F0439A5787274C9 /* src */, + 1645F56257269CD0356320BD /* ofxJSON.h */, + F2B099E6BD1199664C48B177 /* ofxJSONElement.cpp */, + 26A541233BC6F736E758F718 /* ofxJSONElement.h */, ); - name = ofxBiquadFilter; + name = src; sourceTree = ""; }; 2CAD929748AAFE515E344555 /* brotli */ = { @@ -850,14 +803,6 @@ name = brotli; sourceTree = ""; }; - 3286A6A80FB3354E8DF1D5B8 /* ofxThreadedLogger */ = { - isa = PBXGroup; - children = ( - D6951A2C4225871907DE751A /* src */, - ); - name = ofxThreadedLogger; - sourceTree = ""; - }; 3F13BF933566839ED4C7CCED /* include */ = { isa = PBXGroup; children = ( @@ -921,6 +866,23 @@ name = src; sourceTree = ""; }; + 4CD5C6EA1AEB082DFF01E7BE /* src */ = { + isa = PBXGroup; + children = ( + 9938519AF7D3E0C48586F0C1 /* ofxEmotiBitVersion.h */, + ); + name = src; + sourceTree = ""; + }; + 58AD3BD71B781D9BC25763C8 /* json */ = { + isa = PBXGroup; + children = ( + 61313493CDB52744E22A604D /* json-forwards.h */, + 2C7CF000B7B4F782C187C353 /* json.h */, + ); + name = json; + sourceTree = ""; + }; 622DC121CB90BECD1ED3B98B /* common */ = { isa = PBXGroup; children = ( @@ -957,26 +919,6 @@ name = libs; 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 = ""; - }; 6F72ECC5B858CCFD7BB7730D /* ofxSerial */ = { isa = PBXGroup; children = ( @@ -1184,23 +1126,6 @@ name = ofxIO; sourceTree = ""; }; - 94E22CF5288205EA00C8F3C0 /* EmotiBit_XPlat_Utils */ = { - isa = PBXGroup; - children = ( - 94E22CF6288205FD00C8F3C0 /* src */, - ); - name = EmotiBit_XPlat_Utils; - sourceTree = ""; - }; - 94E22CF6288205FD00C8F3C0 /* src */ = { - isa = PBXGroup; - children = ( - 94E22CF72882062400C8F3C0 /* EmotiBitPacket.cpp */, - 94E22CF82882062400C8F3C0 /* EmotiBitPacket.h */, - ); - name = src; - sourceTree = ""; - }; 959BC13926B6C962531CEF17 /* libs */ = { isa = PBXGroup; children = ( @@ -1220,6 +1145,15 @@ name = src; sourceTree = ""; }; + 977A836DD2C489CCC5E330FF /* jsoncpp */ = { + isa = PBXGroup; + children = ( + D486FC87F063317BB47E9FAC /* include */, + CCDC6F9CCF925CC402160B85 /* src */, + ); + name = jsoncpp; + sourceTree = ""; + }; 9E656A838901B53C9F9E2A48 /* enc */ = { isa = PBXGroup; children = ( @@ -1368,15 +1302,12 @@ BB4B014C10F69532006C3DED /* addons */ = { isa = PBXGroup; children = ( - 94E22CF5288205EA00C8F3C0 /* EmotiBit_XPlat_Utils */, - 27005CFF506A34FD3734C3CE /* ofxBiquadFilter */, + 0B8ED02ED04845BC31B3E518 /* ofxEmotiBit */, 480A780D8D0308AE4A368801 /* ofxGui */, 0117D94CE0C695E5E5482BEC /* ofxPoco */, A8792B4B23B2F70E1065D67F /* ofxIO */, - 18240ECCE4076FB0833A8578 /* ofxNetwork */, + 2865DAEF86B1907A704CA70B /* ofxJSON */, BDBA4E6BCE9C79945EF60873 /* ofxSerial */, - 3286A6A80FB3354E8DF1D5B8 /* ofxThreadedLogger */, - 1F4FB5C423662B96ADFDCC0B /* ofxXmlSettings */, ); name = addons; sourceTree = ""; @@ -1390,6 +1321,14 @@ name = ofxSerial; sourceTree = ""; }; + CCDC6F9CCF925CC402160B85 /* src */ = { + isa = PBXGroup; + children = ( + 21BDE665988474F1B1F4D302 /* jsoncpp.cpp */, + ); + name = src; + sourceTree = ""; + }; D1C382A37EE661F51AA773CC /* ofx */ = { isa = PBXGroup; children = ( @@ -1406,13 +1345,12 @@ name = ofx; sourceTree = ""; }; - D6951A2C4225871907DE751A /* src */ = { + D486FC87F063317BB47E9FAC /* include */ = { isa = PBXGroup; children = ( - D6D75E57C2EB53518090D07A /* ofxThreadedLogger.cpp */, - CA32618C6484394941477500 /* ofxThreadedLogger.h */, + 58AD3BD71B781D9BC25763C8 /* json */, ); - name = src; + name = include; sourceTree = ""; }; D86C6322CF7554A9BE5EB8BF /* src */ = { @@ -1734,25 +1672,24 @@ E4B69B4A0A3A1720003C02F2 = { isa = PBXGroup; children = ( - 94D8E5D428931E780071C7AF /* un-plugInEmotiBit.jpg */, - 94D8E5CD2887543A0071C7AF /* FirmwareUpdater.ino.feather_m0.bin */, - 94D8E5CC2887543A0071C7AF /* FirmwareUploader */, - 94D8E5CF2887543A0071C7AF /* LICENSE.txt */, - 94D8E5CE2887543A0071C7AF /* m2m_aio_3a0.bin */, - 94D8E5C6288753D70071C7AF /* correctHibernateSwitch.jpg */, - 94D8E5C5288753D70071C7AF /* plugInEmotiBit.jpg */, - 94D8E5C7288753D70071C7AF /* pressResetButton.jpg */, - 94D8E5C22887522A0071C7AF /* esptool */, - 94D8E5BD288751EB0071C7AF /* boot_app0.bin */, - 94D8E5BB288751EB0071C7AF /* EmotiBit_stock_firmware.ino.bootloader.bin */, - 94D8E5BC288751EB0071C7AF /* EmotiBit_stock_firmware.partitions.bin */, - 9491A589288610920052D418 /* EmotiBit_stock_firmware.ino.feather_esp32.bin */, - 94E22D012882070C00C8F3C0 /* bossac */, - 94E22CFE2882070C00C8F3C0 /* EmotiBit_stock_firmware.ino.feather_m0.bin */, - 94E22CFD2882070C00C8F3C0 /* EmotiBit.png */, - 94E22CFA2882070B00C8F3C0 /* exec */, - 94E22CFB2882070B00C8F3C0 /* verdana.ttf */, - 94E22CFF2882070C00C8F3C0 /* verdanab.ttf */, + 8EF01AC42E43E62A00BF0971 /* esptool */, + 8EF01ABE2E43E60F00BF0971 /* boot_app0.bin */, + 8EF01ABF2E43E60F00BF0971 /* EmotiBit_stock_firmware.ino.bootloader.bin */, + 8EF01ABD2E43E60F00BF0971 /* EmotiBit_stock_firmware.partitions.bin */, + 8EF01AB42E43E5EB00BF0971 /* correctHibernateSwitch.jpg */, + 8EF01AB72E43E5EB00BF0971 /* plugInEmotiBit.jpg */, + 8EF01AB62E43E5EB00BF0971 /* pressResetButton.jpg */, + 8EF01AB52E43E5EB00BF0971 /* un-plugInEmotiBit.jpg */, + 8EF01AAC2E43E5C200BF0971 /* FirmwareUpdater.ino.feather_m0.bin */, + 8EF01AAD2E43E5C200BF0971 /* FirmwareUploader */, + 8EF01AAE2E43E5C200BF0971 /* LICENSE.txt */, + 8EF01AAB2E43E5C200BF0971 /* m2m_aio_3a0.bin */, + 8EF01AA22E43E59600BF0971 /* bossac */, + 8EF01AA02E43E59600BF0971 /* EmotiBit_stock_firmware.ino.feather_esp32.bin */, + 8EF01AA32E43E59600BF0971 /* EmotiBit_stock_firmware.ino.feather_m0.bin */, + 8EF01A9E2E43E59600BF0971 /* EmotiBit.png */, + 8EF01A9F2E43E59600BF0971 /* verdana.ttf */, + 8EF01AA12E43E59600BF0971 /* verdanab.ttf */, E4B6FCAD0C3E899E008CF71C /* openFrameworks-Info.plist */, E4EB6923138AFD0F00A09F29 /* Project.xcconfig */, E4B69E1C0A3A1BDC003C02F2 /* src */, @@ -1793,6 +1730,14 @@ name = impl; sourceTree = ""; }; + F40E80CB2D443CBA9581DD03 /* libs */ = { + isa = PBXGroup; + children = ( + 977A836DD2C489CCC5E330FF /* jsoncpp */, + ); + name = libs; + sourceTree = ""; + }; FF8468D5B2307E18FA22FAD0 /* src */ = { isa = PBXGroup; children = ( @@ -1813,11 +1758,12 @@ E4B69B590A3A1756003C02F2 /* Frameworks */, E4B6FFFD0C3F9AB9008CF71C /* ShellScript */, E4C2427710CC5ABF004149E2 /* CopyFiles */, - 94D8E5CB288754070071C7AF /* CopyFiles */, - 94D8E5C4288753AC0071C7AF /* CopyFiles */, - 94D8E5BA2887519A0071C7AF /* CopyFiles */, - 94D8E5C1288751EF0071C7AF /* CopyFiles */, 8466F1851C04CA0E00918B1C /* ShellScript */, + 8EF01A9D2E43E57000BF0971 /* Copy Files to Resources */, + 8EF01AAA2E43E59900BF0971 /* Copy Files to Resources/WINC */, + 8EF01AB32E43E5C500BF0971 /* Copy Files to Resources/instructions */, + 8EF01ABC2E43E5F100BF0971 /* Copy Files to Resources/esp32 */, + 8EF01AC32E43E61400BF0971 /* Copy Files to Resources/exec/mac */, ); buildRules = ( ); @@ -1868,7 +1814,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "echo \"$GCC_PREPROCESSOR_DEFINITIONS\";\nAPPSTORE=`expr \"$GCC_PREPROCESSOR_DEFINITIONS\" : \".*APPSTORE=\\([0-9]*\\)\"`\nif [ -z \"$APPSTORE\" ] ; then\necho \"Note: Not copying bin/data to App Package or doing App Code signing. Use AppStore target for AppStore distribution\";\nelse\n# Copy bin/data into App/Resources\nrsync -avz --exclude='.DS_Store' \"${SRCROOT}/bin/data/\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/data/\"\n\n# Strip 32bit from fmod dylib\nlipo -remove i386 \"${TARGET_BUILD_DIR}/${PRODUCT_NAME}.app/Contents/Frameworks/libfmod.dylib\" -o \"${TARGET_BUILD_DIR}/${PRODUCT_NAME}.app/Contents/Frameworks/libfmod.dylib\" \n\n# ---- Code Sign App Package ----\n\n# WARNING: You may have to run Clean in Xcode after changing CODE_SIGN_IDENTITY!\n\n# Verify that $CODE_SIGN_IDENTITY is set\nif [ -z \"${CODE_SIGN_IDENTITY}\" ] ; then\necho \"CODE_SIGN_IDENTITY needs to be set for framework code-signing\"\nexit 0\nfi\n\nif [ -z \"${CODE_SIGN_ENTITLEMENTS}\" ] ; then\necho \"CODE_SIGN_ENTITLEMENTS needs to be set for framework code-signing!\"\n\nif [ \"${CONFIGURATION}\" = \"Release\" ] ; then\nexit 1\nelse\n# Code-signing is optional for non-release builds.\nexit 0\nfi\nfi\n\nITEMS=\"\"\n\nFRAMEWORKS_DIR=\"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}\"\necho \"$FRAMEWORKS_DIR\"\nif [ -d \"$FRAMEWORKS_DIR\" ] ; then\nFRAMEWORKS=$(find \"${FRAMEWORKS_DIR}\" -depth -type d -name \"*.framework\" -or -name \"*.dylib\" -or -name \"*.bundle\" | sed -e \"s/\\(.*framework\\)/\\1\\/Versions\\/A\\//\")\nRESULT=$?\nif [[ $RESULT != 0 ]] ; then\nexit 1\nfi\n\nITEMS=\"${FRAMEWORKS}\"\nfi\n\nLOGINITEMS_DIR=\"${TARGET_BUILD_DIR}/${CONTENTS_FOLDER_PATH}/Library/LoginItems/\"\nif [ -d \"$LOGINITEMS_DIR\" ] ; then\nLOGINITEMS=$(find \"${LOGINITEMS_DIR}\" -depth -type d -name \"*.app\")\nRESULT=$?\nif [[ $RESULT != 0 ]] ; then\nexit 1\nfi\n\nITEMS=\"${ITEMS}\"$'\\n'\"${LOGINITEMS}\"\nfi\n\n# Prefer the expanded name, if available.\nCODE_SIGN_IDENTITY_FOR_ITEMS=\"${EXPANDED_CODE_SIGN_IDENTITY_NAME}\"\nif [ \"${CODE_SIGN_IDENTITY_FOR_ITEMS}\" = \"\" ] ; then\n# Fall back to old behavior.\nCODE_SIGN_IDENTITY_FOR_ITEMS=\"${CODE_SIGN_IDENTITY}\"\nfi\n\necho \"Identity:\"\necho \"${CODE_SIGN_IDENTITY_FOR_ITEMS}\"\n\necho \"Entitlements:\"\necho \"${CODE_SIGN_ENTITLEMENTS}\"\n\necho \"Found:\"\necho \"${ITEMS}\"\n\n# Change the Internal Field Separator (IFS) so that spaces in paths will not cause problems below.\nSAVED_IFS=$IFS\nIFS=$(echo -en \"\\n\\b\")\n\n# Loop through all items.\nfor ITEM in $ITEMS;\ndo\necho \"Stripping invalid archs '${ITEM}'\"\nlipo -remove i386 \"${ITEM}\" -o \"${ITEM}\"\necho \"Signing '${ITEM}'\"\ncodesign --force --verbose --sign \"${CODE_SIGN_IDENTITY_FOR_ITEMS}\" --entitlements \"${CODE_SIGN_ENTITLEMENTS}\" \"${ITEM}\"\nRESULT=$?\nif [[ $RESULT != 0 ]] ; then\necho \"Failed to sign '${ITEM}'.\"\nIFS=$SAVED_IFS\nexit 1\nfi\ndone\n\n# Restore $IFS.\nIFS=$SAVED_IFS\n\nfi\n"; + shellScript = "echo \"$GCC_PREPROCESSOR_DEFINITIONS\";\nAPPSTORE=`expr \"$GCC_PREPROCESSOR_DEFINITIONS\" : \".*APPSTORE=\\([0-9]*\\)\"`\nif [ -z \"$APPSTORE\" ] ; then\necho \"Note: Not copying bin/data to App Package or doing App Code signing. Use AppStore target for AppStore distribution\";\nelse\n# Copy bin/data into App/Resources\nrsync -avz --exclude='.DS_Store' \"${SRCROOT}/bin/data/\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/data/\"\n\n# ---- Code Sign App Package ----\n\n# WARNING: You may have to run Clean in Xcode after changing CODE_SIGN_IDENTITY!\n\n# Verify that $CODE_SIGN_IDENTITY is set\nif [ -z \"${CODE_SIGN_IDENTITY}\" ] ; then\necho \"CODE_SIGN_IDENTITY needs to be set for framework code-signing\"\nexit 0\nfi\n\nif [ -z \"${CODE_SIGN_ENTITLEMENTS}\" ] ; then\necho \"CODE_SIGN_ENTITLEMENTS needs to be set for framework code-signing!\"\n\nif [ \"${CONFIGURATION}\" = \"Release\" ] ; then\nexit 1\nelse\n# Code-signing is optional for non-release builds.\nexit 0\nfi\nfi\n\nITEMS=\"\"\n\nFRAMEWORKS_DIR=\"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}\"\necho \"$FRAMEWORKS_DIR\"\nif [ -d \"$FRAMEWORKS_DIR\" ] ; then\nFRAMEWORKS=$(find \"${FRAMEWORKS_DIR}\" -depth -type d -name \"*.framework\" -or -name \"*.dylib\" -or -name \"*.bundle\" | sed -e \"s/\\(.*framework\\)/\\1\\/Versions\\/A\\//\")\nRESULT=$?\nif [[ $RESULT != 0 ]] ; then\nexit 1\nfi\n\nITEMS=\"${FRAMEWORKS}\"\nfi\n\nLOGINITEMS_DIR=\"${TARGET_BUILD_DIR}/${CONTENTS_FOLDER_PATH}/Library/LoginItems/\"\nif [ -d \"$LOGINITEMS_DIR\" ] ; then\nLOGINITEMS=$(find \"${LOGINITEMS_DIR}\" -depth -type d -name \"*.app\")\nRESULT=$?\nif [[ $RESULT != 0 ]] ; then\nexit 1\nfi\n\nITEMS=\"${ITEMS}\"$'\\n'\"${LOGINITEMS}\"\nfi\n\n# Prefer the expanded name, if available.\nCODE_SIGN_IDENTITY_FOR_ITEMS=\"${EXPANDED_CODE_SIGN_IDENTITY_NAME}\"\nif [ \"${CODE_SIGN_IDENTITY_FOR_ITEMS}\" = \"\" ] ; then\n# Fall back to old behavior.\nCODE_SIGN_IDENTITY_FOR_ITEMS=\"${CODE_SIGN_IDENTITY}\"\nfi\n\necho \"Identity:\"\necho \"${CODE_SIGN_IDENTITY_FOR_ITEMS}\"\n\necho \"Entitlements:\"\necho \"${CODE_SIGN_ENTITLEMENTS}\"\n\necho \"Found:\"\necho \"${ITEMS}\"\n\n# Change the Internal Field Separator (IFS) so that spaces in paths will not cause problems below.\nSAVED_IFS=$IFS\nIFS=$(echo -en \"\\n\\b\")\n\n# Loop through all items.\nfor ITEM in $ITEMS;\ndo\necho \"Stripping invalid archs '${ITEM}'\"\nlipo -extract x86_64 \"${ITEM}\" -o \"${ITEM}\"\necho \"Signing '${ITEM}'\"\ncodesign --force --verbose --sign \"${CODE_SIGN_IDENTITY_FOR_ITEMS}\" --entitlements \"${CODE_SIGN_ENTITLEMENTS}\" \"${ITEM}\"\nRESULT=$?\nif [[ $RESULT != 0 ]] ; then\necho \"Failed to sign '${ITEM}'.\"\nIFS=$SAVED_IFS\nexit 1\nfi\ndone\n\n# Restore $IFS.\nIFS=$SAVED_IFS\n\nfi\n"; }; E42962A92163ECCD00A6A9E2 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; @@ -1881,7 +1827,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "xcodebuild -project \"$OF_PATH/libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj\" -target openFrameworks -configuration \"${CONFIGURATION}\"\n"; + shellScript = "xcodebuild -project \"$OF_PATH/libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj\" -target openFrameworks -configuration \"${CONFIGURATION}\""; }; E4B6FFFD0C3F9AB9008CF71C /* ShellScript */ = { isa = PBXShellScriptBuildPhase; @@ -1894,7 +1840,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "mkdir -p \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Resources/\"\n# Copy default icon file into App/Resources\nrsync -aved \"$ICON_FILE\" \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Resources/\"\n# Copy libfmod and change install directory for fmod to run\nrsync -aved \"$OF_PATH/libs/fmod/lib/osx/libfmod.dylib\" \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks/\";\ninstall_name_tool -change @executable_path/libfmodex.dylib @executable_path/../Frameworks/libfmodex.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\";\n\necho \"$GCC_PREPROCESSOR_DEFINITIONS\";\n"; + shellScript = "mkdir -p \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Resources/\"\n# Copy default icon file into App/Resources\nrsync -aved \"$ICON_FILE\" \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Resources/\"\n# Copy libfmod and change install directory for fmod to run\nrsync -aved \"$OF_PATH/libs/fmod/lib/osx/libfmod.dylib\" \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks/\";\n# Not needed as we now call install_name_tool -id @loader_path/../Frameworks/libfmod.dylib libfmod.dylib on the dylib directly which prevents the need for calling every post build - keeping here for reference and possible legacy usage \n# install_name_tool -change @rpath/libfmod.dylib @executable_path/../Frameworks/libfmod.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\";\n\necho \"$GCC_PREPROCESSOR_DEFINITIONS\";\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -1906,8 +1852,6 @@ E4B69E200A3A1BDC003C02F2 /* main.cpp in Sources */, E4B69E210A3A1BDC003C02F2 /* ofApp.cpp in Sources */, BDCF478C4EBDE821E6E29C6C /* ThreadedSystemCall.cpp in Sources */, - D820615CFDD5F497033D7C5A /* ofxBiquadFilter.cpp in Sources */, - A7CF97A6E1DAE4A002CA6F82 /* ofxBiquadFilterInstance.cpp in Sources */, 856AA354D08AB4B323081444 /* ofxBaseGui.cpp in Sources */, 5CBB2AB3A60F65431D7B555D /* ofxButton.cpp in Sources */, 853E0BA2F448076739446874 /* ofxColorPicker.cpp in Sources */, @@ -1961,7 +1905,6 @@ 3433E2A234C5EB99BE2654F6 /* FilteredStreams.cpp in Sources */, 30050FAC4E27016914F7D8AE /* Hash.cpp in Sources */, F953E11952BFF8C207418550 /* HexBinaryEncoding.cpp in Sources */, - 94E22CF92882062400C8F3C0 /* EmotiBitPacket.cpp in Sources */, B3E6D60405574847412D7441 /* HiddenFileFilter.cpp in Sources */, 2052DE964A69C81B3F68CCB0 /* ImageUtils.cpp in Sources */, BC187E3BEC1C894471B93EA6 /* JSONUtils.cpp in Sources */, @@ -1981,11 +1924,8 @@ D81A435CE7FDF51B41956210 /* snappy-sinksource.cc in Sources */, 1298066D39CE7EC3DA60256A /* snappy-stubs-internal.cc in Sources */, 868BEDC19B53FD512D7E3100 /* snappy.cc 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 */, + FB84AAF8D1B7A95266DB5C09 /* jsoncpp.cpp in Sources */, + BEDFEE7400C58EA4E412B757 /* ofxJSONElement.cpp in Sources */, 199E20C3CE29DBDA5F9DA16C /* BufferedSerialDevice.cpp in Sources */, E47400D4565245776213FFD6 /* SerialDevice.cpp in Sources */, DB1B6C56A8D6E1DF0AB8B5DA /* SerialDeviceUtils.cpp in Sources */, @@ -1996,11 +1936,6 @@ DABEB23B35B4884860B1A814 /* unix.cc in Sources */, 55DE46182F529D5E0D756503 /* win.cc in Sources */, 3336758D15FD0710326AAC25 /* serial.cc 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; }; @@ -2032,7 +1967,6 @@ "$(OF_CORE_HEADERS)", src, src, - ../../../addons/ofxBiquadFilter/src, ../../../addons/ofxEmotiBit/src, ../../../addons/ofxEmotiBit/src/Signal, ../../../addons/ofxGui/src, @@ -2058,7 +1992,12 @@ ../../../addons/ofxIO/libs/snappy, ../../../addons/ofxIO/libs/snappy/src, ../../../addons/ofxIO/src, - ../../../addons/ofxNetwork/src, + ../../../addons/ofxJSON/libs, + ../../../addons/ofxJSON/libs/jsoncpp, + ../../../addons/ofxJSON/libs/jsoncpp/include, + ../../../addons/ofxJSON/libs/jsoncpp/include/json, + ../../../addons/ofxJSON/libs/jsoncpp/src, + ../../../addons/ofxJSON/src, ../../../addons/ofxSerial/libs, ../../../addons/ofxSerial/libs/ofxSerial, ../../../addons/ofxSerial/libs/ofxSerial/include, @@ -2073,16 +2012,10 @@ ../../../addons/ofxSerial/libs/serial/src/impl, ../../../addons/ofxSerial/libs/serial/src/impl/list_ports, ../../../addons/ofxSerial/src, - ../../../addons/ofxThreadedLogger/src, - ../../../addons/ofxXmlSettings/libs, - ../../../addons/ofxXmlSettings/src, ); MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_CODE_SIGN_FLAGS = "--deep"; - OTHER_CPLUSPLUSFLAGS = ( - "-D__MACOSX_CORE__", - "-mtune=native", - ); + OTHER_CPLUSPLUSFLAGS = "-D__MACOSX_CORE__"; SDKROOT = macosx; }; name = AppStore; @@ -2101,7 +2034,6 @@ "$(OF_CORE_HEADERS)", src, src, - ../../../addons/ofxBiquadFilter/src, ../../../addons/ofxEmotiBit/src, ../../../addons/ofxEmotiBit/src/Signal, ../../../addons/ofxGui/src, @@ -2127,7 +2059,12 @@ ../../../addons/ofxIO/libs/snappy, ../../../addons/ofxIO/libs/snappy/src, ../../../addons/ofxIO/src, - ../../../addons/ofxNetwork/src, + ../../../addons/ofxJSON/libs, + ../../../addons/ofxJSON/libs/jsoncpp, + ../../../addons/ofxJSON/libs/jsoncpp/include, + ../../../addons/ofxJSON/libs/jsoncpp/include/json, + ../../../addons/ofxJSON/libs/jsoncpp/src, + ../../../addons/ofxJSON/src, ../../../addons/ofxSerial/libs, ../../../addons/ofxSerial/libs/ofxSerial, ../../../addons/ofxSerial/libs/ofxSerial/include, @@ -2142,19 +2079,14 @@ ../../../addons/ofxSerial/libs/serial/src/impl, ../../../addons/ofxSerial/libs/serial/src/impl/list_ports, ../../../addons/ofxSerial/src, - ../../../addons/ofxThreadedLogger/src, - ../../../addons/ofxXmlSettings/libs, - ../../../addons/ofxXmlSettings/src, - ../../../addons/EmotiBit_XPlat_Utils/src, ); - ICON = "$(ICON_NAME_RELEASE)"; - ICON_FILE = ../EmotiBitIcons/macOS/; - ICON_FILE_PATH = ../EmotiBitIcons/macOS/; - ICON_NAME_DEBUG = EmotiBit.icns; - ICON_NAME_RELEASE = EmotiBit.icns; + ICON = EmotiBit.icns; + ICON_FILE = "$(ICON_FILE_PATH)$(ICON)"; + ICON_FILE_PATH = ../EmotiBitIcons/macos/; INFOPLIST_FILE = "openFrameworks-Info.plist"; INSTALL_PATH = /Applications; LIBRARY_SEARCH_PATHS = "$(inherited)"; + MACOSX_DEPLOYMENT_TARGET = 10.14; OTHER_LDFLAGS = ( "$(OF_CORE_LIBS)", "$(OF_CORE_FRAMEWORKS)", @@ -2198,7 +2130,6 @@ "$(OF_CORE_HEADERS)", src, src, - ../../../addons/ofxBiquadFilter/src, ../../../addons/ofxEmotiBit/src, ../../../addons/ofxEmotiBit/src/Signal, ../../../addons/ofxGui/src, @@ -2224,7 +2155,12 @@ ../../../addons/ofxIO/libs/snappy, ../../../addons/ofxIO/libs/snappy/src, ../../../addons/ofxIO/src, - ../../../addons/ofxNetwork/src, + ../../../addons/ofxJSON/libs, + ../../../addons/ofxJSON/libs/jsoncpp, + ../../../addons/ofxJSON/libs/jsoncpp/include, + ../../../addons/ofxJSON/libs/jsoncpp/include/json, + ../../../addons/ofxJSON/libs/jsoncpp/src, + ../../../addons/ofxJSON/src, ../../../addons/ofxSerial/libs, ../../../addons/ofxSerial/libs/ofxSerial, ../../../addons/ofxSerial/libs/ofxSerial/include, @@ -2239,17 +2175,11 @@ ../../../addons/ofxSerial/libs/serial/src/impl, ../../../addons/ofxSerial/libs/serial/src/impl/list_ports, ../../../addons/ofxSerial/src, - ../../../addons/ofxThreadedLogger/src, - ../../../addons/ofxXmlSettings/libs, - ../../../addons/ofxXmlSettings/src, ); MACOSX_DEPLOYMENT_TARGET = 10.9; ONLY_ACTIVE_ARCH = YES; OTHER_CODE_SIGN_FLAGS = "--deep"; - OTHER_CPLUSPLUSFLAGS = ( - "-D__MACOSX_CORE__", - "-mtune=native", - ); + OTHER_CPLUSPLUSFLAGS = "-D__MACOSX_CORE__"; SDKROOT = macosx; }; name = Debug; @@ -2278,7 +2208,6 @@ "$(OF_CORE_HEADERS)", src, src, - ../../../addons/ofxBiquadFilter/src, ../../../addons/ofxEmotiBit/src, ../../../addons/ofxEmotiBit/src/Signal, ../../../addons/ofxGui/src, @@ -2304,7 +2233,12 @@ ../../../addons/ofxIO/libs/snappy, ../../../addons/ofxIO/libs/snappy/src, ../../../addons/ofxIO/src, - ../../../addons/ofxNetwork/src, + ../../../addons/ofxJSON/libs, + ../../../addons/ofxJSON/libs/jsoncpp, + ../../../addons/ofxJSON/libs/jsoncpp/include, + ../../../addons/ofxJSON/libs/jsoncpp/include/json, + ../../../addons/ofxJSON/libs/jsoncpp/src, + ../../../addons/ofxJSON/src, ../../../addons/ofxSerial/libs, ../../../addons/ofxSerial/libs/ofxSerial, ../../../addons/ofxSerial/libs/ofxSerial/include, @@ -2319,16 +2253,10 @@ ../../../addons/ofxSerial/libs/serial/src/impl, ../../../addons/ofxSerial/libs/serial/src/impl/list_ports, ../../../addons/ofxSerial/src, - ../../../addons/ofxThreadedLogger/src, - ../../../addons/ofxXmlSettings/libs, - ../../../addons/ofxXmlSettings/src, ); MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_CODE_SIGN_FLAGS = "--deep"; - OTHER_CPLUSPLUSFLAGS = ( - "-D__MACOSX_CORE__", - "-mtune=native", - ); + OTHER_CPLUSPLUSFLAGS = "-D__MACOSX_CORE__"; SDKROOT = macosx; }; name = Release; @@ -2343,12 +2271,10 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_MODEL_TUNING = NONE; - "GCC_PREPROCESSOR_DEFINITIONS[arch=*]" = EMOTIBIT_FW_INST_DEBUG; HEADER_SEARCH_PATHS = ( "$(OF_CORE_HEADERS)", src, src, - ../../../addons/ofxBiquadFilter/src, ../../../addons/ofxEmotiBit/src, ../../../addons/ofxEmotiBit/src/Signal, ../../../addons/ofxGui/src, @@ -2374,7 +2300,12 @@ ../../../addons/ofxIO/libs/snappy, ../../../addons/ofxIO/libs/snappy/src, ../../../addons/ofxIO/src, - ../../../addons/ofxNetwork/src, + ../../../addons/ofxJSON/libs, + ../../../addons/ofxJSON/libs/jsoncpp, + ../../../addons/ofxJSON/libs/jsoncpp/include, + ../../../addons/ofxJSON/libs/jsoncpp/include/json, + ../../../addons/ofxJSON/libs/jsoncpp/src, + ../../../addons/ofxJSON/src, ../../../addons/ofxSerial/libs, ../../../addons/ofxSerial/libs/ofxSerial, ../../../addons/ofxSerial/libs/ofxSerial/include, @@ -2389,20 +2320,14 @@ ../../../addons/ofxSerial/libs/serial/src/impl, ../../../addons/ofxSerial/libs/serial/src/impl/list_ports, ../../../addons/ofxSerial/src, - ../../../addons/ofxThreadedLogger/src, - ../../../addons/ofxXmlSettings/libs, - ../../../addons/ofxXmlSettings/src, - ../../../addons/EmotiBit_XPlat_Utils/src, ); - ICON = "$(ICON_NAME_DEBUG)"; - ICON_FILE = ../EmotiBitIcons/macOS/; - ICON_FILE_PATH = ../EmotiBitIcons/macOS/; - ICON_NAME_DEBUG = EmotiBit.icns; - ICON_NAME_RELEASE = EmotiBit.icns; + ICON = EmotiBit.icns; + ICON_FILE = "$(ICON_FILE_PATH)$(ICON)"; + ICON_FILE_PATH = ../EmotiBitIcons/macos/; INFOPLIST_FILE = "openFrameworks-Info.plist"; INSTALL_PATH = /Applications; LIBRARY_SEARCH_PATHS = "$(inherited)"; - OTHER_CPLUSPLUSFLAGS = "-D__MACOSX_CORE__"; + MACOSX_DEPLOYMENT_TARGET = 10.14; OTHER_LDFLAGS = ( "$(OF_CORE_LIBS)", "$(OF_CORE_FRAMEWORKS)", @@ -2427,7 +2352,7 @@ baseConfigurationReference = E4EB6923138AFD0F00A09F29 /* Project.xcconfig */; buildSettings = { COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = NO; + COPY_PHASE_STRIP = YES; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_MODEL_TUNING = NONE; @@ -2435,7 +2360,6 @@ "$(OF_CORE_HEADERS)", src, src, - ../../../addons/ofxBiquadFilter/src, ../../../addons/ofxEmotiBit/src, ../../../addons/ofxEmotiBit/src/Signal, ../../../addons/ofxGui/src, @@ -2461,7 +2385,12 @@ ../../../addons/ofxIO/libs/snappy, ../../../addons/ofxIO/libs/snappy/src, ../../../addons/ofxIO/src, - ../../../addons/ofxNetwork/src, + ../../../addons/ofxJSON/libs, + ../../../addons/ofxJSON/libs/jsoncpp, + ../../../addons/ofxJSON/libs/jsoncpp/include, + ../../../addons/ofxJSON/libs/jsoncpp/include/json, + ../../../addons/ofxJSON/libs/jsoncpp/src, + ../../../addons/ofxJSON/src, ../../../addons/ofxSerial/libs, ../../../addons/ofxSerial/libs/ofxSerial, ../../../addons/ofxSerial/libs/ofxSerial/include, @@ -2476,20 +2405,14 @@ ../../../addons/ofxSerial/libs/serial/src/impl, ../../../addons/ofxSerial/libs/serial/src/impl/list_ports, ../../../addons/ofxSerial/src, - ../../../addons/ofxThreadedLogger/src, - ../../../addons/ofxXmlSettings/libs, - ../../../addons/ofxXmlSettings/src, - ../../../addons/EmotiBit_XPlat_Utils/src, ); - ICON = "$(ICON_NAME_RELEASE)"; - ICON_FILE = ../EmotiBitIcons/macOS/; - ICON_FILE_PATH = ../EmotiBitIcons/macOS/; - ICON_NAME_DEBUG = EmotiBit.icns; - ICON_NAME_RELEASE = EmotiBit.icns; + ICON = EmotiBit.icns; + ICON_FILE = "$(ICON_FILE_PATH)$(ICON)"; + ICON_FILE_PATH = ../EmotiBitIcons/macos/; INFOPLIST_FILE = "openFrameworks-Info.plist"; INSTALL_PATH = /Applications; LIBRARY_SEARCH_PATHS = "$(inherited)"; - OTHER_CPLUSPLUSFLAGS = "-D__MACOSX_CORE__"; + MACOSX_DEPLOYMENT_TARGET = 10.14; 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 index ced5d498..95378b51 100644 --- a/EmotiBitFirmwareInstaller/EmotiBitFirmwareInstaller.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme +++ b/EmotiBitFirmwareInstaller/EmotiBitFirmwareInstaller.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme @@ -1,6 +1,6 @@ + + + + @@ -37,7 +46,7 @@ launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" - debugDocumentVersioning = "YES" + debugDocumentVersioning = "NO" debugServiceExtension = "internal" allowLocationSimulation = "YES"> + debugDocumentVersioning = "NO"> diff --git a/EmotiBitFirmwareInstaller/EmotiBitFirmwareInstaller.xcodeproj/xcshareddata/xcschemes/Release.xcscheme b/EmotiBitFirmwareInstaller/EmotiBitFirmwareInstaller.xcodeproj/xcshareddata/xcschemes/Release.xcscheme index 57906174..f92b316e 100644 --- a/EmotiBitFirmwareInstaller/EmotiBitFirmwareInstaller.xcodeproj/xcshareddata/xcschemes/Release.xcscheme +++ b/EmotiBitFirmwareInstaller/EmotiBitFirmwareInstaller.xcodeproj/xcshareddata/xcschemes/Release.xcscheme @@ -1,6 +1,6 @@ + + + + @@ -37,7 +46,7 @@ launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" - debugDocumentVersioning = "YES" + debugDocumentVersioning = "NO" debugServiceExtension = "internal" allowLocationSimulation = "YES"> + debugDocumentVersioning = "NO"> + buildConfiguration = "Release"> This app needs to access the camera NSMicrophoneUsageDescription This app needs to access the microphone + NSHighResolutionCapable + diff --git a/EmotiBitInstaller/EmotiBitInstaller/EmotiBitInstaller.vdproj b/EmotiBitInstaller/EmotiBitInstaller/EmotiBitInstaller.vdproj index 028a16ca..fb4d4295 100644 --- a/EmotiBitInstaller/EmotiBitInstaller/EmotiBitInstaller.vdproj +++ b/EmotiBitInstaller/EmotiBitInstaller/EmotiBitInstaller.vdproj @@ -2224,15 +2224,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:EmotiBit" - "ProductCode" = "8:{DCF16966-39F7-4CD7-A31A-9DA779A5DF74}" - "PackageCode" = "8:{59B98675-8248-4598-BEED-05C0E58064E2}" + "ProductCode" = "8:{B2F470EF-3C46-46C9-9948-9446D059330D}" + "PackageCode" = "8:{D92B0F2C-0A13-4AC9-9143-34348B3CF4AB}" "UpgradeCode" = "8:{AAD962FC-B6FF-472D-BFD0-D28410DAD03A}" "AspNetVersion" = "8:" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.12.1" + "ProductVersion" = "8:1.12.2" "Manufacturer" = "8:EmotiBit" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" diff --git a/EmotiBitOscilloscope/EmotiBitOscilloscope.xcodeproj/project.pbxproj b/EmotiBitOscilloscope/EmotiBitOscilloscope.xcodeproj/project.pbxproj index d2329c73..6366e2ae 100644 --- a/EmotiBitOscilloscope/EmotiBitOscilloscope.xcodeproj/project.pbxproj +++ b/EmotiBitOscilloscope/EmotiBitOscilloscope.xcodeproj/project.pbxproj @@ -8,6 +8,7 @@ /* Begin PBXBuildFile section */ 0059E2448E2CB4FECB0BEF66 /* ofxOscilloscope.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FF0DE1E8ABD60252EE51633 /* ofxOscilloscope.cpp */; }; + 02FA22EAD4CE81F39CC58EEA /* Periodizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CA65A234F6CABD350A1BA57 /* Periodizer.cpp */; }; 0546D1A38E13BD319CC9755B /* OscReceivedElements.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BF3AA0D4FAA89D0F8A0E545 /* OscReceivedElements.cpp */; }; 125506CD3E5F428AAFE5CC65 /* ofxTCPManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F399B91E98DC31CDA6DDACB4 /* ofxTCPManager.cpp */; }; 1C36947250DCB09A8A375C0C /* ofxXmlPoco.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9998694E5001F9CF0B13BF0 /* ofxXmlPoco.cpp */; }; @@ -18,169 +19,173 @@ 5864AD82E20F15536D054EA3 /* ofxOscMessage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF49D76C45D5DB505A234880 /* ofxOscMessage.cpp */; }; 5A4349E9754D6FA14C0F2A3A /* tinyxmlparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FC5DA1C87211D4F6377DA719 /* tinyxmlparser.cpp */; }; 5CBB2AB3A60F65431D7B555D /* ofxButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C88333E71C9457E441C33474 /* ofxButton.cpp */; }; - 5FD318D4DCF1B7169E9F1F64 /* EmotiBitTestingHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A8815F94AF8B1A79DAF932B /* EmotiBitTestingHelper.cpp */; }; + 5CE4E12FF3BBF9B3E2A42B3D /* SoftwareVersionChecker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9B3B69F1411454D188127C4E /* SoftwareVersionChecker.cpp */; }; 62545D179C94265CA1389D4A /* OscOutboundPacketStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 63A47AC60FFAFC3BF093EC0F /* OscOutboundPacketStream.cpp */; }; - 633AFFDB4EC6674D34F0EF7D /* IPAddressRange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2FA5A4362497FA77DF9B5A19 /* IPAddressRange.cpp */; }; 63B57AC5BF4EF088491E0317 /* ofxXmlSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50DF87D612C5AAE17AAFA6C0 /* ofxXmlSettings.cpp */; }; 640279EE111671BD026CB013 /* ofxOscReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2FAC65C491D4231379F3298 /* ofxOscReceiver.cpp */; }; 661A1991F5CE4CCC2919D8E7 /* ofxNetworkUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AE30B18B42BAF0E92CB140E5 /* ofxNetworkUtils.cpp */; }; 66CA411C5A9664E27326BF36 /* ofxTCPServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C085E327DAB912CFA2A443D /* ofxTCPServer.cpp */; }; 67FE4C7B15C2F0478C8126C2 /* NetworkingUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B361208CD4107E479F04E7B /* NetworkingUtils.cpp */; }; - 69AF35586CA18EA57C5CFCD3 /* NetworkUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B557FD8519CC0900FAB1DCA2 /* NetworkUtils.cpp */; }; 72A929D3561B8232A182ABFC /* ofxOscBundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65EEFA3DA3526E9CDD9C21F9 /* ofxOscBundle.cpp */; }; + 732E09778AF48F7EDA9AED95 /* ofxLSLReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEF1AFCA5C7778FF4E205A6E /* ofxLSLReceiver.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 */; }; 879A251454401BC0B6E4F238 /* OscTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D9BFFBBF4CC43DEE890B3C3E /* OscTypes.cpp */; }; - 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 */; }; - 8E016F7D2832CE28005D7C65 /* EmotiBitEdaCalibration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E016F732832CE28005D7C65 /* EmotiBitEdaCalibration.cpp */; }; - 8E016F7E2832CE28005D7C65 /* DigitalFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E016F752832CE28005D7C65 /* DigitalFilter.cpp */; }; - 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 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 */; }; - 8E07BBD52BB3B46400CDD443 /* EmotiBitOfUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E07BBD32BB3B46400CDD443 /* EmotiBitOfUtils.cpp */; }; - 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 */; }; + 8EF01AD62E452E8C00BF0971 /* EmotiBitPacket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8EF01ACB2E452E8B00BF0971 /* EmotiBitPacket.cpp */; }; + 8EF01AE02E45302800BF0971 /* EmotiBitWiFiHost.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8EF01ADC2E45302800BF0971 /* EmotiBitWiFiHost.cpp */; }; + 8EF01AE12E45302800BF0971 /* EmotiBitLsl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8EF01ADD2E45302800BF0971 /* EmotiBitLsl.cpp */; }; + 8EF01AEC2E4530F600BF0971 /* PatchboardJson.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8EF01AE62E4530F500BF0971 /* PatchboardJson.cpp */; }; + 8EF01AED2E4530F600BF0971 /* PatchboardXml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8EF01AE72E4530F500BF0971 /* PatchboardXml.cpp */; }; + 8EF01AEE2E4530F600BF0971 /* PatchboardBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8EF01AEA2E4530F500BF0971 /* PatchboardBase.cpp */; }; + 8EF01AF12E4532BC00BF0971 /* EmotiBitTestingHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8EF01AEF2E4532BC00BF0971 /* EmotiBitTestingHelper.cpp */; }; + 8EF01AF42E4533E300BF0971 /* liblsl.1.14.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 8EF01AF32E4533E300BF0971 /* liblsl.1.14.0.dylib */; }; + 8EF01AFF2E45385A00BF0971 /* ofxOscilloscopeSettings.xml in Copy Files to Resources */ = {isa = PBXBuildFile; fileRef = 8EF01AF72E45385A00BF0971 /* ofxOscilloscopeSettings.xml */; }; + 8EF01B002E45385A00BF0971 /* oscOutputSettings.xml in Copy Files to Resources */ = {isa = PBXBuildFile; fileRef = 8EF01AF82E45385A00BF0971 /* oscOutputSettings.xml */; }; + 8EF01B012E45385A00BF0971 /* emotibitCommSettings.json in Copy Files to Resources */ = {isa = PBXBuildFile; fileRef = 8EF01AF92E45385A00BF0971 /* emotibitCommSettings.json */; }; + 8EF01B022E45385A00BF0971 /* verdana.ttf in Copy Files to Resources */ = {isa = PBXBuildFile; fileRef = 8EF01AFA2E45385A00BF0971 /* verdana.ttf */; }; + 8EF01B032E45385A00BF0971 /* verdanab.ttf in Copy Files to Resources */ = {isa = PBXBuildFile; fileRef = 8EF01AFB2E45385A00BF0971 /* verdanab.ttf */; }; + 8EF01B042E45385A00BF0971 /* udpOutputSettings.xml in Copy Files to Resources */ = {isa = PBXBuildFile; fileRef = 8EF01AFC2E45385A00BF0971 /* udpOutputSettings.xml */; }; + 8EF01B052E45385A00BF0971 /* lslOutputSettings.json in Copy Files to Resources */ = {isa = PBXBuildFile; fileRef = 8EF01AFD2E45385A00BF0971 /* lslOutputSettings.json */; }; + 8EF01B062E45385A00BF0971 /* inputSettings.xml in Copy Files to Resources */ = {isa = PBXBuildFile; fileRef = 8EF01AFE2E45385A00BF0971 /* inputSettings.xml */; }; + 8EF01B572E4544B600BF0971 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4B69E1D0A3A1BDC003C02F2 /* main.cpp */; }; + 8EF01B582E4544B600BF0971 /* ofApp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4B69E1E0A3A1BDC003C02F2 /* ofApp.cpp */; }; + 8EF01B592E4544B600BF0971 /* ofxBiquadFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 55E6502FFB31969C644E02C1 /* ofxBiquadFilter.cpp */; }; + 8EF01B5A2E4544B600BF0971 /* ofxBiquadFilterInstance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F32C175B3E53B0864752B5D7 /* ofxBiquadFilterInstance.cpp */; }; + 8EF01B5B2E4544B600BF0971 /* EmotiBitOfUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0BDE549108B6A79D110451A5 /* EmotiBitOfUtils.cpp */; }; + 8EF01B5C2E4544B600BF0971 /* Periodizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CA65A234F6CABD350A1BA57 /* Periodizer.cpp */; }; + 8EF01B5D2E4544B600BF0971 /* SoftwareVersionChecker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9B3B69F1411454D188127C4E /* SoftwareVersionChecker.cpp */; }; + 8EF01B5E2E4544B600BF0971 /* ofxBaseGui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9604B925D32EE39065747725 /* ofxBaseGui.cpp */; }; + 8EF01B5F2E4544B600BF0971 /* EmotiBitTestingHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8EF01AEF2E4532BC00BF0971 /* EmotiBitTestingHelper.cpp */; }; + 8EF01B602E4544B600BF0971 /* ofxButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C88333E71C9457E441C33474 /* ofxButton.cpp */; }; + 8EF01B612E4544B600BF0971 /* ofxColorPicker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 181D363B6DD54D1FA6309C43 /* ofxColorPicker.cpp */; }; + 8EF01B622E4544B600BF0971 /* ofxGuiGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECF8674C7975F1063C5E30CA /* ofxGuiGroup.cpp */; }; + 8EF01B632E4544B600BF0971 /* PatchboardBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8EF01AEA2E4530F500BF0971 /* PatchboardBase.cpp */; }; + 8EF01B642E4544B600BF0971 /* ofxInputField.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 44B351490B620D04E1E7C52D /* ofxInputField.cpp */; }; + 8EF01B652E4544B600BF0971 /* ofxLabel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78D67A00EB899FAC09430597 /* ofxLabel.cpp */; }; + 8EF01B662E4544B600BF0971 /* ofxPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E112B3AEBEA2C091BF2B40AE /* ofxPanel.cpp */; }; + 8EF01B672E4544B600BF0971 /* ofxSlider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15F2C6477A769C03A56D1401 /* ofxSlider.cpp */; }; + 8EF01B682E4544B600BF0971 /* ofxSliderGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 802251BAF1B35B1D67B32FD0 /* ofxSliderGroup.cpp */; }; + 8EF01B692E4544B600BF0971 /* EmotiBitWiFiHost.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8EF01ADC2E45302800BF0971 /* EmotiBitWiFiHost.cpp */; }; + 8EF01B6A2E4544B600BF0971 /* ofxToggle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 907C5B5E104864A2D3A25745 /* ofxToggle.cpp */; }; + 8EF01B6B2E4544B600BF0971 /* PatchboardXml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8EF01AE72E4530F500BF0971 /* PatchboardXml.cpp */; }; + 8EF01B6C2E4544B600BF0971 /* jsoncpp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 21BDE665988474F1B1F4D302 /* jsoncpp.cpp */; }; + 8EF01B6D2E4544B600BF0971 /* ofxJSONElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F2B099E6BD1199664C48B177 /* ofxJSONElement.cpp */; }; + 8EF01B6E2E4544B600BF0971 /* tinyxml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B40EDA85BEB63E46785BC29 /* tinyxml.cpp */; }; + 8EF01B6F2E4544B600BF0971 /* tinyxmlerror.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 832BDC407620CDBA568B713D /* tinyxmlerror.cpp */; }; + 8EF01B702E4544B600BF0971 /* tinyxmlparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FC5DA1C87211D4F6377DA719 /* tinyxmlparser.cpp */; }; + 8EF01B712E4544B600BF0971 /* ofxXmlSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50DF87D612C5AAE17AAFA6C0 /* ofxXmlSettings.cpp */; }; + 8EF01B722E4544B600BF0971 /* EmotiBitPacket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8EF01ACB2E452E8B00BF0971 /* EmotiBitPacket.cpp */; }; + 8EF01B732E4544B600BF0971 /* PatchboardJson.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8EF01AE62E4530F500BF0971 /* PatchboardJson.cpp */; }; + 8EF01B742E4544B600BF0971 /* ofxLSLReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEF1AFCA5C7778FF4E205A6E /* ofxLSLReceiver.cpp */; }; + 8EF01B752E4544B600BF0971 /* ofxLSLResolver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E74CC9A47519DC1EE94DECC6 /* ofxLSLResolver.cpp */; }; + 8EF01B762E4544B600BF0971 /* ofxNetworkUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AE30B18B42BAF0E92CB140E5 /* ofxNetworkUtils.cpp */; }; + 8EF01B772E4544B600BF0971 /* ofxTCPClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BF88F02779DD820913ACEA06 /* ofxTCPClient.cpp */; }; + 8EF01B782E4544B600BF0971 /* ofxTCPManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F399B91E98DC31CDA6DDACB4 /* ofxTCPManager.cpp */; }; + 8EF01B792E4544B600BF0971 /* ofxTCPServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C085E327DAB912CFA2A443D /* ofxTCPServer.cpp */; }; + 8EF01B7A2E4544B600BF0971 /* ofxUDPManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 35BB9BB90DBABFD3B39F8DB6 /* ofxUDPManager.cpp */; }; + 8EF01B7B2E4544B600BF0971 /* IpEndpointName.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADD194746185E2DA11468377 /* IpEndpointName.cpp */; }; + 8EF01B7C2E4544B600BF0971 /* NetworkingUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B361208CD4107E479F04E7B /* NetworkingUtils.cpp */; }; + 8EF01B7D2E4544B600BF0971 /* UdpSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E6DEF695B88BA5FAACEAA937 /* UdpSocket.cpp */; }; + 8EF01B7E2E4544B600BF0971 /* OscOutboundPacketStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 63A47AC60FFAFC3BF093EC0F /* OscOutboundPacketStream.cpp */; }; + 8EF01B7F2E4544B600BF0971 /* OscPrintReceivedElements.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC8881B3C8C0A1C45F042E7A /* OscPrintReceivedElements.cpp */; }; + 8EF01B802E4544B600BF0971 /* OscReceivedElements.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BF3AA0D4FAA89D0F8A0E545 /* OscReceivedElements.cpp */; }; + 8EF01B812E4544B600BF0971 /* OscTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D9BFFBBF4CC43DEE890B3C3E /* OscTypes.cpp */; }; + 8EF01B822E4544B600BF0971 /* ofxOscBundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65EEFA3DA3526E9CDD9C21F9 /* ofxOscBundle.cpp */; }; + 8EF01B832E4544B600BF0971 /* ofxOscMessage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF49D76C45D5DB505A234880 /* ofxOscMessage.cpp */; }; + 8EF01B842E4544B600BF0971 /* ofxOscParameterSync.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0AED834CE4DEC5260AF302A2 /* ofxOscParameterSync.cpp */; }; + 8EF01B852E4544B600BF0971 /* ofxOscReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2FAC65C491D4231379F3298 /* ofxOscReceiver.cpp */; }; + 8EF01B862E4544B600BF0971 /* ofxOscSender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81967292BFC87A0144BD32C6 /* ofxOscSender.cpp */; }; + 8EF01B872E4544B600BF0971 /* src in Sources */ = {isa = PBXBuildFile; fileRef = 24789A0EDE177CF74B2C49D6 /* src */; }; + 8EF01B882E4544B600BF0971 /* EmotiBitLsl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8EF01ADD2E45302800BF0971 /* EmotiBitLsl.cpp */; }; + 8EF01B892E4544B600BF0971 /* ofxOscilloscope.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FF0DE1E8ABD60252EE51633 /* ofxOscilloscope.cpp */; }; + 8EF01B8A2E4544B600BF0971 /* ofxXmlPoco.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9998694E5001F9CF0B13BF0 /* ofxXmlPoco.cpp */; }; + 8EF01B8B2E4544B600BF0971 /* ofxThreadedLogger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D6D75E57C2EB53518090D07A /* ofxThreadedLogger.cpp */; }; + 8EF01B932E4544B600BF0971 /* ofxOscilloscopeSettings.xml in Copy Files to Resources */ = {isa = PBXBuildFile; fileRef = 8EF01AF72E45385A00BF0971 /* ofxOscilloscopeSettings.xml */; }; + 8EF01B942E4544B600BF0971 /* oscOutputSettings.xml in Copy Files to Resources */ = {isa = PBXBuildFile; fileRef = 8EF01AF82E45385A00BF0971 /* oscOutputSettings.xml */; }; + 8EF01B952E4544B600BF0971 /* emotibitCommSettings.json in Copy Files to Resources */ = {isa = PBXBuildFile; fileRef = 8EF01AF92E45385A00BF0971 /* emotibitCommSettings.json */; }; + 8EF01B962E4544B600BF0971 /* verdana.ttf in Copy Files to Resources */ = {isa = PBXBuildFile; fileRef = 8EF01AFA2E45385A00BF0971 /* verdana.ttf */; }; + 8EF01B972E4544B600BF0971 /* verdanab.ttf in Copy Files to Resources */ = {isa = PBXBuildFile; fileRef = 8EF01AFB2E45385A00BF0971 /* verdanab.ttf */; }; + 8EF01B982E4544B600BF0971 /* udpOutputSettings.xml in Copy Files to Resources */ = {isa = PBXBuildFile; fileRef = 8EF01AFC2E45385A00BF0971 /* udpOutputSettings.xml */; }; + 8EF01B992E4544B600BF0971 /* lslOutputSettings.json in Copy Files to Resources */ = {isa = PBXBuildFile; fileRef = 8EF01AFD2E45385A00BF0971 /* lslOutputSettings.json */; }; + 8EF01B9A2E4544B600BF0971 /* inputSettings.xml in Copy Files to Resources */ = {isa = PBXBuildFile; fileRef = 8EF01AFE2E45385A00BF0971 /* inputSettings.xml */; }; + 8EF01BA22E45450F00BF0971 /* liblsl.1.14.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 8EF01BA12E45450F00BF0971 /* liblsl.1.14.0.dylib */; }; 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 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 */; }; 960D20B191346612D5C05A6A /* ofxTCPClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BF88F02779DD820913ACEA06 /* ofxTCPClient.cpp */; }; 9CA591B9A40F2386FE099328 /* ofxThreadedLogger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D6D75E57C2EB53518090D07A /* ofxThreadedLogger.cpp */; }; 9D44DC88EF9E7991B4A09951 /* tinyxmlerror.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 832BDC407620CDBA568B713D /* tinyxmlerror.cpp */; }; + A62D60DE496AFBDB73BD1D13 /* src in Sources */ = {isa = PBXBuildFile; fileRef = 24789A0EDE177CF74B2C49D6 /* src */; }; A7CF97A6E1DAE4A002CA6F82 /* ofxBiquadFilterInstance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F32C175B3E53B0864752B5D7 /* ofxBiquadFilterInstance.cpp */; }; ADE367465D2A8EBAD4C7A8D9 /* IpEndpointName.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADD194746185E2DA11468377 /* IpEndpointName.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 */; }; - B990E5B92C0E7A370094B63E /* SoftwareVersionChecker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E07BBAB2B1F824D00CDD443 /* SoftwareVersionChecker.cpp */; }; - B990E5BA2C0E7A370094B63E /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4B69E1D0A3A1BDC003C02F2 /* main.cpp */; }; - B990E5BB2C0E7A370094B63E /* ofApp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4B69E1E0A3A1BDC003C02F2 /* ofApp.cpp */; }; - B990E5BC2C0E7A370094B63E /* ofxBiquadFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 55E6502FFB31969C644E02C1 /* ofxBiquadFilter.cpp */; }; - B990E5BD2C0E7A370094B63E /* ofxBiquadFilterInstance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F32C175B3E53B0864752B5D7 /* ofxBiquadFilterInstance.cpp */; }; - 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 */; }; - 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 */; }; - B990E5C62C0E7A370094B63E /* ofxButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C88333E71C9457E441C33474 /* ofxButton.cpp */; }; - B990E5C72C0E7A370094B63E /* PatchboardJson.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E07BBC72BB3B2BF00CDD443 /* PatchboardJson.cpp */; }; - B990E5C82C0E7A370094B63E /* ofxColorPicker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 181D363B6DD54D1FA6309C43 /* ofxColorPicker.cpp */; }; - B990E5C92C0E7A370094B63E /* ofxGuiGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECF8674C7975F1063C5E30CA /* ofxGuiGroup.cpp */; }; - B990E5CA2C0E7A370094B63E /* ofxInputField.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 44B351490B620D04E1E7C52D /* ofxInputField.cpp */; }; - B990E5CB2C0E7A370094B63E /* DigitalFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E016F752832CE28005D7C65 /* DigitalFilter.cpp */; }; - B990E5CC2C0E7A370094B63E /* ofxLabel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78D67A00EB899FAC09430597 /* ofxLabel.cpp */; }; - B990E5CD2C0E7A370094B63E /* Periodizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E016F832832CE82005D7C65 /* Periodizer.cpp */; }; - B990E5CE2C0E7A370094B63E /* ofxPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E112B3AEBEA2C091BF2B40AE /* ofxPanel.cpp */; }; - B990E5CF2C0E7A370094B63E /* ofxSlider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15F2C6477A769C03A56D1401 /* ofxSlider.cpp */; }; - B990E5D02C0E7A370094B63E /* ofxSliderGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 802251BAF1B35B1D67B32FD0 /* ofxSliderGroup.cpp */; }; - B990E5D12C0E7A370094B63E /* ofxToggle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 907C5B5E104864A2D3A25745 /* ofxToggle.cpp */; }; - B990E5D22C0E7A370094B63E /* ofxNetworkUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AE30B18B42BAF0E92CB140E5 /* ofxNetworkUtils.cpp */; }; - B990E5D32C0E7A370094B63E /* ofxLSLReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 948E6B4E28528CA5000A8B76 /* ofxLSLReceiver.cpp */; }; - B990E5D42C0E7A370094B63E /* EmotiBitOfUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E07BBD32BB3B46400CDD443 /* EmotiBitOfUtils.cpp */; }; - B990E5D52C0E7A370094B63E /* EmotiBitPacket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E016F762832CE28005D7C65 /* EmotiBitPacket.cpp */; }; - B990E5D62C0E7A370094B63E /* ofxTCPClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BF88F02779DD820913ACEA06 /* ofxTCPClient.cpp */; }; - B990E5D72C0E7A370094B63E /* ofxTCPManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F399B91E98DC31CDA6DDACB4 /* ofxTCPManager.cpp */; }; - B990E5D82C0E7A370094B63E /* ofxTCPServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C085E327DAB912CFA2A443D /* ofxTCPServer.cpp */; }; - B990E5D92C0E7A370094B63E /* ofxUDPManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 35BB9BB90DBABFD3B39F8DB6 /* ofxUDPManager.cpp */; }; - B990E5DA2C0E7A370094B63E /* ofxXmlPoco.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9998694E5001F9CF0B13BF0 /* ofxXmlPoco.cpp */; }; - B990E5DB2C0E7A370094B63E /* IPAddressRange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2FA5A4362497FA77DF9B5A19 /* IPAddressRange.cpp */; }; - B990E5DC2C0E7A370094B63E /* NetworkInterfaceListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 44D29F961AB993B629D7C467 /* NetworkInterfaceListener.cpp */; }; - B990E5DD2C0E7A370094B63E /* NetworkUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B557FD8519CC0900FAB1DCA2 /* NetworkUtils.cpp */; }; - B990E5DE2C0E7A370094B63E /* ofxNetworkUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14A43221DDD441A2AC353651 /* ofxNetworkUtils.cpp */; }; - B990E5DF2C0E7A370094B63E /* PatchboardBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E07BBCC2BB3B2BF00CDD443 /* PatchboardBase.cpp */; }; - B990E5E02C0E7A370094B63E /* IpEndpointName.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADD194746185E2DA11468377 /* IpEndpointName.cpp */; }; - B990E5E12C0E7A370094B63E /* NetworkingUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B361208CD4107E479F04E7B /* NetworkingUtils.cpp */; }; - B990E5E22C0E7A370094B63E /* ofxJSONElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E016F612832CAFE005D7C65 /* ofxJSONElement.cpp */; }; - B990E5E32C0E7A370094B63E /* UdpSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E6DEF695B88BA5FAACEAA937 /* UdpSocket.cpp */; }; - B990E5E42C0E7A370094B63E /* OscOutboundPacketStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 63A47AC60FFAFC3BF093EC0F /* OscOutboundPacketStream.cpp */; }; - B990E5E52C0E7A370094B63E /* OscPrintReceivedElements.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC8881B3C8C0A1C45F042E7A /* OscPrintReceivedElements.cpp */; }; - B990E5E62C0E7A370094B63E /* OscReceivedElements.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BF3AA0D4FAA89D0F8A0E545 /* OscReceivedElements.cpp */; }; - B990E5E72C0E7A370094B63E /* PatchboardXml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E07BBC92BB3B2BF00CDD443 /* PatchboardXml.cpp */; }; - B990E5E82C0E7A370094B63E /* OscTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D9BFFBBF4CC43DEE890B3C3E /* OscTypes.cpp */; }; - B990E5E92C0E7A370094B63E /* ofxOscBundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65EEFA3DA3526E9CDD9C21F9 /* ofxOscBundle.cpp */; }; - B990E5EA2C0E7A370094B63E /* ofxOscMessage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF49D76C45D5DB505A234880 /* ofxOscMessage.cpp */; }; - B990E5EB2C0E7A370094B63E /* ofxOscParameterSync.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0AED834CE4DEC5260AF302A2 /* ofxOscParameterSync.cpp */; }; - B990E5EC2C0E7A370094B63E /* ofxOscReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2FAC65C491D4231379F3298 /* ofxOscReceiver.cpp */; }; - B990E5ED2C0E7A370094B63E /* ofxOscSender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81967292BFC87A0144BD32C6 /* ofxOscSender.cpp */; }; - B990E5EE2C0E7A370094B63E /* ofxOscilloscope.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FF0DE1E8ABD60252EE51633 /* ofxOscilloscope.cpp */; }; - B990E5EF2C0E7A370094B63E /* ofxThreadedLogger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D6D75E57C2EB53518090D07A /* ofxThreadedLogger.cpp */; }; - B990E5F02C0E7A370094B63E /* tinyxml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B40EDA85BEB63E46785BC29 /* tinyxml.cpp */; }; - B990E5F12C0E7A370094B63E /* EmotiBitVariants.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E016F722832CE28005D7C65 /* EmotiBitVariants.cpp */; }; - B990E5F22C0E7A370094B63E /* tinyxmlerror.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 832BDC407620CDBA568B713D /* tinyxmlerror.cpp */; }; - B990E5F32C0E7A370094B63E /* tinyxmlparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FC5DA1C87211D4F6377DA719 /* tinyxmlparser.cpp */; }; - B990E5F42C0E7A370094B63E /* ofxXmlSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50DF87D612C5AAE17AAFA6C0 /* ofxXmlSettings.cpp */; }; - B990E5F62C0E7A370094B63E /* liblsl.1.14.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 948E6B5528528E34000A8B76 /* liblsl.1.14.0.dylib */; }; - B990E5F92C0E7A370094B63E /* lslOutputSettings.json in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8E07BBD62BB3B5D200CDD443 /* lslOutputSettings.json */; }; - B990E5FA2C0E7A370094B63E /* udpOutputSettings.xml in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8E012CDD29A5B157009FB530 /* udpOutputSettings.xml */; }; - B990E5FB2C0E7A370094B63E /* emotibitCommSettings.json in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8E016F852832D594005D7C65 /* emotibitCommSettings.json */; }; - B990E5FC2C0E7A370094B63E /* inputSettings.xml in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8E6079E827C978BE00959DDB /* inputSettings.xml */; }; - B990E5FD2C0E7A370094B63E /* ofxOscilloscopeSettings.xml in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8E6079E927C978BE00959DDB /* ofxOscilloscopeSettings.xml */; }; - B990E5FE2C0E7A370094B63E /* oscOutputSettings.xml in CopyFiles */ = {isa = PBXBuildFile; fileRef = 941B2FB525B8EA3200BB7E84 /* oscOutputSettings.xml */; }; - B990E5FF2C0E7A370094B63E /* verdana.ttf in CopyFiles */ = {isa = PBXBuildFile; fileRef = 941B2FB225B8E62400BB7E84 /* verdana.ttf */; }; - B990E6002C0E7A370094B63E /* verdanab.ttf in CopyFiles */ = {isa = PBXBuildFile; fileRef = 941B2FB125B8E62400BB7E84 /* verdanab.ttf */; }; + BEDFEE7400C58EA4E412B757 /* ofxJSONElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F2B099E6BD1199664C48B177 /* ofxJSONElement.cpp */; }; C4782ECC372420ACE0615B74 /* OscPrintReceivedElements.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC8881B3C8C0A1C45F042E7A /* OscPrintReceivedElements.cpp */; }; + D1E529D7B6961183405926CF /* EmotiBitOfUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0BDE549108B6A79D110451A5 /* EmotiBitOfUtils.cpp */; }; D820615CFDD5F497033D7C5A /* ofxBiquadFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 55E6502FFB31969C644E02C1 /* ofxBiquadFilter.cpp */; }; + E10648CBE85F518AF520E83C /* ofxLSLResolver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E74CC9A47519DC1EE94DECC6 /* ofxLSLResolver.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 */; }; + FB84AAF8D1B7A95266DB5C09 /* jsoncpp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 21BDE665988474F1B1F4D302 /* jsoncpp.cpp */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ - B990E5F82C0E7A370094B63E /* CopyFiles */ = { + 8EF01AF62E4537E300BF0971 /* Copy Files to Resources */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; dstPath = ""; dstSubfolderSpec = 7; files = ( - B990E5F92C0E7A370094B63E /* lslOutputSettings.json in CopyFiles */, - B990E5FA2C0E7A370094B63E /* udpOutputSettings.xml in CopyFiles */, - B990E5FB2C0E7A370094B63E /* emotibitCommSettings.json in CopyFiles */, - B990E5FC2C0E7A370094B63E /* inputSettings.xml in CopyFiles */, - B990E5FD2C0E7A370094B63E /* ofxOscilloscopeSettings.xml in CopyFiles */, - B990E5FE2C0E7A370094B63E /* oscOutputSettings.xml in CopyFiles */, - B990E5FF2C0E7A370094B63E /* verdana.ttf in CopyFiles */, - B990E6002C0E7A370094B63E /* verdanab.ttf in CopyFiles */, + 8EF01AFF2E45385A00BF0971 /* ofxOscilloscopeSettings.xml in Copy Files to Resources */, + 8EF01B002E45385A00BF0971 /* oscOutputSettings.xml in Copy Files to Resources */, + 8EF01B012E45385A00BF0971 /* emotibitCommSettings.json in Copy Files to Resources */, + 8EF01B022E45385A00BF0971 /* verdana.ttf in Copy Files to Resources */, + 8EF01B032E45385A00BF0971 /* verdanab.ttf in Copy Files to Resources */, + 8EF01B042E45385A00BF0971 /* udpOutputSettings.xml in Copy Files to Resources */, + 8EF01B052E45385A00BF0971 /* lslOutputSettings.json in Copy Files to Resources */, + 8EF01B062E45385A00BF0971 /* inputSettings.xml in Copy Files to Resources */, + ); + name = "Copy Files to Resources"; + runOnlyForDeploymentPostprocessing = 0; + }; + 8EF01B8F2E4544B600BF0971 /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( ); runOnlyForDeploymentPostprocessing = 0; }; - E4C2427710CC5ABF004149E2 /* Copy Files */ = { + 8EF01B922E4544B600BF0971 /* Copy Files to Resources */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; dstPath = ""; dstSubfolderSpec = 7; files = ( - 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"; + 8EF01B932E4544B600BF0971 /* ofxOscilloscopeSettings.xml in Copy Files to Resources */, + 8EF01B942E4544B600BF0971 /* oscOutputSettings.xml in Copy Files to Resources */, + 8EF01B952E4544B600BF0971 /* emotibitCommSettings.json in Copy Files to Resources */, + 8EF01B962E4544B600BF0971 /* verdana.ttf in Copy Files to Resources */, + 8EF01B972E4544B600BF0971 /* verdanab.ttf in Copy Files to Resources */, + 8EF01B982E4544B600BF0971 /* udpOutputSettings.xml in Copy Files to Resources */, + 8EF01B992E4544B600BF0971 /* lslOutputSettings.json in Copy Files to Resources */, + 8EF01B9A2E4544B600BF0971 /* inputSettings.xml in Copy Files to Resources */, + ); + name = "Copy Files to Resources"; + runOnlyForDeploymentPostprocessing = 0; + }; + E4C2427710CC5ABF004149E2 /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXCopyFilesBuildPhase section */ @@ -189,14 +194,16 @@ 00D6D32B84B099226431108C /* ofxOsc.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxOsc.h; path = ../../../addons/ofxOsc/src/ofxOsc.h; sourceTree = SOURCE_ROOT; }; 01DCC0911400F9ACF5B65578 /* ofxXmlSettings.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxXmlSettings.h; path = ../../../addons/ofxXmlSettings/src/ofxXmlSettings.h; sourceTree = SOURCE_ROOT; }; 029684CF678F70F6D3537A29 /* OscOutboundPacketStream.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = OscOutboundPacketStream.h; path = ../../../addons/ofxOsc/libs/oscpack/src/osc/OscOutboundPacketStream.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; }; 0AED834CE4DEC5260AF302A2 /* ofxOscParameterSync.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = ofxOscParameterSync.cpp; path = ../../../addons/ofxOsc/src/ofxOscParameterSync.cpp; 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; }; @@ -209,7 +216,10 @@ 1D6EEE45908FED8F72C24228 /* lsl_cpp.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = lsl_cpp.h; path = ../../../addons/ofxLSL/libs/labstreaminglayer/include/lsl_cpp.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; }; 20F35AFADAF0068B067E713F /* OscReceivedElements.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = OscReceivedElements.h; path = ../../../addons/ofxOsc/libs/oscpack/src/osc/OscReceivedElements.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; }; 23640F57DF6C4BB6BFC5DA4C /* PacketListener.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = PacketListener.h; path = ../../../addons/ofxOsc/libs/oscpack/src/ip/PacketListener.h; sourceTree = SOURCE_ROOT; }; + 24789A0EDE177CF74B2C49D6 /* src */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 4; name = src; path = ../../../addons/ofxOscilloscope/ofxPatchboard/Patchboard/src; 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; }; 27CAA440EF9F67BEE7464F89 /* ofxBiquadFilterInstance.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxBiquadFilterInstance.h; path = ../../../addons/ofxBiquadFilter/src/ofxBiquadFilterInstance.h; sourceTree = SOURCE_ROOT; }; @@ -218,10 +228,9 @@ 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; }; 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; }; 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; }; @@ -235,23 +244,27 @@ 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; }; 444657A12E59D0ED86981498 /* TimerListener.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = TimerListener.h; path = ../../../addons/ofxOsc/libs/oscpack/src/ip/TimerListener.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; }; 48974F980F51769171D0B2F5 /* IpEndpointName.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = IpEndpointName.h; path = ../../../addons/ofxOsc/libs/oscpack/src/ip/IpEndpointName.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; }; + 4E806D9F62838BAB588A2592 /* types.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = types.h; path = ../../../addons/ofxLSL/libs/labstreaminglayer/include/lsl/types.h; sourceTree = SOURCE_ROOT; }; 4E95FB446A9C9C6F0DE12D75 /* OscPrintReceivedElements.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = OscPrintReceivedElements.h; path = ../../../addons/ofxOsc/libs/oscpack/src/osc/OscPrintReceivedElements.h; sourceTree = SOURCE_ROOT; }; + 4FB17F5652D1A7C45CC0C876 /* streaminfo.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = streaminfo.h; path = ../../../addons/ofxLSL/libs/labstreaminglayer/include/lsl/streaminfo.h; sourceTree = SOURCE_ROOT; }; 4FF0DE1E8ABD60252EE51633 /* ofxOscilloscope.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = ofxOscilloscope.cpp; path = ../../../addons/ofxOscilloscope/src/ofxOscilloscope.cpp; 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; }; 55E6502FFB31969C644E02C1 /* ofxBiquadFilter.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = ofxBiquadFilter.cpp; path = ../../../addons/ofxBiquadFilter/src/ofxBiquadFilter.cpp; 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; }; 63124162FE6E2022C68CE6A5 /* lsl_c.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = lsl_c.h; path = ../../../addons/ofxLSL/libs/labstreaminglayer/include/lsl_c.h; sourceTree = SOURCE_ROOT; }; @@ -263,85 +276,64 @@ 6B65E6930994CC4B2D2B8B33 /* OscPacketListener.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = OscPacketListener.h; path = ../../../addons/ofxOsc/libs/oscpack/src/osc/OscPacketListener.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; }; 7689F8A0F3D0B7635A8C3104 /* ofxOscArg.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxOscArg.h; path = ../../../addons/ofxOsc/src/ofxOscArg.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; }; + 778EF4B8C1245F68672AD605 /* xml.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = xml.h; path = ../../../addons/ofxLSL/libs/labstreaminglayer/include/lsl/xml.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; }; - 7A8815F94AF8B1A79DAF932B /* EmotiBitTestingHelper.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = EmotiBitTestingHelper.cpp; path = ../../../addons/ofxEmotiBit/src/EmotiBitTestingHelper.cpp; 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; }; 81967292BFC87A0144BD32C6 /* ofxOscSender.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = ofxOscSender.cpp; path = ../../../addons/ofxOsc/src/ofxOscSender.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; }; + 8362C1B3E6FD778C42DCBBE5 /* outlet.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = outlet.h; path = ../../../addons/ofxLSL/libs/labstreaminglayer/include/lsl/outlet.h; sourceTree = SOURCE_ROOT; }; + 85F1C57F9B8232654BB00A3F /* inlet.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = inlet.h; path = ../../../addons/ofxLSL/libs/labstreaminglayer/include/lsl/inlet.h; 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; }; 8B30E93FD3D3475EED522A0E /* ofxOscBundle.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxOscBundle.h; path = ../../../addons/ofxOsc/src/ofxOscBundle.h; sourceTree = SOURCE_ROOT; }; 8C75AFC8774A62495DD53464 /* ofxOscReceiver.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxOscReceiver.h; path = ../../../addons/ofxOsc/src/ofxOscReceiver.h; sourceTree = SOURCE_ROOT; }; - 8E012CDD29A5B157009FB530 /* udpOutputSettings.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = udpOutputSettings.xml; path = bin/data/udpOutputSettings.xml; sourceTree = ""; }; - 8E016F612832CAFE005D7C65 /* ofxJSONElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofxJSONElement.cpp; path = ../../ofxJSON/src/ofxJSONElement.cpp; sourceTree = ""; }; - 8E016F622832CAFE005D7C65 /* ofxJSON.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofxJSON.h; path = ../../ofxJSON/src/ofxJSON.h; sourceTree = ""; }; - 8E016F632832CAFE005D7C65 /* ofxJSONElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofxJSONElement.h; path = ../../ofxJSON/src/ofxJSONElement.h; sourceTree = ""; }; - 8E016F6B2832CB5F005D7C65 /* json.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = json.h; path = ../../ofxJSON/libs/jsoncpp/include/json/json.h; sourceTree = ""; }; - 8E016F6C2832CB5F005D7C65 /* json-forwards.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "json-forwards.h"; path = "../../ofxJSON/libs/jsoncpp/include/json/json-forwards.h"; sourceTree = ""; }; - 8E016F6D2832CB73005D7C65 /* jsoncpp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = jsoncpp.cpp; path = ../../ofxJSON/libs/jsoncpp/src/jsoncpp.cpp; sourceTree = ""; }; - 8E016F712832CE28005D7C65 /* EmotiBitComms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EmotiBitComms.h; path = ../../EmotiBit_XPlat_Utils/src/EmotiBitComms.h; sourceTree = ""; }; - 8E016F722832CE28005D7C65 /* EmotiBitVariants.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EmotiBitVariants.cpp; path = ../../EmotiBit_XPlat_Utils/src/EmotiBitVariants.cpp; sourceTree = ""; }; - 8E016F732832CE28005D7C65 /* EmotiBitEdaCalibration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EmotiBitEdaCalibration.cpp; path = ../../EmotiBit_XPlat_Utils/src/EmotiBitEdaCalibration.cpp; sourceTree = ""; }; - 8E016F742832CE28005D7C65 /* EmotiBitEdaCalibration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EmotiBitEdaCalibration.h; path = ../../EmotiBit_XPlat_Utils/src/EmotiBitEdaCalibration.h; sourceTree = ""; }; - 8E016F752832CE28005D7C65 /* DigitalFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DigitalFilter.cpp; path = ../../EmotiBit_XPlat_Utils/src/DigitalFilter.cpp; sourceTree = ""; }; - 8E016F762832CE28005D7C65 /* EmotiBitPacket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EmotiBitPacket.cpp; path = ../../EmotiBit_XPlat_Utils/src/EmotiBitPacket.cpp; sourceTree = ""; }; - 8E016F772832CE28005D7C65 /* EmotiBitFactoryTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EmotiBitFactoryTest.h; path = ../../EmotiBit_XPlat_Utils/src/EmotiBitFactoryTest.h; sourceTree = ""; }; - 8E016F782832CE28005D7C65 /* EmotiBitFactoryTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EmotiBitFactoryTest.cpp; path = ../../EmotiBit_XPlat_Utils/src/EmotiBitFactoryTest.cpp; sourceTree = ""; }; - 8E016F792832CE28005D7C65 /* DigitalFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DigitalFilter.h; path = ../../EmotiBit_XPlat_Utils/src/DigitalFilter.h; sourceTree = ""; }; - 8E016F7A2832CE28005D7C65 /* EmotiBitPacket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EmotiBitPacket.h; path = ../../EmotiBit_XPlat_Utils/src/EmotiBitPacket.h; sourceTree = ""; }; - 8E016F7B2832CE28005D7C65 /* EmotiBitVariants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EmotiBitVariants.h; path = ../../EmotiBit_XPlat_Utils/src/EmotiBitVariants.h; sourceTree = ""; }; - 8E016F822832CE82005D7C65 /* Periodizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Periodizer.h; path = ../src/Signal/Periodizer.h; sourceTree = ""; }; - 8E016F832832CE82005D7C65 /* Periodizer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Periodizer.cpp; path = ../src/Signal/Periodizer.cpp; sourceTree = ""; }; - 8E016F852832D594005D7C65 /* emotibitCommSettings.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = emotibitCommSettings.json; path = bin/data/emotibitCommSettings.json; sourceTree = ""; }; - 8E07BBAB2B1F824D00CDD443 /* SoftwareVersionChecker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SoftwareVersionChecker.cpp; path = ../src/SoftwareVersionChecker.cpp; sourceTree = ""; }; - 8E07BBAC2B1F824D00CDD443 /* SoftwareVersionChecker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SoftwareVersionChecker.h; path = ../src/SoftwareVersionChecker.h; sourceTree = ""; }; - 8E07BBC72BB3B2BF00CDD443 /* PatchboardJson.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PatchboardJson.cpp; path = ../../../../ofxOscilloscope/ofxPatchboard/Patchboard/src/PatchboardJson.cpp; sourceTree = ""; }; - 8E07BBC82BB3B2BF00CDD443 /* PatchboardJson.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PatchboardJson.h; path = ../../../../ofxOscilloscope/ofxPatchboard/Patchboard/src/PatchboardJson.h; sourceTree = ""; }; - 8E07BBC92BB3B2BF00CDD443 /* PatchboardXml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PatchboardXml.cpp; path = ../../../../ofxOscilloscope/ofxPatchboard/Patchboard/src/PatchboardXml.cpp; sourceTree = ""; }; - 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 = ""; }; - 8E07BBD12BB3B46400CDD443 /* EmotiBitOfUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EmotiBitOfUtils.h; path = ../src/EmotiBitOfUtils.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 = ""; }; - 8EFF3F692DFC7A1800FB6792 /* ArduinoString.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ArduinoString.h; path = ../../EmotiBit_XPlat_Utils/src/ArduinoString.h; sourceTree = ""; }; + 8CA65A234F6CABD350A1BA57 /* Periodizer.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = Periodizer.cpp; path = ../../../addons/ofxEmotiBit/src/Signal/Periodizer.cpp; sourceTree = SOURCE_ROOT; }; + 8EF01ACB2E452E8B00BF0971 /* EmotiBitPacket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EmotiBitPacket.cpp; path = ../../../addons/EmotiBit_XPlat_Utils/src/EmotiBitPacket.cpp; sourceTree = ""; }; + 8EF01ACD2E452E8B00BF0971 /* EmotiBitPacket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EmotiBitPacket.h; path = ../../../addons/EmotiBit_XPlat_Utils/src/EmotiBitPacket.h; sourceTree = ""; }; + 8EF01ADC2E45302800BF0971 /* EmotiBitWiFiHost.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EmotiBitWiFiHost.cpp; sourceTree = ""; }; + 8EF01ADD2E45302800BF0971 /* EmotiBitLsl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EmotiBitLsl.cpp; sourceTree = ""; }; + 8EF01ADE2E45302800BF0971 /* EmotiBitLsl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EmotiBitLsl.h; sourceTree = ""; }; + 8EF01ADF2E45302800BF0971 /* EmotiBitWiFiHost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EmotiBitWiFiHost.h; sourceTree = ""; }; + 8EF01AE62E4530F500BF0971 /* PatchboardJson.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PatchboardJson.cpp; path = ../../../addons/ofxOscilloscope/ofxPatchboard/Patchboard/src/PatchboardJson.cpp; sourceTree = ""; }; + 8EF01AE72E4530F500BF0971 /* PatchboardXml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PatchboardXml.cpp; path = ../../../addons/ofxOscilloscope/ofxPatchboard/Patchboard/src/PatchboardXml.cpp; sourceTree = ""; }; + 8EF01AE82E4530F500BF0971 /* PatchboardJson.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PatchboardJson.h; path = ../../../addons/ofxOscilloscope/ofxPatchboard/Patchboard/src/PatchboardJson.h; sourceTree = ""; }; + 8EF01AE92E4530F500BF0971 /* PatchboardXml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PatchboardXml.h; path = ../../../addons/ofxOscilloscope/ofxPatchboard/Patchboard/src/PatchboardXml.h; sourceTree = ""; }; + 8EF01AEA2E4530F500BF0971 /* PatchboardBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PatchboardBase.cpp; path = ../../../addons/ofxOscilloscope/ofxPatchboard/Patchboard/src/PatchboardBase.cpp; sourceTree = ""; }; + 8EF01AEB2E4530F500BF0971 /* PatchboardBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PatchboardBase.h; path = ../../../addons/ofxOscilloscope/ofxPatchboard/Patchboard/src/PatchboardBase.h; sourceTree = ""; }; + 8EF01AEF2E4532BC00BF0971 /* EmotiBitTestingHelper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EmotiBitTestingHelper.cpp; path = ../../../addons/ofxEmotiBit/src/EmotiBitTestingHelper.cpp; sourceTree = ""; }; + 8EF01AF02E4532BC00BF0971 /* EmotiBitTestingHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EmotiBitTestingHelper.h; path = ../../../addons/ofxEmotiBit/src/EmotiBitTestingHelper.h; sourceTree = ""; }; + 8EF01AF32E4533E300BF0971 /* liblsl.1.14.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = liblsl.1.14.0.dylib; path = ../../../addons/ofxLSL/libs/labstreaminglayer/lib/osx/x86_64/liblsl.1.14.0.dylib; sourceTree = ""; }; + 8EF01AF72E45385A00BF0971 /* ofxOscilloscopeSettings.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = ofxOscilloscopeSettings.xml; path = bin/data/ofxOscilloscopeSettings.xml; sourceTree = ""; }; + 8EF01AF82E45385A00BF0971 /* oscOutputSettings.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = oscOutputSettings.xml; path = bin/data/oscOutputSettings.xml; sourceTree = ""; }; + 8EF01AF92E45385A00BF0971 /* emotibitCommSettings.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = emotibitCommSettings.json; path = bin/data/emotibitCommSettings.json; sourceTree = ""; }; + 8EF01AFA2E45385A00BF0971 /* verdana.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = verdana.ttf; path = bin/data/verdana.ttf; sourceTree = ""; }; + 8EF01AFB2E45385A00BF0971 /* verdanab.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = verdanab.ttf; path = bin/data/verdanab.ttf; sourceTree = ""; }; + 8EF01AFC2E45385A00BF0971 /* udpOutputSettings.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = udpOutputSettings.xml; path = bin/data/udpOutputSettings.xml; sourceTree = ""; }; + 8EF01AFD2E45385A00BF0971 /* lslOutputSettings.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = lslOutputSettings.json; path = bin/data/lslOutputSettings.json; sourceTree = ""; }; + 8EF01AFE2E45385A00BF0971 /* inputSettings.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = inputSettings.xml; path = bin/data/inputSettings.xml; sourceTree = ""; }; + 8EF01B9F2E4544B600BF0971 /* EmotiBitOscilloscope-arm64.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "EmotiBitOscilloscope-arm64.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 8EF01BA12E45450F00BF0971 /* liblsl.1.14.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = liblsl.1.14.0.dylib; path = ../../../addons/ofxLSL/libs/labstreaminglayer/lib/osx/arm/liblsl.1.14.0.dylib; 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 = ""; }; - 941B2FB225B8E62400BB7E84 /* verdana.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = verdana.ttf; path = bin/data/verdana.ttf; sourceTree = ""; }; - 941B2FB525B8EA3200BB7E84 /* oscOutputSettings.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = oscOutputSettings.xml; path = bin/data/oscOutputSettings.xml; sourceTree = ""; }; - 948E6B4D28528CA5000A8B76 /* ofxLSLReceiver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofxLSLReceiver.h; path = ../../ofxLSL/src/ofxLSLReceiver.h; sourceTree = ""; }; - 948E6B4E28528CA5000A8B76 /* ofxLSLReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofxLSLReceiver.cpp; path = ../../ofxLSL/src/ofxLSLReceiver.cpp; sourceTree = ""; }; - 948E6B4F28528CA5000A8B76 /* ofxLSLSender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofxLSLSender.h; path = ../../ofxLSL/src/ofxLSLSender.h; sourceTree = ""; }; - 948E6B5028528CA5000A8B76 /* ofxLSLResolver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofxLSLResolver.h; path = ../../ofxLSL/src/ofxLSLResolver.h; sourceTree = ""; }; - 948E6B5128528CA5000A8B76 /* ofxLSLResolver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofxLSLResolver.cpp; path = ../../ofxLSL/src/ofxLSLResolver.cpp; sourceTree = ""; }; - 948E6B5528528E34000A8B76 /* liblsl.1.14.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = liblsl.1.14.0.dylib; path = ../../ofxLSL/libs/labstreaminglayer/lib/osx/liblsl.1.14.0.dylib; sourceTree = ""; }; - 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; }; - 974B6F6CECCC45548FC1A608 /* EmotiBitTestingHelper.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = EmotiBitTestingHelper.h; path = ../../../addons/ofxEmotiBit/src/EmotiBitTestingHelper.h; sourceTree = SOURCE_ROOT; }; 981F60C92586ACCD9553A3D5 /* ofxOscilloscope.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxOscilloscope.h; path = ../../../addons/ofxOscilloscope/src/ofxOscilloscope.h; 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; }; 9BF3AA0D4FAA89D0F8A0E545 /* OscReceivedElements.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = OscReceivedElements.cpp; path = ../../../addons/ofxOsc/libs/oscpack/src/osc/OscReceivedElements.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; }; 9F7986DC4EB05E75FCE2C777 /* ofxOscSender.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxOscSender.h; path = ../../../addons/ofxOsc/src/ofxOscSender.h; sourceTree = SOURCE_ROOT; }; A2AAA8CA403479E6FCDF920E /* OscHostEndianness.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = OscHostEndianness.h; path = ../../../addons/ofxOsc/libs/oscpack/src/osc/OscHostEndianness.h; sourceTree = SOURCE_ROOT; }; + A5B4C8E110096FFCC79EB79A /* ofxLSLSender.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxLSLSender.h; path = ../../../addons/ofxLSL/src/ofxLSLSender.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; }; @@ -358,13 +350,10 @@ 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; }; - B990E6072C0E7A370094B63E /* EmotiBitOscilloscope.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = EmotiBitOscilloscope.app; sourceTree = BUILT_PRODUCTS_DIR; }; 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; }; 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; }; @@ -373,12 +362,15 @@ 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; }; C58862C6D212C8E8A83810F4 /* ofxOscMessage.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxOscMessage.h; path = ../../../addons/ofxOsc/src/ofxOscMessage.h; sourceTree = SOURCE_ROOT; }; + C68160C07823932BEC353DC8 /* ofxLSLReceiver.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxLSLReceiver.h; path = ../../../addons/ofxLSL/src/ofxLSLReceiver.h; sourceTree = SOURCE_ROOT; }; C6937888E126BADC8777423B /* OscTypes.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = OscTypes.h; path = ../../../addons/ofxOsc/libs/oscpack/src/osc/OscTypes.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; }; + C8B8E4924DF8CCA299003E10 /* resolver.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = resolver.h; path = ../../../addons/ofxLSL/libs/labstreaminglayer/include/lsl/resolver.h; 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; }; + CEF1AFCA5C7778FF4E205A6E /* ofxLSLReceiver.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = ofxLSLReceiver.cpp; path = ../../../addons/ofxLSL/src/ofxLSLReceiver.cpp; 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; }; @@ -567,19 +559,23 @@ E42963712163EDD300A6A9E2 /* ofFmodSoundPlayer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ofFmodSoundPlayer.h; path = ../../../libs/openFrameworks/sound/ofFmodSoundPlayer.h; sourceTree = SOURCE_ROOT; }; E42963722163EDD300A6A9E2 /* ofSoundBuffer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ofSoundBuffer.cpp; path = ../../../libs/openFrameworks/sound/ofSoundBuffer.cpp; sourceTree = SOURCE_ROOT; }; E42963732163EDD300A6A9E2 /* ofSoundBaseTypes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ofSoundBaseTypes.h; path = ../../../libs/openFrameworks/sound/ofSoundBaseTypes.h; sourceTree = SOURCE_ROOT; }; - E4B69B5B0A3A1756003C02F2 /* EmotiBitOscilloscope-Debug.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "EmotiBitOscilloscope-Debug.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + E4B69B5B0A3A1756003C02F2 /* EmotiBitOscilloscopeDebug.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = EmotiBitOscilloscopeDebug.app; sourceTree = BUILT_PRODUCTS_DIR; }; E4B69E1D0A3A1BDC003C02F2 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = src/main.cpp; sourceTree = SOURCE_ROOT; }; E4B69E1E0A3A1BDC003C02F2 /* ofApp.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = ofApp.cpp; path = src/ofApp.cpp; sourceTree = SOURCE_ROOT; }; 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 = ""; }; E6DEF695B88BA5FAACEAA937 /* UdpSocket.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = UdpSocket.cpp; path = ../../../addons/ofxOsc/libs/oscpack/src/ip/posix/UdpSocket.cpp; sourceTree = SOURCE_ROOT; }; + E74CC9A47519DC1EE94DECC6 /* ofxLSLResolver.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = ofxLSLResolver.cpp; path = ../../../addons/ofxLSL/src/ofxLSLResolver.cpp; sourceTree = SOURCE_ROOT; }; 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; }; + E941C656116BDC3F7FD39802 /* ofxLSLResolver.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxLSLResolver.h; path = ../../../addons/ofxLSL/src/ofxLSLResolver.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; }; + F258C8E9FBCAED1F2AF8A981 /* common.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = common.h; path = ../../../addons/ofxLSL/libs/labstreaminglayer/include/lsl/common.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; }; F32C175B3E53B0864752B5D7 /* ofxBiquadFilterInstance.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = ofxBiquadFilterInstance.cpp; path = ../../../addons/ofxBiquadFilter/src/ofxBiquadFilterInstance.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; }; F4F5B6B8BA2BD52C646ED908 /* OscException.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = OscException.h; path = ../../../addons/ofxOsc/libs/oscpack/src/osc/OscException.h; sourceTree = SOURCE_ROOT; }; @@ -591,11 +587,11 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - B990E5F52C0E7A370094B63E /* Frameworks */ = { + 8EF01B8C2E4544B600BF0971 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - B990E5F62C0E7A370094B63E /* liblsl.1.14.0.dylib in Frameworks */, + 8EF01BA22E45450F00BF0971 /* liblsl.1.14.0.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -603,7 +599,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 948E6B5928529E74000A8B76 /* liblsl.1.14.0.dylib in Frameworks */, + 8EF01AF42E4533E300BF0971 /* liblsl.1.14.0.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -619,15 +615,6 @@ name = ofxPoco; sourceTree = ""; }; - 086770EA564806B847975656 /* src */ = { - isa = PBXGroup; - children = ( - 14A43221DDD441A2AC353651 /* ofxNetworkUtils.cpp */, - BAE45B5EDF2D519E39986297 /* ofxNetworkUtils.h */, - ); - name = src; - sourceTree = ""; - }; 0B8ED02ED04845BC31B3E518 /* ofxEmotiBit */ = { isa = PBXGroup; children = ( @@ -639,7 +626,7 @@ 0EBED2DE642FD8C8549B2E51 /* ofxOscilloscope */ = { isa = PBXGroup; children = ( - 8E07BBC42BB3B29400CDD443 /* ofxPatchboard */, + 8EF01AE22E4530A500BF0971 /* ofxPatchboard */, 971D52EB9D61379150966B5C /* src */, ); name = ofxOscilloscope; @@ -654,14 +641,6 @@ name = src; sourceTree = ""; }; - 10D3F3F0B7A5F4F005A72281 /* libs */ = { - isa = PBXGroup; - children = ( - 3267A0EC40EE3A074E568CC5 /* ofxNetworkUtils */, - ); - name = libs; - sourceTree = ""; - }; 13C2436A78CDB4354594CA7D /* include */ = { isa = PBXGroup; children = ( @@ -670,14 +649,6 @@ name = include; sourceTree = ""; }; - 15D44573EC8FB19C8A2B4DA1 /* include */ = { - isa = PBXGroup; - children = ( - 70F449D423BB9FB6AC828E03 /* ofx */, - ); - name = include; - sourceTree = ""; - }; 18240ECCE4076FB0833A8578 /* ofxNetwork */ = { isa = PBXGroup; children = ( @@ -709,12 +680,12 @@ 1F7F4B0AD9E6FFC31182BCDB /* src */ = { isa = PBXGroup; children = ( - 948E6B4E28528CA5000A8B76 /* ofxLSLReceiver.cpp */, - 948E6B4D28528CA5000A8B76 /* ofxLSLReceiver.h */, - 948E6B5128528CA5000A8B76 /* ofxLSLResolver.cpp */, - 948E6B5028528CA5000A8B76 /* ofxLSLResolver.h */, - 948E6B4F28528CA5000A8B76 /* ofxLSLSender.h */, DB67299A29E4CB4F8D6E8A4B /* ofxLSL.h */, + CEF1AFCA5C7778FF4E205A6E /* ofxLSLReceiver.cpp */, + C68160C07823932BEC353DC8 /* ofxLSLReceiver.h */, + E74CC9A47519DC1EE94DECC6 /* ofxLSLResolver.cpp */, + E941C656116BDC3F7FD39802 /* ofxLSLResolver.h */, + A5B4C8E110096FFCC79EB79A /* ofxLSLSender.h */, ); name = src; sourceTree = ""; @@ -755,6 +726,25 @@ name = ofxBiquadFilter; sourceTree = ""; }; + 2865DAEF86B1907A704CA70B /* ofxJSON */ = { + isa = PBXGroup; + children = ( + F40E80CB2D443CBA9581DD03 /* libs */, + 292AF6148769654D0DF26018 /* src */, + ); + name = ofxJSON; + sourceTree = ""; + }; + 292AF6148769654D0DF26018 /* src */ = { + isa = PBXGroup; + children = ( + 1645F56257269CD0356320BD /* ofxJSON.h */, + F2B099E6BD1199664C48B177 /* ofxJSONElement.cpp */, + 26A541233BC6F736E758F718 /* ofxJSONElement.h */, + ); + name = src; + sourceTree = ""; + }; 30CB364908817057B430D528 /* osc */ = { isa = PBXGroup; children = ( @@ -774,15 +764,6 @@ name = osc; sourceTree = ""; }; - 3267A0EC40EE3A074E568CC5 /* ofxNetworkUtils */ = { - isa = PBXGroup; - children = ( - 15D44573EC8FB19C8A2B4DA1 /* include */, - F06A6CC1DE8AD93D3A0E1E5D /* src */, - ); - name = ofxNetworkUtils; - sourceTree = ""; - }; 3286A6A80FB3354E8DF1D5B8 /* ofxThreadedLogger */ = { isa = PBXGroup; children = ( @@ -799,15 +780,6 @@ name = libs; sourceTree = ""; }; - 406D7399CEFC4C539B676AFF /* ofxNetworkUtils */ = { - isa = PBXGroup; - children = ( - 10D3F3F0B7A5F4F005A72281 /* libs */, - 086770EA564806B847975656 /* src */, - ); - name = ofxNetworkUtils; - sourceTree = ""; - }; 426273B12B02EBC8820E0D9F /* ofxLSL */ = { isa = PBXGroup; children = ( @@ -828,19 +800,28 @@ 4CD5C6EA1AEB082DFF01E7BE /* src */ = { isa = PBXGroup; children = ( - 8E07BBD32BB3B46400CDD443 /* EmotiBitOfUtils.cpp */, - 8E07BBD12BB3B46400CDD443 /* EmotiBitOfUtils.h */, - 8E07BBAB2B1F824D00CDD443 /* SoftwareVersionChecker.cpp */, - 8E07BBAC2B1F824D00CDD443 /* SoftwareVersionChecker.h */, - 8E016F812832CE65005D7C65 /* Signal */, + 8EF01AEF2E4532BC00BF0971 /* EmotiBitTestingHelper.cpp */, + 8EF01AF02E4532BC00BF0971 /* EmotiBitTestingHelper.h */, B37D59256BC5BDEB408A0B4B /* DoubleBuffer.h */, - 7A8815F94AF8B1A79DAF932B /* EmotiBitTestingHelper.cpp */, - 974B6F6CECCC45548FC1A608 /* EmotiBitTestingHelper.h */, + 0BDE549108B6A79D110451A5 /* EmotiBitOfUtils.cpp */, + 452AF016D8E68676D45A9498 /* EmotiBitOfUtils.h */, + D15B7CC43D038EC633AC3A25 /* Signal */, + 9B3B69F1411454D188127C4E /* SoftwareVersionChecker.cpp */, + 04C68EFF05480545A9A374D9 /* SoftwareVersionChecker.h */, 9938519AF7D3E0C48586F0C1 /* ofxEmotiBitVersion.h */, ); name = src; sourceTree = ""; }; + 58AD3BD71B781D9BC25763C8 /* json */ = { + isa = PBXGroup; + children = ( + 61313493CDB52744E22A604D /* json-forwards.h */, + 2C7CF000B7B4F782C187C353 /* json.h */, + ); + name = json; + sourceTree = ""; + }; 641362CA659FAFEE4E81001B /* posix */ = { isa = PBXGroup; children = ( @@ -958,14 +939,6 @@ name = openssl; sourceTree = ""; }; - 70F449D423BB9FB6AC828E03 /* ofx */ = { - isa = PBXGroup; - children = ( - BA927607FD4C8BD5D2119338 /* Net */, - ); - name = ofx; - sourceTree = ""; - }; 86D2677079A3AF4A5A88E29A /* oscpack */ = { isa = PBXGroup; children = ( @@ -974,160 +947,105 @@ name = oscpack; sourceTree = ""; }; - 8E016F602832C94B005D7C65 /* src */ = { + 8EF01AC62E452DC700BF0971 /* Recovered References */ = { isa = PBXGroup; children = ( - 8E016F622832CAFE005D7C65 /* ofxJSON.h */, - 8E016F612832CAFE005D7C65 /* ofxJSONElement.cpp */, - 8E016F632832CAFE005D7C65 /* ofxJSONElement.h */, + 24789A0EDE177CF74B2C49D6 /* src */, ); - name = src; + name = "Recovered References"; sourceTree = ""; }; - 8E016F652832CB03005D7C65 /* libs */ = { + 8EF01AC72E452E6700BF0971 /* EmotiBit_XPlat_Utils */ = { isa = PBXGroup; children = ( - 8E016F662832CB1B005D7C65 /* jsoncpp */, + 8EF01ACB2E452E8B00BF0971 /* EmotiBitPacket.cpp */, + 8EF01ACD2E452E8B00BF0971 /* EmotiBitPacket.h */, ); - name = libs; + name = EmotiBit_XPlat_Utils; sourceTree = ""; }; - 8E016F662832CB1B005D7C65 /* jsoncpp */ = { + 8EF01AE22E4530A500BF0971 /* ofxPatchboard */ = { isa = PBXGroup; children = ( - 8E016F682832CB29005D7C65 /* src */, - 8E016F672832CB23005D7C65 /* include */, + 8EF01AE42E4530D100BF0971 /* Patchboard */, ); - name = jsoncpp; + name = ofxPatchboard; sourceTree = ""; }; - 8E016F672832CB23005D7C65 /* include */ = { + 8EF01AE42E4530D100BF0971 /* Patchboard */ = { isa = PBXGroup; children = ( - 8E016F692832CB3D005D7C65 /* json */, + 8EF01AE52E4530D600BF0971 /* src */, ); - name = include; + name = Patchboard; sourceTree = ""; }; - 8E016F682832CB29005D7C65 /* src */ = { + 8EF01AE52E4530D600BF0971 /* src */ = { isa = PBXGroup; children = ( - 8E016F6D2832CB73005D7C65 /* jsoncpp.cpp */, + 8EF01AEA2E4530F500BF0971 /* PatchboardBase.cpp */, + 8EF01AEB2E4530F500BF0971 /* PatchboardBase.h */, + 8EF01AE62E4530F500BF0971 /* PatchboardJson.cpp */, + 8EF01AE82E4530F500BF0971 /* PatchboardJson.h */, + 8EF01AE72E4530F500BF0971 /* PatchboardXml.cpp */, + 8EF01AE92E4530F500BF0971 /* PatchboardXml.h */, ); name = src; sourceTree = ""; }; - 8E016F692832CB3D005D7C65 /* json */ = { + 8EF01AF22E4533E300BF0971 /* Frameworks */ = { isa = PBXGroup; children = ( - 8E016F6C2832CB5F005D7C65 /* json-forwards.h */, - 8E016F6B2832CB5F005D7C65 /* json.h */, + 8EF01BA12E45450F00BF0971 /* liblsl.1.14.0.dylib */, + 8EF01AF32E4533E300BF0971 /* liblsl.1.14.0.dylib */, ); - name = json; + name = Frameworks; sourceTree = ""; }; - 8E016F6F2832CDEB005D7C65 /* EmotiBit_XPlat_Utils */ = { + 959BC13926B6C962531CEF17 /* libs */ = { isa = PBXGroup; children = ( - 8E016F702832CE1C005D7C65 /* src */, + B2C98B62869583DB9FE30DA7 /* openssl */, ); - name = EmotiBit_XPlat_Utils; + name = libs; sourceTree = ""; }; - 8E016F702832CE1C005D7C65 /* src */ = { + 971D52EB9D61379150966B5C /* src */ = { isa = PBXGroup; children = ( - 8EFF3F692DFC7A1800FB6792 /* ArduinoString.h */, - 8E016F752832CE28005D7C65 /* DigitalFilter.cpp */, - 8E016F792832CE28005D7C65 /* DigitalFilter.h */, - 8E016F712832CE28005D7C65 /* EmotiBitComms.h */, - 8E016F732832CE28005D7C65 /* EmotiBitEdaCalibration.cpp */, - 8E016F742832CE28005D7C65 /* EmotiBitEdaCalibration.h */, - 8E016F782832CE28005D7C65 /* EmotiBitFactoryTest.cpp */, - 8E016F772832CE28005D7C65 /* EmotiBitFactoryTest.h */, - 8E016F762832CE28005D7C65 /* EmotiBitPacket.cpp */, - 8E016F7A2832CE28005D7C65 /* EmotiBitPacket.h */, - 8E016F722832CE28005D7C65 /* EmotiBitVariants.cpp */, - 8E016F7B2832CE28005D7C65 /* EmotiBitVariants.h */, + 4FF0DE1E8ABD60252EE51633 /* ofxOscilloscope.cpp */, + 981F60C92586ACCD9553A3D5 /* ofxOscilloscope.h */, ); name = src; sourceTree = ""; }; - 8E016F812832CE65005D7C65 /* Signal */ = { + 977A836DD2C489CCC5E330FF /* jsoncpp */ = { isa = PBXGroup; children = ( - 8E016F832832CE82005D7C65 /* Periodizer.cpp */, - 8E016F822832CE82005D7C65 /* Periodizer.h */, + D486FC87F063317BB47E9FAC /* include */, + CCDC6F9CCF925CC402160B85 /* src */, ); - name = Signal; - sourceTree = ""; - }; - 8E07BBC42BB3B29400CDD443 /* ofxPatchboard */ = { - isa = PBXGroup; - children = ( - 8E07BBC52BB3B29B00CDD443 /* Patchboard */, - ); - path = ofxPatchboard; - sourceTree = ""; - }; - 8E07BBC52BB3B29B00CDD443 /* Patchboard */ = { - isa = PBXGroup; - children = ( - 8E07BBC62BB3B2A300CDD443 /* src */, - ); - name = Patchboard; - sourceTree = ""; - }; - 8E07BBC62BB3B2A300CDD443 /* src */ = { - isa = PBXGroup; - children = ( - 8E07BBCC2BB3B2BF00CDD443 /* PatchboardBase.cpp */, - 8E07BBCA2BB3B2BF00CDD443 /* PatchboardBase.h */, - 8E07BBC72BB3B2BF00CDD443 /* PatchboardJson.cpp */, - 8E07BBC82BB3B2BF00CDD443 /* PatchboardJson.h */, - 8E07BBC92BB3B2BF00CDD443 /* PatchboardXml.cpp */, - 8E07BBCB2BB3B2BF00CDD443 /* PatchboardXml.h */, - ); - path = src; - sourceTree = ""; - }; - 8E7E8F4E282ED7E000C2A24E /* ofxJSON */ = { - isa = PBXGroup; - children = ( - 8E016F652832CB03005D7C65 /* libs */, - 8E016F602832C94B005D7C65 /* src */, - ); - name = ofxJSON; - sourceTree = ""; - }; - 948E6B5428528E33000A8B76 /* Frameworks */ = { - isa = PBXGroup; - children = ( - 948E6B5528528E34000A8B76 /* liblsl.1.14.0.dylib */, - ); - name = Frameworks; - sourceTree = ""; - }; - 959BC13926B6C962531CEF17 /* libs */ = { - isa = PBXGroup; - children = ( - B2C98B62869583DB9FE30DA7 /* openssl */, - ); - name = libs; + name = jsoncpp; sourceTree = ""; }; - 971D52EB9D61379150966B5C /* src */ = { + A4E88308076BD188904EEAB3 /* lsl */ = { isa = PBXGroup; children = ( - 4FF0DE1E8ABD60252EE51633 /* ofxOscilloscope.cpp */, - 981F60C92586ACCD9553A3D5 /* ofxOscilloscope.h */, + F258C8E9FBCAED1F2AF8A981 /* common.h */, + 85F1C57F9B8232654BB00A3F /* inlet.h */, + 8362C1B3E6FD778C42DCBBE5 /* outlet.h */, + C8B8E4924DF8CCA299003E10 /* resolver.h */, + 4FB17F5652D1A7C45CC0C876 /* streaminfo.h */, + 4E806D9F62838BAB588A2592 /* types.h */, + 778EF4B8C1245F68672AD605 /* xml.h */, ); - name = src; + name = lsl; sourceTree = ""; }; A666F7CCB665BD61C203119D /* include */ = { isa = PBXGroup; children = ( + A4E88308076BD188904EEAB3 /* lsl */, 63124162FE6E2022C68CE6A5 /* lsl_c.h */, 1D6EEE45908FED8F72C24228 /* lsl_cpp.h */, ); @@ -1171,32 +1089,21 @@ name = openssl; sourceTree = ""; }; - BA927607FD4C8BD5D2119338 /* Net */ = { - isa = PBXGroup; - children = ( - 750F4A2471E0E5E0A889C455 /* IPAddressRange.h */, - 958F068D5A2037583179BDED /* NetworkInterfaceListener.h */, - 2BE946CC0D0FAFAFB318D357 /* NetworkUtils.h */, - ); - name = Net; - sourceTree = ""; - }; BB4B014C10F69532006C3DED /* addons */ = { isa = PBXGroup; children = ( - 8E016F6F2832CDEB005D7C65 /* EmotiBit_XPlat_Utils */, - 8E7E8F4E282ED7E000C2A24E /* ofxJSON */, + 8EF01AC72E452E6700BF0971 /* EmotiBit_XPlat_Utils */, 27005CFF506A34FD3734C3CE /* ofxBiquadFilter */, 0B8ED02ED04845BC31B3E518 /* ofxEmotiBit */, 480A780D8D0308AE4A368801 /* ofxGui */, + 2865DAEF86B1907A704CA70B /* ofxJSON */, + 1F4FB5C423662B96ADFDCC0B /* ofxXmlSettings */, 426273B12B02EBC8820E0D9F /* ofxLSL */, 18240ECCE4076FB0833A8578 /* ofxNetwork */, - 0117D94CE0C695E5E5482BEC /* ofxPoco */, - 406D7399CEFC4C539B676AFF /* ofxNetworkUtils */, E6053AB7FEC63D5F83825B88 /* ofxOsc */, 0EBED2DE642FD8C8549B2E51 /* ofxOscilloscope */, + 0117D94CE0C695E5E5482BEC /* ofxPoco */, 3286A6A80FB3354E8DF1D5B8 /* ofxThreadedLogger */, - 1F4FB5C423662B96ADFDCC0B /* ofxXmlSettings */, ); name = addons; sourceTree = ""; @@ -1220,6 +1127,23 @@ name = src; sourceTree = ""; }; + CCDC6F9CCF925CC402160B85 /* src */ = { + isa = PBXGroup; + children = ( + 21BDE665988474F1B1F4D302 /* jsoncpp.cpp */, + ); + name = src; + sourceTree = ""; + }; + D15B7CC43D038EC633AC3A25 /* Signal */ = { + isa = PBXGroup; + children = ( + 8CA65A234F6CABD350A1BA57 /* Periodizer.cpp */, + 53849B4541E31656773B5C53 /* Periodizer.h */, + ); + name = Signal; + sourceTree = ""; + }; D27B2221A225CA523C019676 /* src */ = { isa = PBXGroup; children = ( @@ -1229,6 +1153,14 @@ name = src; sourceTree = ""; }; + D486FC87F063317BB47E9FAC /* include */ = { + isa = PBXGroup; + children = ( + 58AD3BD71B781D9BC25763C8 /* json */, + ); + name = include; + sourceTree = ""; + }; D6951A2C4225871907DE751A /* src */ = { isa = PBXGroup; children = ( @@ -1523,33 +1455,34 @@ E4B69B4A0A3A1720003C02F2 = { isa = PBXGroup; children = ( - 8E07BBD62BB3B5D200CDD443 /* lslOutputSettings.json */, - 8E012CDD29A5B157009FB530 /* udpOutputSettings.xml */, - 8E016F852832D594005D7C65 /* emotibitCommSettings.json */, - 8E6079E827C978BE00959DDB /* inputSettings.xml */, - 8E6079E927C978BE00959DDB /* ofxOscilloscopeSettings.xml */, - 941B2FB525B8EA3200BB7E84 /* oscOutputSettings.xml */, - 941B2FB225B8E62400BB7E84 /* verdana.ttf */, - 941B2FB125B8E62400BB7E84 /* verdanab.ttf */, + 8EF01AF92E45385A00BF0971 /* emotibitCommSettings.json */, + 8EF01AFE2E45385A00BF0971 /* inputSettings.xml */, + 8EF01AFD2E45385A00BF0971 /* lslOutputSettings.json */, + 8EF01AF72E45385A00BF0971 /* ofxOscilloscopeSettings.xml */, + 8EF01AF82E45385A00BF0971 /* oscOutputSettings.xml */, + 8EF01AFC2E45385A00BF0971 /* udpOutputSettings.xml */, + 8EF01AFA2E45385A00BF0971 /* verdana.ttf */, + 8EF01AFB2E45385A00BF0971 /* verdanab.ttf */, E4B6FCAD0C3E899E008CF71C /* openFrameworks-Info.plist */, E4EB6923138AFD0F00A09F29 /* Project.xcconfig */, E4B69E1C0A3A1BDC003C02F2 /* src */, E42962AA2163EDD300A6A9E2 /* openFrameworks */, BB4B014C10F69532006C3DED /* addons */, 6948EE371B920CB800B5AC1A /* local_addons */, - E4B69B5B0A3A1756003C02F2 /* EmotiBitOscilloscope-Debug.app */, - 948E6B5428528E33000A8B76 /* Frameworks */, - B990E6072C0E7A370094B63E /* EmotiBitOscilloscope.app */, + E4B69B5B0A3A1756003C02F2 /* EmotiBitOscilloscopeDebug.app */, + 8EF01AC62E452DC700BF0971 /* Recovered References */, + 8EF01AF22E4533E300BF0971 /* Frameworks */, + 8EF01B9F2E4544B600BF0971 /* EmotiBitOscilloscope-arm64.app */, ); sourceTree = ""; }; E4B69E1C0A3A1BDC003C02F2 /* src */ = { isa = PBXGroup; children = ( - 8E80A35F2CCDAAA000C65119 /* EmotiBitLsl.cpp */, - 8E80A3612CCDAAA000C65119 /* EmotiBitLsl.h */, - 8E80A3622CCDAAA000C65119 /* EmotiBitWiFiHost.cpp */, - 8E80A3602CCDAAA000C65119 /* EmotiBitWiFiHost.h */, + 8EF01ADD2E45302800BF0971 /* EmotiBitLsl.cpp */, + 8EF01ADE2E45302800BF0971 /* EmotiBitLsl.h */, + 8EF01ADC2E45302800BF0971 /* EmotiBitWiFiHost.cpp */, + 8EF01ADF2E45302800BF0971 /* EmotiBitWiFiHost.h */, E4B69E1D0A3A1BDC003C02F2 /* main.cpp */, E4B69E1E0A3A1BDC003C02F2 /* ofApp.cpp */, E4B69E1F0A3A1BDC003C02F2 /* ofApp.h */, @@ -1566,14 +1499,12 @@ name = ofxOsc; sourceTree = ""; }; - F06A6CC1DE8AD93D3A0E1E5D /* src */ = { + F40E80CB2D443CBA9581DD03 /* libs */ = { isa = PBXGroup; children = ( - 2FA5A4362497FA77DF9B5A19 /* IPAddressRange.cpp */, - 44D29F961AB993B629D7C467 /* NetworkInterfaceListener.cpp */, - B557FD8519CC0900FAB1DCA2 /* NetworkUtils.cpp */, + 977A836DD2C489CCC5E330FF /* jsoncpp */, ); - name = src; + name = libs; sourceTree = ""; }; F60A999B2E163485AF3C1B3D /* labstreaminglayer */ = { @@ -1601,17 +1532,18 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - B990E5B62C0E7A370094B63E /* EmotiBitOscilloscope-arm64 */ = { + 8EF01B542E4544B600BF0971 /* EmotiBitOscilloscope-arm64 */ = { isa = PBXNativeTarget; - buildConfigurationList = B990E6032C0E7A370094B63E /* Build configuration list for PBXNativeTarget "EmotiBitOscilloscope-arm64" */; + buildConfigurationList = 8EF01B9B2E4544B600BF0971 /* Build configuration list for PBXNativeTarget "EmotiBitOscilloscope-arm64" */; buildPhases = ( - B990E5B72C0E7A370094B63E /* ShellScript */, - B990E5B82C0E7A370094B63E /* Sources */, - B990E5F52C0E7A370094B63E /* Frameworks */, - B990E5F72C0E7A370094B63E /* ShellScript */, - B990E5F82C0E7A370094B63E /* CopyFiles */, - B990E6012C0E7A370094B63E /* ShellScript */, - B990E6022C0E7A370094B63E /* Run Script */, + 8EF01B552E4544B600BF0971 /* ShellScript */, + 8EF01B562E4544B600BF0971 /* Sources */, + 8EF01B8C2E4544B600BF0971 /* Frameworks */, + 8EF01B8E2E4544B600BF0971 /* Run Script */, + 8EF01B8F2E4544B600BF0971 /* CopyFiles */, + 8EF01B902E4544B600BF0971 /* ShellScript */, + 8EF01B912E4544B600BF0971 /* Run Script - copy liblsl to app bundle */, + 8EF01B922E4544B600BF0971 /* Copy Files to Resources */, ); buildRules = ( ); @@ -1619,7 +1551,7 @@ ); name = "EmotiBitOscilloscope-arm64"; productName = myOFApp; - productReference = B990E6072C0E7A370094B63E /* EmotiBitOscilloscope.app */; + productReference = 8EF01B9F2E4544B600BF0971 /* EmotiBitOscilloscope-arm64.app */; productType = "com.apple.product-type.application"; }; E4B69B5A0A3A1756003C02F2 /* EmotiBitOscilloscope-x86_64 */ = { @@ -1629,10 +1561,11 @@ E42962A92163ECCD00A6A9E2 /* ShellScript */, E4B69B580A3A1756003C02F2 /* Sources */, E4B69B590A3A1756003C02F2 /* Frameworks */, - E4B6FFFD0C3F9AB9008CF71C /* ShellScript */, - E4C2427710CC5ABF004149E2 /* Copy Files */, + E4B6FFFD0C3F9AB9008CF71C /* Run Script */, + E4C2427710CC5ABF004149E2 /* CopyFiles */, 8466F1851C04CA0E00918B1C /* ShellScript */, - 948E6B5A2852AA4B000A8B76 /* Run Script */, + 8EF01AF52E45370500BF0971 /* Run Script - copy liblsl to app bundle */, + 8EF01AF62E4537E300BF0971 /* Copy Files to Resources */, ); buildRules = ( ); @@ -1640,7 +1573,7 @@ ); name = "EmotiBitOscilloscope-x86_64"; productName = myOFApp; - productReference = E4B69B5B0A3A1756003C02F2 /* EmotiBitOscilloscope-Debug.app */; + productReference = E4B69B5B0A3A1756003C02F2 /* EmotiBitOscilloscopeDebug.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -1649,7 +1582,6 @@ E4B69B4C0A3A1720003C02F2 /* Project object */ = { isa = PBXProject; attributes = { - DefaultBuildSystemTypeForWorkspace = Original; LastUpgradeCheck = 0600; }; buildConfigurationList = E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "EmotiBitOscilloscope" */; @@ -1667,8 +1599,8 @@ projectDirPath = ""; projectRoot = ""; targets = ( - B990E5B62C0E7A370094B63E /* EmotiBitOscilloscope-arm64 */, E4B69B5A0A3A1756003C02F2 /* EmotiBitOscilloscope-x86_64 */, + 8EF01B542E4544B600BF0971 /* EmotiBitOscilloscope-arm64 */, ); }; /* End PBXProject section */ @@ -1685,9 +1617,9 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "echo \"$GCC_PREPROCESSOR_DEFINITIONS\";\nAPPSTORE=`expr \"$GCC_PREPROCESSOR_DEFINITIONS\" : \".*APPSTORE=\\([0-9]*\\)\"`\nif [ -z \"$APPSTORE\" ] ; then\necho \"Note: Not copying bin/data to App Package or doing App Code signing. Use AppStore target for AppStore distribution\";\nelse\n# Copy bin/data into App/Resources\nrsync -avz --exclude='.DS_Store' \"${SRCROOT}/bin/data/\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/data/\"\n\n# Strip 32bit from fmod dylib\nlipo -remove i386 \"${TARGET_BUILD_DIR}/${PRODUCT_NAME}.app/Contents/Frameworks/libfmod.dylib\" -o \"${TARGET_BUILD_DIR}/${PRODUCT_NAME}.app/Contents/Frameworks/libfmod.dylib\" \n\n# ---- Code Sign App Package ----\n\n# WARNING: You may have to run Clean in Xcode after changing CODE_SIGN_IDENTITY!\n\n# Verify that $CODE_SIGN_IDENTITY is set\nif [ -z \"${CODE_SIGN_IDENTITY}\" ] ; then\necho \"CODE_SIGN_IDENTITY needs to be set for framework code-signing\"\nexit 0\nfi\n\nif [ -z \"${CODE_SIGN_ENTITLEMENTS}\" ] ; then\necho \"CODE_SIGN_ENTITLEMENTS needs to be set for framework code-signing!\"\n\nif [ \"${CONFIGURATION}\" = \"Release\" ] ; then\nexit 1\nelse\n# Code-signing is optional for non-release builds.\nexit 0\nfi\nfi\n\nITEMS=\"\"\n\nFRAMEWORKS_DIR=\"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}\"\necho \"$FRAMEWORKS_DIR\"\nif [ -d \"$FRAMEWORKS_DIR\" ] ; then\nFRAMEWORKS=$(find \"${FRAMEWORKS_DIR}\" -depth -type d -name \"*.framework\" -or -name \"*.dylib\" -or -name \"*.bundle\" | sed -e \"s/\\(.*framework\\)/\\1\\/Versions\\/A\\//\")\nRESULT=$?\nif [[ $RESULT != 0 ]] ; then\nexit 1\nfi\n\nITEMS=\"${FRAMEWORKS}\"\nfi\n\nLOGINITEMS_DIR=\"${TARGET_BUILD_DIR}/${CONTENTS_FOLDER_PATH}/Library/LoginItems/\"\nif [ -d \"$LOGINITEMS_DIR\" ] ; then\nLOGINITEMS=$(find \"${LOGINITEMS_DIR}\" -depth -type d -name \"*.app\")\nRESULT=$?\nif [[ $RESULT != 0 ]] ; then\nexit 1\nfi\n\nITEMS=\"${ITEMS}\"$'\\n'\"${LOGINITEMS}\"\nfi\n\n# Prefer the expanded name, if available.\nCODE_SIGN_IDENTITY_FOR_ITEMS=\"${EXPANDED_CODE_SIGN_IDENTITY_NAME}\"\nif [ \"${CODE_SIGN_IDENTITY_FOR_ITEMS}\" = \"\" ] ; then\n# Fall back to old behavior.\nCODE_SIGN_IDENTITY_FOR_ITEMS=\"${CODE_SIGN_IDENTITY}\"\nfi\n\necho \"Identity:\"\necho \"${CODE_SIGN_IDENTITY_FOR_ITEMS}\"\n\necho \"Entitlements:\"\necho \"${CODE_SIGN_ENTITLEMENTS}\"\n\necho \"Found:\"\necho \"${ITEMS}\"\n\n# Change the Internal Field Separator (IFS) so that spaces in paths will not cause problems below.\nSAVED_IFS=$IFS\nIFS=$(echo -en \"\\n\\b\")\n\n# Loop through all items.\nfor ITEM in $ITEMS;\ndo\necho \"Stripping invalid archs '${ITEM}'\"\nlipo -remove i386 \"${ITEM}\" -o \"${ITEM}\"\necho \"Signing '${ITEM}'\"\ncodesign --force --verbose --sign \"${CODE_SIGN_IDENTITY_FOR_ITEMS}\" --entitlements \"${CODE_SIGN_ENTITLEMENTS}\" \"${ITEM}\"\nRESULT=$?\nif [[ $RESULT != 0 ]] ; then\necho \"Failed to sign '${ITEM}'.\"\nIFS=$SAVED_IFS\nexit 1\nfi\ndone\n\n# Restore $IFS.\nIFS=$SAVED_IFS\n\nfi\n"; + shellScript = "echo \"$GCC_PREPROCESSOR_DEFINITIONS\";\nAPPSTORE=`expr \"$GCC_PREPROCESSOR_DEFINITIONS\" : \".*APPSTORE=\\([0-9]*\\)\"`\nif [ -z \"$APPSTORE\" ] ; then\necho \"Note: Not copying bin/data to App Package or doing App Code signing. Use AppStore target for AppStore distribution\";\nelse\n# Copy bin/data into App/Resources\nrsync -avz --exclude='.DS_Store' \"${SRCROOT}/bin/data/\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/data/\"\n\n# ---- Code Sign App Package ----\n\n# WARNING: You may have to run Clean in Xcode after changing CODE_SIGN_IDENTITY!\n\n# Verify that $CODE_SIGN_IDENTITY is set\nif [ -z \"${CODE_SIGN_IDENTITY}\" ] ; then\necho \"CODE_SIGN_IDENTITY needs to be set for framework code-signing\"\nexit 0\nfi\n\nif [ -z \"${CODE_SIGN_ENTITLEMENTS}\" ] ; then\necho \"CODE_SIGN_ENTITLEMENTS needs to be set for framework code-signing!\"\n\nif [ \"${CONFIGURATION}\" = \"Release\" ] ; then\nexit 1\nelse\n# Code-signing is optional for non-release builds.\nexit 0\nfi\nfi\n\nITEMS=\"\"\n\nFRAMEWORKS_DIR=\"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}\"\necho \"$FRAMEWORKS_DIR\"\nif [ -d \"$FRAMEWORKS_DIR\" ] ; then\nFRAMEWORKS=$(find \"${FRAMEWORKS_DIR}\" -depth -type d -name \"*.framework\" -or -name \"*.dylib\" -or -name \"*.bundle\" | sed -e \"s/\\(.*framework\\)/\\1\\/Versions\\/A\\//\")\nRESULT=$?\nif [[ $RESULT != 0 ]] ; then\nexit 1\nfi\n\nITEMS=\"${FRAMEWORKS}\"\nfi\n\nLOGINITEMS_DIR=\"${TARGET_BUILD_DIR}/${CONTENTS_FOLDER_PATH}/Library/LoginItems/\"\nif [ -d \"$LOGINITEMS_DIR\" ] ; then\nLOGINITEMS=$(find \"${LOGINITEMS_DIR}\" -depth -type d -name \"*.app\")\nRESULT=$?\nif [[ $RESULT != 0 ]] ; then\nexit 1\nfi\n\nITEMS=\"${ITEMS}\"$'\\n'\"${LOGINITEMS}\"\nfi\n\n# Prefer the expanded name, if available.\nCODE_SIGN_IDENTITY_FOR_ITEMS=\"${EXPANDED_CODE_SIGN_IDENTITY_NAME}\"\nif [ \"${CODE_SIGN_IDENTITY_FOR_ITEMS}\" = \"\" ] ; then\n# Fall back to old behavior.\nCODE_SIGN_IDENTITY_FOR_ITEMS=\"${CODE_SIGN_IDENTITY}\"\nfi\n\necho \"Identity:\"\necho \"${CODE_SIGN_IDENTITY_FOR_ITEMS}\"\n\necho \"Entitlements:\"\necho \"${CODE_SIGN_ENTITLEMENTS}\"\n\necho \"Found:\"\necho \"${ITEMS}\"\n\n# Change the Internal Field Separator (IFS) so that spaces in paths will not cause problems below.\nSAVED_IFS=$IFS\nIFS=$(echo -en \"\\n\\b\")\n\n# Loop through all items.\nfor ITEM in $ITEMS;\ndo\necho \"Stripping invalid archs '${ITEM}'\"\nlipo -extract x86_64 \"${ITEM}\" -o \"${ITEM}\"\necho \"Signing '${ITEM}'\"\ncodesign --force --verbose --sign \"${CODE_SIGN_IDENTITY_FOR_ITEMS}\" --entitlements \"${CODE_SIGN_ENTITLEMENTS}\" \"${ITEM}\"\nRESULT=$?\nif [[ $RESULT != 0 ]] ; then\necho \"Failed to sign '${ITEM}'.\"\nIFS=$SAVED_IFS\nexit 1\nfi\ndone\n\n# Restore $IFS.\nIFS=$SAVED_IFS\n\nfi\n"; }; - 948E6B5A2852AA4B000A8B76 /* Run Script */ = { + 8EF01AF52E45370500BF0971 /* Run Script - copy liblsl to app bundle */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -1696,7 +1628,7 @@ ); inputPaths = ( ); - name = "Run Script"; + name = "Run Script - copy liblsl to app bundle"; outputFileListPaths = ( ); outputPaths = ( @@ -1705,7 +1637,7 @@ shellPath = /bin/sh; shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nrsync -aved \"$OF_PATH/addons/ofxLSL/libs/labstreaminglayer/lib/osx/x86_64/liblsl.1.14.0.dylib\" \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks/\";\n"; }; - B990E5B72C0E7A370094B63E /* ShellScript */ = { + 8EF01B552E4544B600BF0971 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -1718,20 +1650,21 @@ shellPath = /bin/sh; shellScript = "xcodebuild -project \"$OF_PATH/libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj\" -target openFrameworks -configuration \"${CONFIGURATION}\"\n"; }; - B990E5F72C0E7A370094B63E /* ShellScript */ = { + 8EF01B8E2E4544B600BF0971 /* Run Script */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); + name = "Run Script"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "mkdir -p \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Resources/\"\n# Copy default icon file into App/Resources\nrsync -aved \"$ICON_FILE\" \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Resources/\"\n# Copy libfmod and change install directory for fmod to run\nrsync -aved \"$OF_PATH/libs/fmod/lib/osx/libfmod.dylib\" \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks/\";\ninstall_name_tool -change @executable_path/libfmodex.dylib @executable_path/../Frameworks/libfmodex.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\";\n\necho \"$GCC_PREPROCESSOR_DEFINITIONS\";\n"; + shellScript = "mkdir -p \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Resources/\"\n# Copy default icon file into App/Resources\nrsync -aved \"$ICON_FILE\" \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Resources/\"\n# Copy libfmod and change install directory for fmod to run\nrsync -aved \"$OF_PATH/libs/fmod/lib/osx/libfmod.dylib\" \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks/\";\n# Not needed as we now call install_name_tool -id @loader_path/../Frameworks/libfmod.dylib libfmod.dylib on the dylib directly which prevents the need for calling every post build - keeping here for reference and possible legacy usage \n# install_name_tool -change @rpath/libfmod.dylib @executable_path/../Frameworks/libfmod.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\";\n\necho \"$GCC_PREPROCESSOR_DEFINITIONS\";\n"; }; - B990E6012C0E7A370094B63E /* ShellScript */ = { + 8EF01B902E4544B600BF0971 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 12; files = ( @@ -1742,9 +1675,9 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "echo \"$GCC_PREPROCESSOR_DEFINITIONS\";\nAPPSTORE=`expr \"$GCC_PREPROCESSOR_DEFINITIONS\" : \".*APPSTORE=\\([0-9]*\\)\"`\nif [ -z \"$APPSTORE\" ] ; then\necho \"Note: Not copying bin/data to App Package or doing App Code signing. Use AppStore target for AppStore distribution\";\nelse\n# Copy bin/data into App/Resources\nrsync -avz --exclude='.DS_Store' \"${SRCROOT}/bin/data/\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/data/\"\n\n# Strip 32bit from fmod dylib\nlipo -remove i386 \"${TARGET_BUILD_DIR}/${PRODUCT_NAME}.app/Contents/Frameworks/libfmod.dylib\" -o \"${TARGET_BUILD_DIR}/${PRODUCT_NAME}.app/Contents/Frameworks/libfmod.dylib\" \n\n# ---- Code Sign App Package ----\n\n# WARNING: You may have to run Clean in Xcode after changing CODE_SIGN_IDENTITY!\n\n# Verify that $CODE_SIGN_IDENTITY is set\nif [ -z \"${CODE_SIGN_IDENTITY}\" ] ; then\necho \"CODE_SIGN_IDENTITY needs to be set for framework code-signing\"\nexit 0\nfi\n\nif [ -z \"${CODE_SIGN_ENTITLEMENTS}\" ] ; then\necho \"CODE_SIGN_ENTITLEMENTS needs to be set for framework code-signing!\"\n\nif [ \"${CONFIGURATION}\" = \"Release\" ] ; then\nexit 1\nelse\n# Code-signing is optional for non-release builds.\nexit 0\nfi\nfi\n\nITEMS=\"\"\n\nFRAMEWORKS_DIR=\"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}\"\necho \"$FRAMEWORKS_DIR\"\nif [ -d \"$FRAMEWORKS_DIR\" ] ; then\nFRAMEWORKS=$(find \"${FRAMEWORKS_DIR}\" -depth -type d -name \"*.framework\" -or -name \"*.dylib\" -or -name \"*.bundle\" | sed -e \"s/\\(.*framework\\)/\\1\\/Versions\\/A\\//\")\nRESULT=$?\nif [[ $RESULT != 0 ]] ; then\nexit 1\nfi\n\nITEMS=\"${FRAMEWORKS}\"\nfi\n\nLOGINITEMS_DIR=\"${TARGET_BUILD_DIR}/${CONTENTS_FOLDER_PATH}/Library/LoginItems/\"\nif [ -d \"$LOGINITEMS_DIR\" ] ; then\nLOGINITEMS=$(find \"${LOGINITEMS_DIR}\" -depth -type d -name \"*.app\")\nRESULT=$?\nif [[ $RESULT != 0 ]] ; then\nexit 1\nfi\n\nITEMS=\"${ITEMS}\"$'\\n'\"${LOGINITEMS}\"\nfi\n\n# Prefer the expanded name, if available.\nCODE_SIGN_IDENTITY_FOR_ITEMS=\"${EXPANDED_CODE_SIGN_IDENTITY_NAME}\"\nif [ \"${CODE_SIGN_IDENTITY_FOR_ITEMS}\" = \"\" ] ; then\n# Fall back to old behavior.\nCODE_SIGN_IDENTITY_FOR_ITEMS=\"${CODE_SIGN_IDENTITY}\"\nfi\n\necho \"Identity:\"\necho \"${CODE_SIGN_IDENTITY_FOR_ITEMS}\"\n\necho \"Entitlements:\"\necho \"${CODE_SIGN_ENTITLEMENTS}\"\n\necho \"Found:\"\necho \"${ITEMS}\"\n\n# Change the Internal Field Separator (IFS) so that spaces in paths will not cause problems below.\nSAVED_IFS=$IFS\nIFS=$(echo -en \"\\n\\b\")\n\n# Loop through all items.\nfor ITEM in $ITEMS;\ndo\necho \"Stripping invalid archs '${ITEM}'\"\nlipo -remove i386 \"${ITEM}\" -o \"${ITEM}\"\necho \"Signing '${ITEM}'\"\ncodesign --force --verbose --sign \"${CODE_SIGN_IDENTITY_FOR_ITEMS}\" --entitlements \"${CODE_SIGN_ENTITLEMENTS}\" \"${ITEM}\"\nRESULT=$?\nif [[ $RESULT != 0 ]] ; then\necho \"Failed to sign '${ITEM}'.\"\nIFS=$SAVED_IFS\nexit 1\nfi\ndone\n\n# Restore $IFS.\nIFS=$SAVED_IFS\n\nfi\n"; + shellScript = "echo \"$GCC_PREPROCESSOR_DEFINITIONS\";\nAPPSTORE=`expr \"$GCC_PREPROCESSOR_DEFINITIONS\" : \".*APPSTORE=\\([0-9]*\\)\"`\nif [ -z \"$APPSTORE\" ] ; then\necho \"Note: Not copying bin/data to App Package or doing App Code signing. Use AppStore target for AppStore distribution\";\nelse\n# Copy bin/data into App/Resources\nrsync -avz --exclude='.DS_Store' \"${SRCROOT}/bin/data/\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/data/\"\n\n# ---- Code Sign App Package ----\n\n# WARNING: You may have to run Clean in Xcode after changing CODE_SIGN_IDENTITY!\n\n# Verify that $CODE_SIGN_IDENTITY is set\nif [ -z \"${CODE_SIGN_IDENTITY}\" ] ; then\necho \"CODE_SIGN_IDENTITY needs to be set for framework code-signing\"\nexit 0\nfi\n\nif [ -z \"${CODE_SIGN_ENTITLEMENTS}\" ] ; then\necho \"CODE_SIGN_ENTITLEMENTS needs to be set for framework code-signing!\"\n\nif [ \"${CONFIGURATION}\" = \"Release\" ] ; then\nexit 1\nelse\n# Code-signing is optional for non-release builds.\nexit 0\nfi\nfi\n\nITEMS=\"\"\n\nFRAMEWORKS_DIR=\"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}\"\necho \"$FRAMEWORKS_DIR\"\nif [ -d \"$FRAMEWORKS_DIR\" ] ; then\nFRAMEWORKS=$(find \"${FRAMEWORKS_DIR}\" -depth -type d -name \"*.framework\" -or -name \"*.dylib\" -or -name \"*.bundle\" | sed -e \"s/\\(.*framework\\)/\\1\\/Versions\\/A\\//\")\nRESULT=$?\nif [[ $RESULT != 0 ]] ; then\nexit 1\nfi\n\nITEMS=\"${FRAMEWORKS}\"\nfi\n\nLOGINITEMS_DIR=\"${TARGET_BUILD_DIR}/${CONTENTS_FOLDER_PATH}/Library/LoginItems/\"\nif [ -d \"$LOGINITEMS_DIR\" ] ; then\nLOGINITEMS=$(find \"${LOGINITEMS_DIR}\" -depth -type d -name \"*.app\")\nRESULT=$?\nif [[ $RESULT != 0 ]] ; then\nexit 1\nfi\n\nITEMS=\"${ITEMS}\"$'\\n'\"${LOGINITEMS}\"\nfi\n\n# Prefer the expanded name, if available.\nCODE_SIGN_IDENTITY_FOR_ITEMS=\"${EXPANDED_CODE_SIGN_IDENTITY_NAME}\"\nif [ \"${CODE_SIGN_IDENTITY_FOR_ITEMS}\" = \"\" ] ; then\n# Fall back to old behavior.\nCODE_SIGN_IDENTITY_FOR_ITEMS=\"${CODE_SIGN_IDENTITY}\"\nfi\n\necho \"Identity:\"\necho \"${CODE_SIGN_IDENTITY_FOR_ITEMS}\"\n\necho \"Entitlements:\"\necho \"${CODE_SIGN_ENTITLEMENTS}\"\n\necho \"Found:\"\necho \"${ITEMS}\"\n\n# Change the Internal Field Separator (IFS) so that spaces in paths will not cause problems below.\nSAVED_IFS=$IFS\nIFS=$(echo -en \"\\n\\b\")\n\n# Loop through all items.\nfor ITEM in $ITEMS;\ndo\necho \"Stripping invalid archs '${ITEM}'\"\nlipo -extract x86_64 \"${ITEM}\" -o \"${ITEM}\"\necho \"Signing '${ITEM}'\"\ncodesign --force --verbose --sign \"${CODE_SIGN_IDENTITY_FOR_ITEMS}\" --entitlements \"${CODE_SIGN_ENTITLEMENTS}\" \"${ITEM}\"\nRESULT=$?\nif [[ $RESULT != 0 ]] ; then\necho \"Failed to sign '${ITEM}'.\"\nIFS=$SAVED_IFS\nexit 1\nfi\ndone\n\n# Restore $IFS.\nIFS=$SAVED_IFS\n\nfi\n"; }; - B990E6022C0E7A370094B63E /* Run Script */ = { + 8EF01B912E4544B600BF0971 /* Run Script - copy liblsl to app bundle */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -1753,7 +1686,7 @@ ); inputPaths = ( ); - name = "Run Script"; + name = "Run Script - copy liblsl to app bundle"; outputFileListPaths = ( ); outputPaths = ( @@ -1775,86 +1708,80 @@ shellPath = /bin/sh; shellScript = "xcodebuild -project \"$OF_PATH/libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj\" -target openFrameworks -configuration \"${CONFIGURATION}\"\n"; }; - E4B6FFFD0C3F9AB9008CF71C /* ShellScript */ = { + E4B6FFFD0C3F9AB9008CF71C /* Run Script */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); + name = "Run Script"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "mkdir -p \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Resources/\"\n# Copy default icon file into App/Resources\nrsync -aved \"$ICON_FILE\" \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Resources/\"\n# Copy libfmod and change install directory for fmod to run\nrsync -aved \"$OF_PATH/libs/fmod/lib/osx/libfmod.dylib\" \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks/\";\ninstall_name_tool -change @executable_path/libfmodex.dylib @executable_path/../Frameworks/libfmodex.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\";\n\necho \"$GCC_PREPROCESSOR_DEFINITIONS\";\n"; + shellScript = "mkdir -p \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Resources/\"\n# Copy default icon file into App/Resources\nrsync -aved \"$ICON_FILE\" \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Resources/\"\n# Copy libfmod and change install directory for fmod to run\nrsync -aved \"$OF_PATH/libs/fmod/lib/osx/libfmod.dylib\" \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks/\";\n# Not needed as we now call install_name_tool -id @loader_path/../Frameworks/libfmod.dylib libfmod.dylib on the dylib directly which prevents the need for calling every post build - keeping here for reference and possible legacy usage \n# install_name_tool -change @rpath/libfmod.dylib @executable_path/../Frameworks/libfmod.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\";\n\necho \"$GCC_PREPROCESSOR_DEFINITIONS\";\n"; }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - B990E5B82C0E7A370094B63E /* Sources */ = { + 8EF01B562E4544B600BF0971 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - B990E5B92C0E7A370094B63E /* SoftwareVersionChecker.cpp in Sources */, - B990E5BA2C0E7A370094B63E /* main.cpp in Sources */, - B990E5BB2C0E7A370094B63E /* ofApp.cpp in Sources */, - B990E5BC2C0E7A370094B63E /* ofxBiquadFilter.cpp in Sources */, - B990E5BD2C0E7A370094B63E /* ofxBiquadFilterInstance.cpp in Sources */, - B990E5BE2C0E7A370094B63E /* EmotiBitFactoryTest.cpp in Sources */, - B990E5BF2C0E7A370094B63E /* jsoncpp.cpp in Sources */, - B990E5C02C0E7A370094B63E /* EmotiBitTestingHelper.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 */, - B990E5C72C0E7A370094B63E /* PatchboardJson.cpp in Sources */, - B990E5C82C0E7A370094B63E /* ofxColorPicker.cpp in Sources */, - B990E5C92C0E7A370094B63E /* ofxGuiGroup.cpp in Sources */, - B990E5CA2C0E7A370094B63E /* ofxInputField.cpp in Sources */, - B990E5CB2C0E7A370094B63E /* DigitalFilter.cpp in Sources */, - B990E5CC2C0E7A370094B63E /* ofxLabel.cpp in Sources */, - B990E5CD2C0E7A370094B63E /* Periodizer.cpp in Sources */, - B990E5CE2C0E7A370094B63E /* ofxPanel.cpp in Sources */, - B990E5CF2C0E7A370094B63E /* ofxSlider.cpp in Sources */, - B990E5D02C0E7A370094B63E /* ofxSliderGroup.cpp in Sources */, - B990E5D12C0E7A370094B63E /* ofxToggle.cpp in Sources */, - B990E5D22C0E7A370094B63E /* ofxNetworkUtils.cpp in Sources */, - B990E5D32C0E7A370094B63E /* ofxLSLReceiver.cpp in Sources */, - B990E5D42C0E7A370094B63E /* EmotiBitOfUtils.cpp in Sources */, - B990E5D52C0E7A370094B63E /* EmotiBitPacket.cpp in Sources */, - B990E5D62C0E7A370094B63E /* ofxTCPClient.cpp in Sources */, - B990E5D72C0E7A370094B63E /* ofxTCPManager.cpp in Sources */, - B990E5D82C0E7A370094B63E /* ofxTCPServer.cpp in Sources */, - B990E5D92C0E7A370094B63E /* ofxUDPManager.cpp in Sources */, - B990E5DA2C0E7A370094B63E /* ofxXmlPoco.cpp in Sources */, - B990E5DB2C0E7A370094B63E /* IPAddressRange.cpp in Sources */, - B990E5DC2C0E7A370094B63E /* NetworkInterfaceListener.cpp in Sources */, - B990E5DD2C0E7A370094B63E /* NetworkUtils.cpp in Sources */, - B990E5DE2C0E7A370094B63E /* ofxNetworkUtils.cpp in Sources */, - B990E5DF2C0E7A370094B63E /* PatchboardBase.cpp in Sources */, - B990E5E02C0E7A370094B63E /* IpEndpointName.cpp in Sources */, - B990E5E12C0E7A370094B63E /* NetworkingUtils.cpp in Sources */, - B990E5E22C0E7A370094B63E /* ofxJSONElement.cpp in Sources */, - B990E5E32C0E7A370094B63E /* UdpSocket.cpp in Sources */, - B990E5E42C0E7A370094B63E /* OscOutboundPacketStream.cpp in Sources */, - B990E5E52C0E7A370094B63E /* OscPrintReceivedElements.cpp in Sources */, - B990E5E62C0E7A370094B63E /* OscReceivedElements.cpp in Sources */, - B990E5E72C0E7A370094B63E /* PatchboardXml.cpp in Sources */, - B990E5E82C0E7A370094B63E /* OscTypes.cpp in Sources */, - B990E5E92C0E7A370094B63E /* ofxOscBundle.cpp in Sources */, - B990E5EA2C0E7A370094B63E /* ofxOscMessage.cpp in Sources */, - B990E5EB2C0E7A370094B63E /* ofxOscParameterSync.cpp in Sources */, - B990E5EC2C0E7A370094B63E /* ofxOscReceiver.cpp in Sources */, - B990E5ED2C0E7A370094B63E /* ofxOscSender.cpp in Sources */, - 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 */, - B990E5F42C0E7A370094B63E /* ofxXmlSettings.cpp in Sources */, + 8EF01B572E4544B600BF0971 /* main.cpp in Sources */, + 8EF01B582E4544B600BF0971 /* ofApp.cpp in Sources */, + 8EF01B592E4544B600BF0971 /* ofxBiquadFilter.cpp in Sources */, + 8EF01B5A2E4544B600BF0971 /* ofxBiquadFilterInstance.cpp in Sources */, + 8EF01B5B2E4544B600BF0971 /* EmotiBitOfUtils.cpp in Sources */, + 8EF01B5C2E4544B600BF0971 /* Periodizer.cpp in Sources */, + 8EF01B5D2E4544B600BF0971 /* SoftwareVersionChecker.cpp in Sources */, + 8EF01B5E2E4544B600BF0971 /* ofxBaseGui.cpp in Sources */, + 8EF01B5F2E4544B600BF0971 /* EmotiBitTestingHelper.cpp in Sources */, + 8EF01B602E4544B600BF0971 /* ofxButton.cpp in Sources */, + 8EF01B612E4544B600BF0971 /* ofxColorPicker.cpp in Sources */, + 8EF01B622E4544B600BF0971 /* ofxGuiGroup.cpp in Sources */, + 8EF01B632E4544B600BF0971 /* PatchboardBase.cpp in Sources */, + 8EF01B642E4544B600BF0971 /* ofxInputField.cpp in Sources */, + 8EF01B652E4544B600BF0971 /* ofxLabel.cpp in Sources */, + 8EF01B662E4544B600BF0971 /* ofxPanel.cpp in Sources */, + 8EF01B672E4544B600BF0971 /* ofxSlider.cpp in Sources */, + 8EF01B682E4544B600BF0971 /* ofxSliderGroup.cpp in Sources */, + 8EF01B692E4544B600BF0971 /* EmotiBitWiFiHost.cpp in Sources */, + 8EF01B6A2E4544B600BF0971 /* ofxToggle.cpp in Sources */, + 8EF01B6B2E4544B600BF0971 /* PatchboardXml.cpp in Sources */, + 8EF01B6C2E4544B600BF0971 /* jsoncpp.cpp in Sources */, + 8EF01B6D2E4544B600BF0971 /* ofxJSONElement.cpp in Sources */, + 8EF01B6E2E4544B600BF0971 /* tinyxml.cpp in Sources */, + 8EF01B6F2E4544B600BF0971 /* tinyxmlerror.cpp in Sources */, + 8EF01B702E4544B600BF0971 /* tinyxmlparser.cpp in Sources */, + 8EF01B712E4544B600BF0971 /* ofxXmlSettings.cpp in Sources */, + 8EF01B722E4544B600BF0971 /* EmotiBitPacket.cpp in Sources */, + 8EF01B732E4544B600BF0971 /* PatchboardJson.cpp in Sources */, + 8EF01B742E4544B600BF0971 /* ofxLSLReceiver.cpp in Sources */, + 8EF01B752E4544B600BF0971 /* ofxLSLResolver.cpp in Sources */, + 8EF01B762E4544B600BF0971 /* ofxNetworkUtils.cpp in Sources */, + 8EF01B772E4544B600BF0971 /* ofxTCPClient.cpp in Sources */, + 8EF01B782E4544B600BF0971 /* ofxTCPManager.cpp in Sources */, + 8EF01B792E4544B600BF0971 /* ofxTCPServer.cpp in Sources */, + 8EF01B7A2E4544B600BF0971 /* ofxUDPManager.cpp in Sources */, + 8EF01B7B2E4544B600BF0971 /* IpEndpointName.cpp in Sources */, + 8EF01B7C2E4544B600BF0971 /* NetworkingUtils.cpp in Sources */, + 8EF01B7D2E4544B600BF0971 /* UdpSocket.cpp in Sources */, + 8EF01B7E2E4544B600BF0971 /* OscOutboundPacketStream.cpp in Sources */, + 8EF01B7F2E4544B600BF0971 /* OscPrintReceivedElements.cpp in Sources */, + 8EF01B802E4544B600BF0971 /* OscReceivedElements.cpp in Sources */, + 8EF01B812E4544B600BF0971 /* OscTypes.cpp in Sources */, + 8EF01B822E4544B600BF0971 /* ofxOscBundle.cpp in Sources */, + 8EF01B832E4544B600BF0971 /* ofxOscMessage.cpp in Sources */, + 8EF01B842E4544B600BF0971 /* ofxOscParameterSync.cpp in Sources */, + 8EF01B852E4544B600BF0971 /* ofxOscReceiver.cpp in Sources */, + 8EF01B862E4544B600BF0971 /* ofxOscSender.cpp in Sources */, + 8EF01B872E4544B600BF0971 /* src in Sources */, + 8EF01B882E4544B600BF0971 /* EmotiBitLsl.cpp in Sources */, + 8EF01B892E4544B600BF0971 /* ofxOscilloscope.cpp in Sources */, + 8EF01B8A2E4544B600BF0971 /* ofxXmlPoco.cpp in Sources */, + 8EF01B8B2E4544B600BF0971 /* ofxThreadedLogger.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1862,118 +1789,94 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 8E07BBAD2B1F824D00CDD443 /* SoftwareVersionChecker.cpp in Sources */, E4B69E200A3A1BDC003C02F2 /* main.cpp in Sources */, E4B69E210A3A1BDC003C02F2 /* ofApp.cpp in Sources */, D820615CFDD5F497033D7C5A /* ofxBiquadFilter.cpp in Sources */, A7CF97A6E1DAE4A002CA6F82 /* ofxBiquadFilterInstance.cpp in Sources */, - 8E016F802832CE28005D7C65 /* EmotiBitFactoryTest.cpp in Sources */, - 8E016F6E2832CB73005D7C65 /* jsoncpp.cpp in Sources */, - 5FD318D4DCF1B7169E9F1F64 /* EmotiBitTestingHelper.cpp in Sources */, - 8E016F7D2832CE28005D7C65 /* EmotiBitEdaCalibration.cpp in Sources */, - 8E80A3642CCDAAA000C65119 /* EmotiBitLsl.cpp in Sources */, - 948E6B5328528CA5000A8B76 /* ofxLSLResolver.cpp in Sources */, + D1E529D7B6961183405926CF /* EmotiBitOfUtils.cpp in Sources */, + 02FA22EAD4CE81F39CC58EEA /* Periodizer.cpp in Sources */, + 5CE4E12FF3BBF9B3E2A42B3D /* SoftwareVersionChecker.cpp in Sources */, 856AA354D08AB4B323081444 /* ofxBaseGui.cpp in Sources */, + 8EF01AF12E4532BC00BF0971 /* EmotiBitTestingHelper.cpp in Sources */, 5CBB2AB3A60F65431D7B555D /* ofxButton.cpp in Sources */, - 8E07BBCD2BB3B2BF00CDD443 /* PatchboardJson.cpp in Sources */, 853E0BA2F448076739446874 /* ofxColorPicker.cpp in Sources */, B266578FC55D23BFEBC042E7 /* ofxGuiGroup.cpp in Sources */, + 8EF01AEE2E4530F600BF0971 /* PatchboardBase.cpp in Sources */, 852E0891794923EE7583C621 /* ofxInputField.cpp in Sources */, - 8E016F7E2832CE28005D7C65 /* DigitalFilter.cpp in Sources */, 483908258D00B98B4BE69F07 /* ofxLabel.cpp in Sources */, - 8E016F842832CE82005D7C65 /* Periodizer.cpp in Sources */, F285EB3169F1566CA3D93C20 /* ofxPanel.cpp in Sources */, 837220E80EB56CD44AD27F2A /* ofxSlider.cpp in Sources */, B56FE57CC35806596D38118C /* ofxSliderGroup.cpp in Sources */, + 8EF01AE02E45302800BF0971 /* EmotiBitWiFiHost.cpp in Sources */, 1CD33E884D9E3358252E82A1 /* ofxToggle.cpp in Sources */, + 8EF01AED2E4530F600BF0971 /* PatchboardXml.cpp in Sources */, + FB84AAF8D1B7A95266DB5C09 /* jsoncpp.cpp in Sources */, + BEDFEE7400C58EA4E412B757 /* ofxJSONElement.cpp in Sources */, + 933A2227713C720CEFF80FD9 /* tinyxml.cpp in Sources */, + 9D44DC88EF9E7991B4A09951 /* tinyxmlerror.cpp in Sources */, + 5A4349E9754D6FA14C0F2A3A /* tinyxmlparser.cpp in Sources */, + 63B57AC5BF4EF088491E0317 /* ofxXmlSettings.cpp in Sources */, + 8EF01AD62E452E8C00BF0971 /* EmotiBitPacket.cpp in Sources */, + 8EF01AEC2E4530F600BF0971 /* PatchboardJson.cpp in Sources */, + 732E09778AF48F7EDA9AED95 /* ofxLSLReceiver.cpp in Sources */, + E10648CBE85F518AF520E83C /* ofxLSLResolver.cpp in Sources */, 661A1991F5CE4CCC2919D8E7 /* ofxNetworkUtils.cpp in Sources */, - 948E6B5228528CA5000A8B76 /* ofxLSLReceiver.cpp in Sources */, - 8E07BBD52BB3B46400CDD443 /* EmotiBitOfUtils.cpp in Sources */, - 8E016F7F2832CE28005D7C65 /* EmotiBitPacket.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 */, - 8E07BBCF2BB3B2BF00CDD443 /* PatchboardBase.cpp in Sources */, ADE367465D2A8EBAD4C7A8D9 /* IpEndpointName.cpp in Sources */, 67FE4C7B15C2F0478C8126C2 /* NetworkingUtils.cpp in Sources */, - 8E016F642832CAFE005D7C65 /* ofxJSONElement.cpp in Sources */, 510CAFE035E576A4E1502D52 /* UdpSocket.cpp in Sources */, 62545D179C94265CA1389D4A /* OscOutboundPacketStream.cpp in Sources */, C4782ECC372420ACE0615B74 /* OscPrintReceivedElements.cpp in Sources */, 0546D1A38E13BD319CC9755B /* OscReceivedElements.cpp in Sources */, - 8E07BBCE2BB3B2BF00CDD443 /* PatchboardXml.cpp in Sources */, 879A251454401BC0B6E4F238 /* OscTypes.cpp in Sources */, 72A929D3561B8232A182ABFC /* ofxOscBundle.cpp in Sources */, 5864AD82E20F15536D054EA3 /* ofxOscMessage.cpp in Sources */, 4ADB88E2FB52E76A471065DE /* ofxOscParameterSync.cpp in Sources */, 640279EE111671BD026CB013 /* ofxOscReceiver.cpp in Sources */, 8F5205AEF8861EF234F0651A /* ofxOscSender.cpp in Sources */, + A62D60DE496AFBDB73BD1D13 /* src in Sources */, + 8EF01AE12E45302800BF0971 /* EmotiBitLsl.cpp in Sources */, 0059E2448E2CB4FECB0BEF66 /* ofxOscilloscope.cpp in Sources */, + 1C36947250DCB09A8A375C0C /* ofxXmlPoco.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 */, - 63B57AC5BF4EF088491E0317 /* ofxXmlSettings.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin XCBuildConfiguration section */ - 99FA3DBB1C7456C400CFA0EE /* AppStore */ = { + 8EF01B9C2E4544B600BF0971 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = E4EB6923138AFD0F00A09F29 /* Project.xcconfig */; buildSettings = { - CONFIGURATION_BUILD_DIR = "$(SRCROOT)/bin/"; - COPY_PHASE_STRIP = YES; - DEAD_CODE_STRIPPING = YES; - GCC_AUTO_VECTORIZATION = YES; - GCC_ENABLE_SSE3_EXTENSIONS = YES; - GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS = YES; - GCC_INLINES_ARE_PRIVATE_EXTERN = NO; - GCC_OPTIMIZATION_LEVEL = 3; - "GCC_PREPROCESSOR_DEFINITIONS[arch=*]" = "DISTRIBUTION=1"; - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_UNROLL_LOOPS = YES; - GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES; - GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO; - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_UNINITIALIZED_AUTOS = NO; - GCC_WARN_UNUSED_VALUE = NO; - GCC_WARN_UNUSED_VARIABLE = NO; + COMBINE_HIDPI_IMAGES = YES; + COPY_PHASE_STRIP = NO; + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; + GCC_DYNAMIC_NO_PIC = NO; + GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + GCC_MODEL_TUNING = NONE; + GCC_PREPROCESSOR_DEFINITIONS = TARGET_MAC_OS; HEADER_SEARCH_PATHS = ( "$(OF_CORE_HEADERS)", src, - src, ../../../addons/ofxBiquadFilter/src, ../../../addons/ofxEmotiBit/src, + ../../../addons/ofxEmotiBit/src/Signal, ../../../addons/ofxGui/src, - ../../../addons/ofxLSL/libs, - ../../../addons/ofxLSL/libs/labstreaminglayer, + ../../../addons/ofxJSON/libs, + ../../../addons/ofxJSON/libs/jsoncpp, + ../../../addons/ofxJSON/libs/jsoncpp/include, + ../../../addons/ofxJSON/libs/jsoncpp/include/json, + ../../../addons/ofxJSON/libs/jsoncpp/src, + ../../../addons/ofxJSON/src, + ../../../addons/ofxXmlSettings/libs, + ../../../addons/ofxXmlSettings/src, ../../../addons/ofxLSL/libs/labstreaminglayer/include, - ../../../addons/ofxLSL/libs/labstreaminglayer/lib, - ../../../addons/ofxLSL/libs/labstreaminglayer/lib/osx, - ../../../addons/ofxLSL/libs/labstreaminglayer/lib/win64, ../../../addons/ofxLSL/src, ../../../addons/ofxNetwork/src, - ../../../addons/ofxPoco/libs/poco/include, - ../../../addons/ofxPoco/src, - ../../../addons/ofxPoco/libs/openssl/include, - ../../../addons/ofxNetworkUtils/libs, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include/ofx, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include/ofx/Net, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/src, - ../../../addons/ofxNetworkUtils/src, ../../../addons/ofxOsc/libs, ../../../addons/ofxOsc/libs/oscpack, ../../../addons/ofxOsc/libs/oscpack/src, @@ -1983,21 +1886,44 @@ ../../../addons/ofxOsc/libs/oscpack/src/osc, ../../../addons/ofxOsc/src, ../../../addons/ofxOscilloscope/src, + ../../../addons/ofxOscilloscope/ofxPatchboard/Patchboard/src, + ../../../addons/ofxPoco/libs/poco/include, + ../../../addons/ofxPoco/src, + ../../../addons/ofxPoco/libs/openssl/include, ../../../addons/ofxThreadedLogger/src, - ../../../addons/ofxXmlSettings/libs, - ../../../addons/ofxXmlSettings/src, + ../../../addons/EmotiBit_XPlat_Utils/src, ); - MACOSX_DEPLOYMENT_TARGET = 10.9; - OTHER_CODE_SIGN_FLAGS = "--deep"; - OTHER_CPLUSPLUSFLAGS = ( - "-D__MACOSX_CORE__", - "-mtune=native", + ICON = EmotiBit.icns; + ICON_FILE = "$(ICON_FILE_PATH)$(ICON)"; + ICON_FILE_PATH = ../EmotiBitIcons/macOS/; + INFOPLIST_FILE = "EmotiBitOscilloscope-x86_64 copy2-Info.plist"; + INSTALL_PATH = /Applications; + LD_RUNPATH_SEARCH_PATHS = "$(LD_RUNPATH_SEARCH_PATHS_$(IS_MACCATALYST)) @executable_path/../Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + ../../../addons/ofxLSL/libs/labstreaminglayer/lib/osx/arm, ); - SDKROOT = macosx; + MACOSX_DEPLOYMENT_TARGET = 10.14; + OTHER_LDFLAGS = ( + "$(OF_CORE_LIBS)", + "$(OF_CORE_FRAMEWORKS)", + "$(LIB_OF_DEBUG)", + ../../../addons/ofxPoco/libs/poco/lib/osx/PocoNetSSL.a, + ../../../addons/ofxPoco/libs/poco/lib/osx/PocoNet.a, + ../../../addons/ofxPoco/libs/poco/lib/osx/PocoCrypto.a, + ../../../addons/ofxPoco/libs/poco/lib/osx/PocoUtil.a, + ../../../addons/ofxPoco/libs/poco/lib/osx/PocoJSON.a, + ../../../addons/ofxPoco/libs/poco/lib/osx/PocoXML.a, + ../../../addons/ofxPoco/libs/poco/lib/osx/PocoFoundation.a, + ../../../addons/ofxPoco/libs/openssl/lib/osx/crypto.a, + ../../../addons/ofxPoco/libs/openssl/lib/osx/ssl.a, + ); + PRODUCT_NAME = "$(TARGET_NAME)"; + WRAPPER_EXTENSION = app; }; - name = AppStore; + name = Debug; }; - 99FA3DBC1C7456C400CFA0EE /* AppStore */ = { + 8EF01B9D2E4544B600BF0971 /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = E4EB6923138AFD0F00A09F29 /* Project.xcconfig */; buildSettings = { @@ -2006,33 +1932,25 @@ FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_MODEL_TUNING = NONE; - "GCC_PREPROCESSOR_DEFINITIONS[arch=*]" = "APPSTORE=1"; + GCC_PREPROCESSOR_DEFINITIONS = TARGET_MAC_OS; HEADER_SEARCH_PATHS = ( "$(OF_CORE_HEADERS)", src, - src, ../../../addons/ofxBiquadFilter/src, - ../../../addons/ofxEmotiBit/src/Signal, ../../../addons/ofxEmotiBit/src, + ../../../addons/ofxEmotiBit/src/Signal, ../../../addons/ofxGui/src, - ../../../addons/ofxLSL/libs, - ../../../addons/ofxLSL/libs/labstreaminglayer, + ../../../addons/ofxJSON/libs, + ../../../addons/ofxJSON/libs/jsoncpp, + ../../../addons/ofxJSON/libs/jsoncpp/include, + ../../../addons/ofxJSON/libs/jsoncpp/include/json, + ../../../addons/ofxJSON/libs/jsoncpp/src, + ../../../addons/ofxJSON/src, + ../../../addons/ofxXmlSettings/libs, + ../../../addons/ofxXmlSettings/src, ../../../addons/ofxLSL/libs/labstreaminglayer/include, - ../../../addons/ofxLSL/libs/labstreaminglayer/lib, - ../../../addons/ofxLSL/libs/labstreaminglayer/lib/osx, - ../../../addons/ofxLSL/libs/labstreaminglayer/lib/win64, ../../../addons/ofxLSL/src, ../../../addons/ofxNetwork/src, - ../../../addons/ofxPoco/libs/poco/include, - ../../../addons/ofxPoco/src, - ../../../addons/ofxPoco/libs/openssl/include, - ../../../addons/ofxNetworkUtils/libs, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include/ofx, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include/ofx/Net, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/src, - ../../../addons/ofxNetworkUtils/src, ../../../addons/ofxOsc/libs, ../../../addons/ofxOsc/libs/oscpack, ../../../addons/ofxOsc/libs/oscpack/src, @@ -2042,22 +1960,25 @@ ../../../addons/ofxOsc/libs/oscpack/src/osc, ../../../addons/ofxOsc/src, ../../../addons/ofxOscilloscope/src, + ../../../addons/ofxOscilloscope/ofxPatchboard/Patchboard/src, + ../../../addons/ofxPoco/libs/poco/include, + ../../../addons/ofxPoco/src, + ../../../addons/ofxPoco/libs/openssl/include, ../../../addons/ofxThreadedLogger/src, - ../../../addons/ofxXmlSettings/libs, - ../../../addons/ofxXmlSettings/src, - ../../../addons/ofxJSON/libs/jsoncpp/include, - ../../../addons/ofxJSON/src, ../../../addons/EmotiBit_XPlat_Utils/src, ); - ICON = "$(ICON_NAME_RELEASE)"; + ICON = EmotiBit.icns; ICON_FILE = "$(ICON_FILE_PATH)$(ICON)"; - INFOPLIST_FILE = "openFrameworks-Info.plist"; + ICON_FILE_PATH = ../EmotiBitIcons/macOS/; + INFOPLIST_FILE = "EmotiBitOscilloscope-x86_64 copy2-Info.plist"; INSTALL_PATH = /Applications; - LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(LD_RUNPATH_SEARCH_PATHS_$(IS_MACCATALYST)) @executable_path/../Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - ../../../addons/ofxLSL/libs/labstreaminglayer/lib/osx/x86_64, + ../../../addons/ofxLSL/libs/labstreaminglayer/lib/osx/arm, ); + MACOSX_DEPLOYMENT_TARGET = 10.14; + ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(OF_CORE_LIBS)", "$(OF_CORE_FRAMEWORKS)", @@ -2076,45 +1997,36 @@ WRAPPER_EXTENSION = app; baseConfigurationReference = E4EB6923138AFD0F00A09F29; }; - name = AppStore; + name = Release; }; - B990E6042C0E7A370094B63E /* Debug */ = { + 8EF01B9E2E4544B600BF0971 /* AppStore */ = { isa = XCBuildConfiguration; baseConfigurationReference = E4EB6923138AFD0F00A09F29 /* Project.xcconfig */; buildSettings = { COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = NO; + COPY_PHASE_STRIP = YES; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; - GCC_DYNAMIC_NO_PIC = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_MODEL_TUNING = NONE; - GCC_PREPROCESSOR_DEFINITIONS = TARGET_MAC_OS; + "GCC_PREPROCESSOR_DEFINITIONS[arch=*]" = "APPSTORE=1"; HEADER_SEARCH_PATHS = ( "$(OF_CORE_HEADERS)", src, - src, ../../../addons/ofxBiquadFilter/src, - ../../../addons/ofxEmotiBit/src/Signal, ../../../addons/ofxEmotiBit/src, + ../../../addons/ofxEmotiBit/src/Signal, ../../../addons/ofxGui/src, - ../../../addons/ofxLSL/libs, - ../../../addons/ofxLSL/libs/labstreaminglayer, + ../../../addons/ofxJSON/libs, + ../../../addons/ofxJSON/libs/jsoncpp, + ../../../addons/ofxJSON/libs/jsoncpp/include, + ../../../addons/ofxJSON/libs/jsoncpp/include/json, + ../../../addons/ofxJSON/libs/jsoncpp/src, + ../../../addons/ofxJSON/src, + ../../../addons/ofxXmlSettings/libs, + ../../../addons/ofxXmlSettings/src, ../../../addons/ofxLSL/libs/labstreaminglayer/include, - ../../../addons/ofxLSL/libs/labstreaminglayer/lib, - ../../../addons/ofxLSL/libs/labstreaminglayer/lib/osx, - ../../../addons/ofxLSL/libs/labstreaminglayer/lib/win64, ../../../addons/ofxLSL/src, ../../../addons/ofxNetwork/src, - ../../../addons/ofxPoco/libs/poco/include, - ../../../addons/ofxPoco/src, - ../../../addons/ofxPoco/libs/openssl/include, - ../../../addons/ofxNetworkUtils/libs, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include/ofx, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include/ofx/Net, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/src, - ../../../addons/ofxNetworkUtils/src, ../../../addons/ofxOsc/libs, ../../../addons/ofxOsc/libs/oscpack, ../../../addons/ofxOsc/libs/oscpack/src, @@ -2124,27 +2036,29 @@ ../../../addons/ofxOsc/libs/oscpack/src/osc, ../../../addons/ofxOsc/src, ../../../addons/ofxOscilloscope/src, + ../../../addons/ofxOscilloscope/ofxPatchboard/Patchboard/src, + ../../../addons/ofxPoco/libs/poco/include, + ../../../addons/ofxPoco/src, + ../../../addons/ofxPoco/libs/openssl/include, ../../../addons/ofxThreadedLogger/src, - ../../../addons/ofxXmlSettings/libs, - ../../../addons/ofxXmlSettings/src, - ../../../addons/ofxJSON/libs/jsoncpp/include, - ../../../addons/ofxJSON/src, ../../../addons/EmotiBit_XPlat_Utils/src, ); - ICON = "$(ICON_NAME_DEBUG)"; + ICON = EmotiBit.icns; ICON_FILE = "$(ICON_FILE_PATH)$(ICON)"; - INFOPLIST_FILE = "openFrameworks-Info.plist"; + ICON_FILE_PATH = ../EmotiBitIcons/macOS/; + INFOPLIST_FILE = "EmotiBitOscilloscope-x86_64 copy2-Info.plist"; INSTALL_PATH = /Applications; - LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(LD_RUNPATH_SEARCH_PATHS_$(IS_MACCATALYST)) @executable_path/../Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", ../../../addons/ofxLSL/libs/labstreaminglayer/lib/osx/arm, ); - OTHER_CPLUSPLUSFLAGS = "-D__MACOSX_CORE__"; + MACOSX_DEPLOYMENT_TARGET = 10.14; + ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(OF_CORE_LIBS)", "$(OF_CORE_FRAMEWORKS)", - "$(LIB_OF_DEBUG)", + "$(LIB_OF)", ../../../addons/ofxPoco/libs/poco/lib/osx/PocoNetSSL.a, ../../../addons/ofxPoco/libs/poco/lib/osx/PocoNet.a, ../../../addons/ofxPoco/libs/poco/lib/osx/PocoCrypto.a, @@ -2155,47 +2069,51 @@ ../../../addons/ofxPoco/libs/openssl/lib/osx/crypto.a, ../../../addons/ofxPoco/libs/openssl/lib/osx/ssl.a, ); - PRODUCT_NAME = EmotiBitOscilloscope; + PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = app; + baseConfigurationReference = E4EB6923138AFD0F00A09F29; }; - name = Debug; + name = AppStore; }; - B990E6052C0E7A370094B63E /* Release */ = { + 99FA3DBB1C7456C400CFA0EE /* AppStore */ = { isa = XCBuildConfiguration; baseConfigurationReference = E4EB6923138AFD0F00A09F29 /* Project.xcconfig */; buildSettings = { - COMBINE_HIDPI_IMAGES = YES; + CONFIGURATION_BUILD_DIR = "$(SRCROOT)/bin/"; COPY_PHASE_STRIP = YES; - FRAMEWORK_SEARCH_PATHS = "$(inherited)"; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_MODEL_TUNING = NONE; - GCC_PREPROCESSOR_DEFINITIONS = TARGET_MAC_OS; + DEAD_CODE_STRIPPING = YES; + GCC_AUTO_VECTORIZATION = YES; + GCC_ENABLE_SSE3_EXTENSIONS = YES; + GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS = YES; + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; + GCC_OPTIMIZATION_LEVEL = 3; + "GCC_PREPROCESSOR_DEFINITIONS[arch=*]" = "DISTRIBUTION=1"; + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_UNROLL_LOOPS = YES; + GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES; + GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO; + GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; + GCC_WARN_UNINITIALIZED_AUTOS = NO; + GCC_WARN_UNUSED_VALUE = NO; + GCC_WARN_UNUSED_VARIABLE = NO; HEADER_SEARCH_PATHS = ( "$(OF_CORE_HEADERS)", src, - src, ../../../addons/ofxBiquadFilter/src, - ../../../addons/ofxEmotiBit/src/Signal, ../../../addons/ofxEmotiBit/src, + ../../../addons/ofxEmotiBit/src/Signal, ../../../addons/ofxGui/src, - ../../../addons/ofxLSL/libs, - ../../../addons/ofxLSL/libs/labstreaminglayer, + ../../../addons/ofxJSON/libs, + ../../../addons/ofxJSON/libs/jsoncpp, + ../../../addons/ofxJSON/libs/jsoncpp/include, + ../../../addons/ofxJSON/libs/jsoncpp/include/json, + ../../../addons/ofxJSON/libs/jsoncpp/src, + ../../../addons/ofxJSON/src, + ../../../addons/ofxXmlSettings/libs, + ../../../addons/ofxXmlSettings/src, ../../../addons/ofxLSL/libs/labstreaminglayer/include, - ../../../addons/ofxLSL/libs/labstreaminglayer/lib, - ../../../addons/ofxLSL/libs/labstreaminglayer/lib/osx, - ../../../addons/ofxLSL/libs/labstreaminglayer/lib/win64, ../../../addons/ofxLSL/src, ../../../addons/ofxNetwork/src, - ../../../addons/ofxPoco/libs/poco/include, - ../../../addons/ofxPoco/src, - ../../../addons/ofxPoco/libs/openssl/include, - ../../../addons/ofxNetworkUtils/libs, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include/ofx, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include/ofx/Net, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/src, - ../../../addons/ofxNetworkUtils/src, ../../../addons/ofxOsc/libs, ../../../addons/ofxOsc/libs/oscpack, ../../../addons/ofxOsc/libs/oscpack/src, @@ -2205,45 +2123,23 @@ ../../../addons/ofxOsc/libs/oscpack/src/osc, ../../../addons/ofxOsc/src, ../../../addons/ofxOscilloscope/src, + ../../../addons/ofxOscilloscope/ofxPatchboard/Patchboard/src, + ../../../addons/ofxPoco/libs/poco/include, + ../../../addons/ofxPoco/src, + ../../../addons/ofxPoco/libs/openssl/include, ../../../addons/ofxThreadedLogger/src, - ../../../addons/ofxXmlSettings/libs, - ../../../addons/ofxXmlSettings/src, - ../../../addons/ofxJSON/libs/jsoncpp/include, - ../../../addons/ofxJSON/src, - ../../../addons/EmotiBit_XPlat_Utils/src, ); - ICON = "$(ICON_NAME_RELEASE)"; - ICON_FILE = "$(ICON_FILE_PATH)$(ICON)"; - INFOPLIST_FILE = "openFrameworks-Info.plist"; - INSTALL_PATH = /Applications; - LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - ../../../addons/ofxLSL/libs/labstreaminglayer/lib/osx/arm, - ); - ONLY_ACTIVE_ARCH = YES; - OTHER_CPLUSPLUSFLAGS = "-D__MACOSX_CORE__"; - OTHER_LDFLAGS = ( - "$(OF_CORE_LIBS)", - "$(OF_CORE_FRAMEWORKS)", - "$(LIB_OF)", - ../../../addons/ofxPoco/libs/poco/lib/osx/PocoNetSSL.a, - ../../../addons/ofxPoco/libs/poco/lib/osx/PocoNet.a, - ../../../addons/ofxPoco/libs/poco/lib/osx/PocoCrypto.a, - ../../../addons/ofxPoco/libs/poco/lib/osx/PocoUtil.a, - ../../../addons/ofxPoco/libs/poco/lib/osx/PocoJSON.a, - ../../../addons/ofxPoco/libs/poco/lib/osx/PocoXML.a, - ../../../addons/ofxPoco/libs/poco/lib/osx/PocoFoundation.a, - ../../../addons/ofxPoco/libs/openssl/lib/osx/crypto.a, - ../../../addons/ofxPoco/libs/openssl/lib/osx/ssl.a, + MACOSX_DEPLOYMENT_TARGET = 10.9; + OTHER_CODE_SIGN_FLAGS = "--deep"; + OTHER_CPLUSPLUSFLAGS = ( + "-D__MACOSX_CORE__", + "-D_x64", ); - PRODUCT_NAME = EmotiBitOscilloscope; - WRAPPER_EXTENSION = app; - baseConfigurationReference = E4EB6923138AFD0F00A09F29; + SDKROOT = macosx; }; - name = Release; + name = AppStore; }; - B990E6062C0E7A370094B63E /* AppStore */ = { + 99FA3DBC1C7456C400CFA0EE /* AppStore */ = { isa = XCBuildConfiguration; baseConfigurationReference = E4EB6923138AFD0F00A09F29 /* Project.xcconfig */; buildSettings = { @@ -2256,29 +2152,21 @@ HEADER_SEARCH_PATHS = ( "$(OF_CORE_HEADERS)", src, - src, ../../../addons/ofxBiquadFilter/src, - ../../../addons/ofxEmotiBit/src/Signal, ../../../addons/ofxEmotiBit/src, + ../../../addons/ofxEmotiBit/src/Signal, ../../../addons/ofxGui/src, - ../../../addons/ofxLSL/libs, - ../../../addons/ofxLSL/libs/labstreaminglayer, + ../../../addons/ofxJSON/libs, + ../../../addons/ofxJSON/libs/jsoncpp, + ../../../addons/ofxJSON/libs/jsoncpp/include, + ../../../addons/ofxJSON/libs/jsoncpp/include/json, + ../../../addons/ofxJSON/libs/jsoncpp/src, + ../../../addons/ofxJSON/src, + ../../../addons/ofxXmlSettings/libs, + ../../../addons/ofxXmlSettings/src, ../../../addons/ofxLSL/libs/labstreaminglayer/include, - ../../../addons/ofxLSL/libs/labstreaminglayer/lib, - ../../../addons/ofxLSL/libs/labstreaminglayer/lib/osx, - ../../../addons/ofxLSL/libs/labstreaminglayer/lib/win64, ../../../addons/ofxLSL/src, ../../../addons/ofxNetwork/src, - ../../../addons/ofxPoco/libs/poco/include, - ../../../addons/ofxPoco/src, - ../../../addons/ofxPoco/libs/openssl/include, - ../../../addons/ofxNetworkUtils/libs, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include/ofx, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include/ofx/Net, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/src, - ../../../addons/ofxNetworkUtils/src, ../../../addons/ofxOsc/libs, ../../../addons/ofxOsc/libs/oscpack, ../../../addons/ofxOsc/libs/oscpack/src, @@ -2288,22 +2176,26 @@ ../../../addons/ofxOsc/libs/oscpack/src/osc, ../../../addons/ofxOsc/src, ../../../addons/ofxOscilloscope/src, + ../../../addons/ofxOscilloscope/ofxPatchboard/Patchboard/src, + ../../../addons/ofxPoco/libs/poco/include, + ../../../addons/ofxPoco/src, + ../../../addons/ofxPoco/libs/openssl/include, ../../../addons/ofxThreadedLogger/src, - ../../../addons/ofxXmlSettings/libs, - ../../../addons/ofxXmlSettings/src, - ../../../addons/ofxJSON/libs/jsoncpp/include, - ../../../addons/ofxJSON/src, ../../../addons/EmotiBit_XPlat_Utils/src, ); - ICON = "$(ICON_NAME_RELEASE)"; + ICON = EmotiBit.icns; ICON_FILE = "$(ICON_FILE_PATH)$(ICON)"; + ICON_FILE_PATH = ../EmotiBitIcons/macOS/; + ICON_NAME_DEBUG = EmotiBit.icns; + ICON_NAME_RELEASE = EmotiBit.icns; INFOPLIST_FILE = "openFrameworks-Info.plist"; INSTALL_PATH = /Applications; - LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(LD_RUNPATH_SEARCH_PATHS_$(IS_MACCATALYST)) @executable_path/../Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - ../../../addons/ofxLSL/libs/labstreaminglayer/lib/osx/arm, + ../../../addons/ofxLSL/libs/labstreaminglayer/lib/osx/x86_64, ); + MACOSX_DEPLOYMENT_TARGET = 10.14; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(OF_CORE_LIBS)", @@ -2319,7 +2211,7 @@ ../../../addons/ofxPoco/libs/openssl/lib/osx/crypto.a, ../../../addons/ofxPoco/libs/openssl/lib/osx/ssl.a, ); - PRODUCT_NAME = EmotiBitOscilloscope; + PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = app; baseConfigurationReference = E4EB6923138AFD0F00A09F29; }; @@ -2347,28 +2239,21 @@ HEADER_SEARCH_PATHS = ( "$(OF_CORE_HEADERS)", src, - src, ../../../addons/ofxBiquadFilter/src, ../../../addons/ofxEmotiBit/src, + ../../../addons/ofxEmotiBit/src/Signal, ../../../addons/ofxGui/src, - ../../../addons/ofxLSL/libs, - ../../../addons/ofxLSL/libs/labstreaminglayer, + ../../../addons/ofxJSON/libs, + ../../../addons/ofxJSON/libs/jsoncpp, + ../../../addons/ofxJSON/libs/jsoncpp/include, + ../../../addons/ofxJSON/libs/jsoncpp/include/json, + ../../../addons/ofxJSON/libs/jsoncpp/src, + ../../../addons/ofxJSON/src, + ../../../addons/ofxXmlSettings/libs, + ../../../addons/ofxXmlSettings/src, ../../../addons/ofxLSL/libs/labstreaminglayer/include, - ../../../addons/ofxLSL/libs/labstreaminglayer/lib, - ../../../addons/ofxLSL/libs/labstreaminglayer/lib/osx, - ../../../addons/ofxLSL/libs/labstreaminglayer/lib/win64, ../../../addons/ofxLSL/src, ../../../addons/ofxNetwork/src, - ../../../addons/ofxPoco/libs/poco/include, - ../../../addons/ofxPoco/src, - ../../../addons/ofxPoco/libs/openssl/include, - ../../../addons/ofxNetworkUtils/libs, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include/ofx, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include/ofx/Net, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/src, - ../../../addons/ofxNetworkUtils/src, ../../../addons/ofxOsc/libs, ../../../addons/ofxOsc/libs/oscpack, ../../../addons/ofxOsc/libs/oscpack/src, @@ -2378,16 +2263,18 @@ ../../../addons/ofxOsc/libs/oscpack/src/osc, ../../../addons/ofxOsc/src, ../../../addons/ofxOscilloscope/src, + ../../../addons/ofxOscilloscope/ofxPatchboard/Patchboard/src, + ../../../addons/ofxPoco/libs/poco/include, + ../../../addons/ofxPoco/src, + ../../../addons/ofxPoco/libs/openssl/include, ../../../addons/ofxThreadedLogger/src, - ../../../addons/ofxXmlSettings/libs, - ../../../addons/ofxXmlSettings/src, ); MACOSX_DEPLOYMENT_TARGET = 10.9; ONLY_ACTIVE_ARCH = YES; OTHER_CODE_SIGN_FLAGS = "--deep"; OTHER_CPLUSPLUSFLAGS = ( "-D__MACOSX_CORE__", - "-mtune=native", + "-D_x64", ); SDKROOT = macosx; }; @@ -2416,28 +2303,21 @@ HEADER_SEARCH_PATHS = ( "$(OF_CORE_HEADERS)", src, - src, ../../../addons/ofxBiquadFilter/src, ../../../addons/ofxEmotiBit/src, + ../../../addons/ofxEmotiBit/src/Signal, ../../../addons/ofxGui/src, - ../../../addons/ofxLSL/libs, - ../../../addons/ofxLSL/libs/labstreaminglayer, + ../../../addons/ofxJSON/libs, + ../../../addons/ofxJSON/libs/jsoncpp, + ../../../addons/ofxJSON/libs/jsoncpp/include, + ../../../addons/ofxJSON/libs/jsoncpp/include/json, + ../../../addons/ofxJSON/libs/jsoncpp/src, + ../../../addons/ofxJSON/src, + ../../../addons/ofxXmlSettings/libs, + ../../../addons/ofxXmlSettings/src, ../../../addons/ofxLSL/libs/labstreaminglayer/include, - ../../../addons/ofxLSL/libs/labstreaminglayer/lib, - ../../../addons/ofxLSL/libs/labstreaminglayer/lib/osx, - ../../../addons/ofxLSL/libs/labstreaminglayer/lib/win64, ../../../addons/ofxLSL/src, ../../../addons/ofxNetwork/src, - ../../../addons/ofxPoco/libs/poco/include, - ../../../addons/ofxPoco/src, - ../../../addons/ofxPoco/libs/openssl/include, - ../../../addons/ofxNetworkUtils/libs, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include/ofx, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include/ofx/Net, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/src, - ../../../addons/ofxNetworkUtils/src, ../../../addons/ofxOsc/libs, ../../../addons/ofxOsc/libs/oscpack, ../../../addons/ofxOsc/libs/oscpack/src, @@ -2447,15 +2327,18 @@ ../../../addons/ofxOsc/libs/oscpack/src/osc, ../../../addons/ofxOsc/src, ../../../addons/ofxOscilloscope/src, + ../../../addons/ofxOscilloscope/ofxPatchboard/Patchboard/src, + ../../../addons/ofxPoco/libs/poco/include, + ../../../addons/ofxPoco/src, + ../../../addons/ofxPoco/libs/openssl/include, ../../../addons/ofxThreadedLogger/src, - ../../../addons/ofxXmlSettings/libs, - ../../../addons/ofxXmlSettings/src, ); MACOSX_DEPLOYMENT_TARGET = 10.9; + ONLY_ACTIVE_ARCH = NO; OTHER_CODE_SIGN_FLAGS = "--deep"; OTHER_CPLUSPLUSFLAGS = ( "-D__MACOSX_CORE__", - "-mtune=native", + "-D_x64", ); SDKROOT = macosx; }; @@ -2475,29 +2358,21 @@ HEADER_SEARCH_PATHS = ( "$(OF_CORE_HEADERS)", src, - src, ../../../addons/ofxBiquadFilter/src, - ../../../addons/ofxEmotiBit/src/Signal, ../../../addons/ofxEmotiBit/src, + ../../../addons/ofxEmotiBit/src/Signal, ../../../addons/ofxGui/src, - ../../../addons/ofxLSL/libs, - ../../../addons/ofxLSL/libs/labstreaminglayer, + ../../../addons/ofxJSON/libs, + ../../../addons/ofxJSON/libs/jsoncpp, + ../../../addons/ofxJSON/libs/jsoncpp/include, + ../../../addons/ofxJSON/libs/jsoncpp/include/json, + ../../../addons/ofxJSON/libs/jsoncpp/src, + ../../../addons/ofxJSON/src, + ../../../addons/ofxXmlSettings/libs, + ../../../addons/ofxXmlSettings/src, ../../../addons/ofxLSL/libs/labstreaminglayer/include, - ../../../addons/ofxLSL/libs/labstreaminglayer/lib, - ../../../addons/ofxLSL/libs/labstreaminglayer/lib/osx, - ../../../addons/ofxLSL/libs/labstreaminglayer/lib/win64, ../../../addons/ofxLSL/src, ../../../addons/ofxNetwork/src, - ../../../addons/ofxPoco/libs/poco/include, - ../../../addons/ofxPoco/src, - ../../../addons/ofxPoco/libs/openssl/include, - ../../../addons/ofxNetworkUtils/libs, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include/ofx, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include/ofx/Net, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/src, - ../../../addons/ofxNetworkUtils/src, ../../../addons/ofxOsc/libs, ../../../addons/ofxOsc/libs/oscpack, ../../../addons/ofxOsc/libs/oscpack/src, @@ -2507,23 +2382,26 @@ ../../../addons/ofxOsc/libs/oscpack/src/osc, ../../../addons/ofxOsc/src, ../../../addons/ofxOscilloscope/src, + ../../../addons/ofxOscilloscope/ofxPatchboard/Patchboard/src, + ../../../addons/ofxPoco/libs/poco/include, + ../../../addons/ofxPoco/src, + ../../../addons/ofxPoco/libs/openssl/include, ../../../addons/ofxThreadedLogger/src, - ../../../addons/ofxXmlSettings/libs, - ../../../addons/ofxXmlSettings/src, - ../../../addons/ofxJSON/libs/jsoncpp/include, - ../../../addons/ofxJSON/src, ../../../addons/EmotiBit_XPlat_Utils/src, ); - ICON = "$(ICON_NAME_DEBUG)"; + ICON = EmotiBit.icns; ICON_FILE = "$(ICON_FILE_PATH)$(ICON)"; + ICON_FILE_PATH = ../EmotiBitIcons/macOS/; + ICON_NAME_DEBUG = EmotiBit.icns; + ICON_NAME_RELEASE = EmotiBit.icns; INFOPLIST_FILE = "openFrameworks-Info.plist"; INSTALL_PATH = /Applications; - LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(LD_RUNPATH_SEARCH_PATHS_$(IS_MACCATALYST)) @executable_path/../Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", ../../../addons/ofxLSL/libs/labstreaminglayer/lib/osx/x86_64, ); - OTHER_CPLUSPLUSFLAGS = "-D__MACOSX_CORE__"; + MACOSX_DEPLOYMENT_TARGET = 10.14; OTHER_LDFLAGS = ( "$(OF_CORE_LIBS)", "$(OF_CORE_FRAMEWORKS)", @@ -2538,7 +2416,7 @@ ../../../addons/ofxPoco/libs/openssl/lib/osx/crypto.a, ../../../addons/ofxPoco/libs/openssl/lib/osx/ssl.a, ); - PRODUCT_NAME = "EmotiBitOscilloscope-Debug"; + PRODUCT_NAME = "${PROJECT_NAME}Debug"; WRAPPER_EXTENSION = app; }; name = Debug; @@ -2556,29 +2434,21 @@ HEADER_SEARCH_PATHS = ( "$(OF_CORE_HEADERS)", src, - src, ../../../addons/ofxBiquadFilter/src, - ../../../addons/ofxEmotiBit/src/Signal, ../../../addons/ofxEmotiBit/src, + ../../../addons/ofxEmotiBit/src/Signal, ../../../addons/ofxGui/src, - ../../../addons/ofxLSL/libs, - ../../../addons/ofxLSL/libs/labstreaminglayer, + ../../../addons/ofxJSON/libs, + ../../../addons/ofxJSON/libs/jsoncpp, + ../../../addons/ofxJSON/libs/jsoncpp/include, + ../../../addons/ofxJSON/libs/jsoncpp/include/json, + ../../../addons/ofxJSON/libs/jsoncpp/src, + ../../../addons/ofxJSON/src, + ../../../addons/ofxXmlSettings/libs, + ../../../addons/ofxXmlSettings/src, ../../../addons/ofxLSL/libs/labstreaminglayer/include, - ../../../addons/ofxLSL/libs/labstreaminglayer/lib, - ../../../addons/ofxLSL/libs/labstreaminglayer/lib/osx, - ../../../addons/ofxLSL/libs/labstreaminglayer/lib/win64, ../../../addons/ofxLSL/src, ../../../addons/ofxNetwork/src, - ../../../addons/ofxPoco/libs/poco/include, - ../../../addons/ofxPoco/src, - ../../../addons/ofxPoco/libs/openssl/include, - ../../../addons/ofxNetworkUtils/libs, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include/ofx, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/include/ofx/Net, - ../../../addons/ofxNetworkUtils/libs/ofxNetworkUtils/src, - ../../../addons/ofxNetworkUtils/src, ../../../addons/ofxOsc/libs, ../../../addons/ofxOsc/libs/oscpack, ../../../addons/ofxOsc/libs/oscpack/src, @@ -2588,24 +2458,27 @@ ../../../addons/ofxOsc/libs/oscpack/src/osc, ../../../addons/ofxOsc/src, ../../../addons/ofxOscilloscope/src, + ../../../addons/ofxOscilloscope/ofxPatchboard/Patchboard/src, + ../../../addons/ofxPoco/libs/poco/include, + ../../../addons/ofxPoco/src, + ../../../addons/ofxPoco/libs/openssl/include, ../../../addons/ofxThreadedLogger/src, - ../../../addons/ofxXmlSettings/libs, - ../../../addons/ofxXmlSettings/src, - ../../../addons/ofxJSON/libs/jsoncpp/include, - ../../../addons/ofxJSON/src, ../../../addons/EmotiBit_XPlat_Utils/src, ); - ICON = "$(ICON_NAME_RELEASE)"; + ICON = EmotiBit.icns; ICON_FILE = "$(ICON_FILE_PATH)$(ICON)"; + ICON_FILE_PATH = ../EmotiBitIcons/macOS/; + ICON_NAME_DEBUG = EmotiBit.icns; + ICON_NAME_RELEASE = EmotiBit.icns; INFOPLIST_FILE = "openFrameworks-Info.plist"; INSTALL_PATH = /Applications; - LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(LD_RUNPATH_SEARCH_PATHS_$(IS_MACCATALYST)) @executable_path/../Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", ../../../addons/ofxLSL/libs/labstreaminglayer/lib/osx/x86_64, ); + MACOSX_DEPLOYMENT_TARGET = 10.14; ONLY_ACTIVE_ARCH = YES; - OTHER_CPLUSPLUSFLAGS = "-D__MACOSX_CORE__"; OTHER_LDFLAGS = ( "$(OF_CORE_LIBS)", "$(OF_CORE_FRAMEWORKS)", @@ -2620,7 +2493,7 @@ ../../../addons/ofxPoco/libs/openssl/lib/osx/crypto.a, ../../../addons/ofxPoco/libs/openssl/lib/osx/ssl.a, ); - PRODUCT_NAME = EmotiBitOscilloscope; + PRODUCT_NAME = "$(PROJECT_NAME)"; WRAPPER_EXTENSION = app; baseConfigurationReference = E4EB6923138AFD0F00A09F29; }; @@ -2629,12 +2502,12 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - B990E6032C0E7A370094B63E /* Build configuration list for PBXNativeTarget "EmotiBitOscilloscope-arm64" */ = { + 8EF01B9B2E4544B600BF0971 /* Build configuration list for PBXNativeTarget "EmotiBitOscilloscope-arm64" */ = { isa = XCConfigurationList; buildConfigurations = ( - B990E6042C0E7A370094B63E /* Debug */, - B990E6052C0E7A370094B63E /* Release */, - B990E6062C0E7A370094B63E /* AppStore */, + 8EF01B9C2E4544B600BF0971 /* Debug */, + 8EF01B9D2E4544B600BF0971 /* Release */, + 8EF01B9E2E4544B600BF0971 /* AppStore */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/EmotiBitOscilloscope/EmotiBitOscilloscope.xcodeproj/xcshareddata/xcschemes/Debug-arm64.xcscheme b/EmotiBitOscilloscope/EmotiBitOscilloscope.xcodeproj/xcshareddata/xcschemes/Debug-arm64.xcscheme index 92b3adc1..10c7e877 100644 --- a/EmotiBitOscilloscope/EmotiBitOscilloscope.xcodeproj/xcshareddata/xcschemes/Debug-arm64.xcscheme +++ b/EmotiBitOscilloscope/EmotiBitOscilloscope.xcodeproj/xcshareddata/xcschemes/Debug-arm64.xcscheme @@ -1,6 +1,6 @@ @@ -37,42 +37,22 @@ launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" - debugDocumentVersioning = "YES" + debugDocumentVersioning = "NO" debugServiceExtension = "internal" allowLocationSimulation = "YES"> - - - - - - - - + debugDocumentVersioning = "NO"> diff --git a/EmotiBitOscilloscope/EmotiBitOscilloscope.xcodeproj/xcshareddata/xcschemes/Debug-x86_64.xcscheme b/EmotiBitOscilloscope/EmotiBitOscilloscope.xcodeproj/xcshareddata/xcschemes/Debug-x86_64.xcscheme index 105b092e..a1795952 100644 --- a/EmotiBitOscilloscope/EmotiBitOscilloscope.xcodeproj/xcshareddata/xcschemes/Debug-x86_64.xcscheme +++ b/EmotiBitOscilloscope/EmotiBitOscilloscope.xcodeproj/xcshareddata/xcschemes/Debug-x86_64.xcscheme @@ -52,7 +52,7 @@ diff --git a/EmotiBitOscilloscope/EmotiBitOscilloscope.xcodeproj/xcshareddata/xcschemes/Release-x86_64.xcscheme b/EmotiBitOscilloscope/EmotiBitOscilloscope.xcodeproj/xcshareddata/xcschemes/Release-x86_64.xcscheme index 25bb74e2..c55d5f2e 100644 --- a/EmotiBitOscilloscope/EmotiBitOscilloscope.xcodeproj/xcshareddata/xcschemes/Release-x86_64.xcscheme +++ b/EmotiBitOscilloscope/EmotiBitOscilloscope.xcodeproj/xcshareddata/xcschemes/Release-x86_64.xcscheme @@ -23,7 +23,7 @@ @@ -69,7 +69,7 @@ + buildConfiguration = "Release"> This app needs to access the camera NSMicrophoneUsageDescription This app needs to access the microphone + NSHighResolutionCapable + diff --git a/README.md b/README.md index 8d84557b..7eaeb5d7 100644 --- a/README.md +++ b/README.md @@ -56,8 +56,8 @@ The addons are placed in the `OF_ROOT/addons` folder and it's structure is shown - both of these libs are handled properly by default but should be considered if deviating from the release code - Required to build EmotiBit FirmwareInstaller - - **ofxSerial:** [GitHub repository](https://github.com/EmotiBit/ofxSerial) - - **ofxIO:** [GitHub repository](https://github.com/bakercp/ofxIO) + - **ofxSerial:** [EmotiBit ofxSerial](https://github.com/EmotiBit/ofxSerial) + - **ofxIO:** [bakercp ofxIO](https://github.com/bakercp/ofxIO) - Additional notes - The project is built on a 64-bit architecture. Ensure you are on a machine supporting the `x64` build platform. - **If downloading the zip instead of `git clone`, be sure to remove `-master` or `-xxx-xxx` from the folder name to maintain correct path references**. @@ -79,7 +79,7 @@ git clone git@github.com:smukkejohan/ofxBiquadFilter.git git clone git@github.com:jeffcrouse/ofxJSON.git git clone git@github.com:EmotiBit/EmotiBit_XPlat_Utils.git git clone git@github.com:EmotiBit/ofxLSL.git -git clone git@github.com:bakercp/ofxSerial.git +git clone git@github.com:EmotiBit/ofxSerial.git cd ofxSerial git checkout stable cd .. diff --git a/src/ofxEmotiBitVersion.h b/src/ofxEmotiBitVersion.h index 971cbe41..90a89a04 100644 --- a/src/ofxEmotiBitVersion.h +++ b/src/ofxEmotiBitVersion.h @@ -3,7 +3,7 @@ #include "ofMain.h" -const std::string ofxEmotiBitVersion = "1.12.1"; +const std::string ofxEmotiBitVersion = "1.12.2"; static const char SOFTWARE_VERSION_PREFIX = 'v';