AnalogTapeModel

commit 2946cb17d2f5872604a03f7c885eebc10152d29a
parent d5b31095a76ed79f6e300aa05806643668b68fa6
Author: Jatin Chowdhury <jatinchowdhury18@gmail.com>
Date:   Sat, 20 Nov 2021 23:12:48 +0000

Minor tweaks to iOS build process

Diffstat:
M
Plugin/modules/CMakeLists.txt
 | 
8
++++++--
M
Scripts/ios_builds.sh
 | 
3
+--

2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/Plugin/modules/CMakeLists.txt b/Plugin/modules/CMakeLists.txt
@@ -24,7 +24,6 @@ target_link_libraries(juce_plugin_modules
         BinaryData
         juce::juce_audio_utils
         juce::juce_audio_plugin_client
-        juce::juce_opengl
         chowdsp_juce_dsp
         chowdsp_utils
         foleys_gui_magic
@@ -45,7 +44,6 @@ target_compile_definitions(juce_plugin_modules
         JUCE_MODAL_LOOPS_PERMITTED=1
         FOLEYS_SHOW_GUI_EDITOR_PALLETTE=0
         FOLEYS_ENABLE_BINARY_DATA=1
-        FOLEYS_ENABLE_OPEN_GL_CONTEXT=1
         CHOWDSP_USE_XSIMD=1
         CHOWDSP_USE_CUSTOM_JUCE_DSP=1
         JucePlugin_Manufacturer="chowdsp"
@@ -73,3 +71,9 @@ if(IOS)
     target_link_libraries(juce_plugin_modules PRIVATE juce::juce_product_unlocking)
     target_compile_definitions(juce_plugin_modules PUBLIC JUCE_IN_APP_PURCHASES=1)
 endif()
+
+if(NOT APPLE)
+    message(STATUS "Linking with OpenGL")
+    target_link_libraries(juce_plugin_modules PRIVATE juce::juce_opengl)
+    target_compile_definitions(juce_plugin_modules PUBLIC FOLEYS_ENABLE_OPEN_GL_CONTEXT=1)
+endif()
diff --git a/Scripts/ios_builds.sh b/Scripts/ios_builds.sh
@@ -23,8 +23,7 @@ cmake -Bbuild-ios -GXcode -DCMAKE_SYSTEM_NAME=iOS \
     -DCMAKE_OSX_DEPLOYMENT_TARGET=11.4 \
     -DCMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM="$TEAM_ID" \
     -DCMAKE_XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY="1,2" \
-    -DCMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE="NO" \
-    -DCUSTOM_JUCE_PATH=../../../JUCE_610
+    -DCMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE="NO"
 
 if [ "$1" == "build" ]; then
 xcodebuild -project build-ios/CHOWTapeModel.xcodeproj \