organic update ,gpio icon and try fix macOS xcode CI

benkuper · Apr 28, 2024 · be365d6 · be365d6
1 parent 1fdb76b
commit be365d6
Show file tree

Hide file tree

Showing 14 changed files with 216 additions and 141 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -131,6 +131,11 @@ jobs:
           hdiutil mount Packages.dmg
           sudo installer -pkg "/Volumes/Packages ${{ env.PackagesVersion }}/Install Packages.pkg" -target /
           hdiutil detach "/Volumes/Packages ${{ env.PackagesVersion }}/"
+          
+      - name: Setup XCode
+        uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: '15.3'
 
       - name: Build
         uses: sersoft-gmbh/xcodebuild-action@v2.0.1

diff --git a/Builds/MacOSX/Chataigne.xcodeproj/project.pbxproj b/Builds/MacOSX/Chataigne.xcodeproj/project.pbxproj
@@ -736,6 +736,7 @@
 		C4027CFB515DA11787FE11A9 /* commandScriptTemplate.js */ /* commandScriptTemplate.js */ = {isa = PBXFileReference; lastKnownFileType = file.js; name = commandScriptTemplate.js; path = ../../Resources/Templates/Scripts/commandScriptTemplate.js; sourceTree = SOURCE_ROOT; };
 		C45B37ABCDE0A9FA3B40EA19 /* MIDIDeviceParameter.cpp */ /* MIDIDeviceParameter.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = MIDIDeviceParameter.cpp; path = ../../Source/Common/MIDI/MIDIDeviceParameter.cpp; sourceTree = SOURCE_ROOT; };
 		C49FCF8B1A26685194B3FFDB /* StateManagerUI.cpp */ /* StateManagerUI.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = StateManagerUI.cpp; path = ../../Source/StateMachine/ui/StateManagerUI.cpp; sourceTree = SOURCE_ROOT; };
+		C5068B3A03C1E003AE74E051 /* GPIO.png */ /* GPIO.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = GPIO.png; path = ../../Resources/Modules/GPIO.png; sourceTree = SOURCE_ROOT; };
 		C5310AD14DE7C82A67357B95 /* os_win.c */ /* os_win.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = os_win.c; path = ../../Source/Module/modules/controller/wiimote/lib/wiiuse/os_win.c; sourceTree = SOURCE_ROOT; };
 		C59D381E042481F4FB5DC78B /* CommandDefinitionManager.cpp */ /* CommandDefinitionManager.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CommandDefinitionManager.cpp; path = ../../Source/Common/Command/CommandDefinitionManager.cpp; sourceTree = SOURCE_ROOT; };
 		C5C617A12B52E00D9C5A7EEC /* StreamDeckV2.cpp */ /* StreamDeckV2.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = StreamDeckV2.cpp; path = ../../Source/Module/modules/controller/streamdeck/models/StreamDeckV2.cpp; sourceTree = SOURCE_ROOT; };
@@ -1858,6 +1859,7 @@
 				068D5BDCBB49D14D8C13012E,
 				74637658C178668184A2A835,
 				0E23FCDD33ADDAC7FAFF8BD6,
+				C5068B3A03C1E003AE74E051,
 				C60629FA5A98B14697D1DA4E,
 				119888D65DE05EACD18D1B11,
 				F14BD61EF6AB97B4C7433424,
@@ -3831,7 +3833,6 @@
 					"JUCE_COREGRAPHICS_DRAW_ASYNC=1",
 					"USE_ABLETONLINK=1",
 					"LINK_PLATFORM_MACOSX=1",
-					"JUCE_SILENCE_XCODE_15_LINKER_WARNING=1",
 					"JUCER_XCODE_MAC_F6D2F4CF=1",
 					"JUCE_APP_VERSION=1.9.18b3",
 					"JUCE_APP_VERSION_HEX=0x10912",
@@ -3913,7 +3914,6 @@
 					"JUCE_COREGRAPHICS_DRAW_ASYNC=1",
 					"USE_ABLETONLINK=1",
 					"LINK_PLATFORM_MACOSX=1",
-					"JUCE_SILENCE_XCODE_15_LINKER_WARNING=1",
 					"JUCER_XCODE_MAC_F6D2F4CF=1",
 					"JUCE_APP_VERSION=1.9.18b3",
 					"JUCE_APP_VERSION_HEX=0x10912",
@@ -4046,7 +4046,6 @@
 					"JUCE_COREGRAPHICS_DRAW_ASYNC=1",
 					"USE_ABLETONLINK=1",
 					"LINK_PLATFORM_MACOSX=1",
-					"JUCE_SILENCE_XCODE_15_LINKER_WARNING=1",
 					"JUCER_XCODE_MAC_F6D2F4CF=1",
 					"JUCE_APP_VERSION=1.9.18b3",
 					"JUCE_APP_VERSION_HEX=0x10912",
@@ -4128,7 +4127,6 @@
 					"JUCE_COREGRAPHICS_DRAW_ASYNC=1",
 					"USE_ABLETONLINK=1",
 					"LINK_PLATFORM_MACOSX=1",
-					"JUCE_SILENCE_XCODE_15_LINKER_WARNING=1",
 					"JUCER_XCODE_MAC_F6D2F4CF=1",
 					"JUCE_APP_VERSION=1.9.18b3",
 					"JUCE_APP_VERSION_HEX=0x10912",

diff --git a/Builds/MacOSX_CI/Chataigne.xcodeproj/project.pbxproj b/Builds/MacOSX_CI/Chataigne.xcodeproj/project.pbxproj
@@ -735,6 +735,7 @@
 		C4027CFB515DA11787FE11A9 /* commandScriptTemplate.js */ /* commandScriptTemplate.js */ = {isa = PBXFileReference; lastKnownFileType = file.js; name = commandScriptTemplate.js; path = ../../Resources/Templates/Scripts/commandScriptTemplate.js; sourceTree = SOURCE_ROOT; };
 		C45B37ABCDE0A9FA3B40EA19 /* MIDIDeviceParameter.cpp */ /* MIDIDeviceParameter.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = MIDIDeviceParameter.cpp; path = ../../Source/Common/MIDI/MIDIDeviceParameter.cpp; sourceTree = SOURCE_ROOT; };
 		C49FCF8B1A26685194B3FFDB /* StateManagerUI.cpp */ /* StateManagerUI.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = StateManagerUI.cpp; path = ../../Source/StateMachine/ui/StateManagerUI.cpp; sourceTree = SOURCE_ROOT; };
+		C5068B3A03C1E003AE74E051 /* GPIO.png */ /* GPIO.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = GPIO.png; path = ../../Resources/Modules/GPIO.png; sourceTree = SOURCE_ROOT; };
 		C5310AD14DE7C82A67357B95 /* os_win.c */ /* os_win.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = os_win.c; path = ../../Source/Module/modules/controller/wiimote/lib/wiiuse/os_win.c; sourceTree = SOURCE_ROOT; };
 		C59D381E042481F4FB5DC78B /* CommandDefinitionManager.cpp */ /* CommandDefinitionManager.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CommandDefinitionManager.cpp; path = ../../Source/Common/Command/CommandDefinitionManager.cpp; sourceTree = SOURCE_ROOT; };
 		C5C617A12B52E00D9C5A7EEC /* StreamDeckV2.cpp */ /* StreamDeckV2.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = StreamDeckV2.cpp; path = ../../Source/Module/modules/controller/streamdeck/models/StreamDeckV2.cpp; sourceTree = SOURCE_ROOT; };
@@ -1858,6 +1859,7 @@
 				068D5BDCBB49D14D8C13012E,
 				74637658C178668184A2A835,
 				0E23FCDD33ADDAC7FAFF8BD6,
+				C5068B3A03C1E003AE74E051,
 				C60629FA5A98B14697D1DA4E,
 				119888D65DE05EACD18D1B11,
 				F14BD61EF6AB97B4C7433424,
@@ -3782,7 +3784,6 @@
 					"USE_ABLETONLINK=1",
 					"LINK_PLATFORM_MACOSX=1",
 					"OS_SYSINFO_SUPPORT=0",
-					"JUCE_SILENCE_XCODE_15_LINKER_WARNING=1",
 					"JUCER_XCODE_MAC_2F3811D6=1",
 					"JUCE_APP_VERSION=1.9.18b3",
 					"JUCE_APP_VERSION_HEX=0x10912",
@@ -3866,7 +3867,6 @@
 					"USE_ABLETONLINK=1",
 					"LINK_PLATFORM_MACOSX=1",
 					"OS_SYSINFO_SUPPORT=0",
-					"JUCE_SILENCE_XCODE_15_LINKER_WARNING=1",
 					"JUCER_XCODE_MAC_2F3811D6=1",
 					"JUCE_APP_VERSION=1.9.18b3",
 					"JUCE_APP_VERSION_HEX=0x10912",

diff --git a/Builds/VisualStudio2022/Chataigne_App.vcxproj b/Builds/VisualStudio2022/Chataigne_App.vcxproj
@@ -4933,6 +4933,7 @@
     <None Include="..\..\Resources\Modules\DMX.png"/>
     <None Include="..\..\Resources\Modules\Empty.png"/>
     <None Include="..\..\Resources\Modules\Gamepad.png"/>
+    <None Include="..\..\Resources\Modules\GPIO.png"/>
     <None Include="..\..\Resources\Modules\HeavyM.png"/>
     <None Include="..\..\Resources\Modules\HTTP.png"/>
     <None Include="..\..\Resources\Modules\JoyCon.png"/>

diff --git a/Builds/VisualStudio2022/Chataigne_App.vcxproj.filters b/Builds/VisualStudio2022/Chataigne_App.vcxproj.filters
@@ -10232,6 +10232,9 @@
     <None Include="..\..\Resources\Modules\Gamepad.png">
       <Filter>Chataigne\Resources\Modules</Filter>
     </None>
+    <None Include="..\..\Resources\Modules\GPIO.png">
+      <Filter>Chataigne\Resources\Modules</Filter>
+    </None>
     <None Include="..\..\Resources\Modules\HeavyM.png">
       <Filter>Chataigne\Resources\Modules</Filter>
     </None>

diff --git a/Builds/VisualStudio2022_CI/Chataigne_App.vcxproj b/Builds/VisualStudio2022_CI/Chataigne_App.vcxproj
@@ -4933,6 +4933,7 @@
     <None Include="..\..\Resources\Modules\DMX.png"/>
     <None Include="..\..\Resources\Modules\Empty.png"/>
     <None Include="..\..\Resources\Modules\Gamepad.png"/>
+    <None Include="..\..\Resources\Modules\GPIO.png"/>
     <None Include="..\..\Resources\Modules\HeavyM.png"/>
     <None Include="..\..\Resources\Modules\HTTP.png"/>
     <None Include="..\..\Resources\Modules\JoyCon.png"/>

diff --git a/Builds/VisualStudio2022_CI/Chataigne_App.vcxproj.filters b/Builds/VisualStudio2022_CI/Chataigne_App.vcxproj.filters
@@ -10232,6 +10232,9 @@
     <None Include="..\..\Resources\Modules\Gamepad.png">
       <Filter>Chataigne\Resources\Modules</Filter>
     </None>
+    <None Include="..\..\Resources\Modules\GPIO.png">
+      <Filter>Chataigne\Resources\Modules</Filter>
+    </None>
     <None Include="..\..\Resources\Modules\HeavyM.png">
       <Filter>Chataigne\Resources\Modules</Filter>
     </None>

diff --git a/Builds/VisualStudio2022_Win7CI/Chataigne_App.vcxproj b/Builds/VisualStudio2022_Win7CI/Chataigne_App.vcxproj
@@ -4932,6 +4932,7 @@
     <None Include="..\..\Resources\Modules\DMX.png"/>
     <None Include="..\..\Resources\Modules\Empty.png"/>
     <None Include="..\..\Resources\Modules\Gamepad.png"/>
+    <None Include="..\..\Resources\Modules\GPIO.png"/>
     <None Include="..\..\Resources\Modules\HeavyM.png"/>
     <None Include="..\..\Resources\Modules\HTTP.png"/>
     <None Include="..\..\Resources\Modules\JoyCon.png"/>

diff --git a/Builds/VisualStudio2022_Win7CI/Chataigne_App.vcxproj.filters b/Builds/VisualStudio2022_Win7CI/Chataigne_App.vcxproj.filters
@@ -10232,6 +10232,9 @@
     <None Include="..\..\Resources\Modules\Gamepad.png">
       <Filter>Chataigne\Resources\Modules</Filter>
     </None>
+    <None Include="..\..\Resources\Modules\GPIO.png">
+      <Filter>Chataigne\Resources\Modules</Filter>
+    </None>
     <None Include="..\..\Resources\Modules\HeavyM.png">
       <Filter>Chataigne\Resources\Modules</Filter>
     </None>

diff --git a/Chataigne.jucer b/Chataigne.jucer
@@ -30,6 +30,7 @@
         <FILE id="kdkONp" name="DMX.png" compile="0" resource="1" file="Resources/Modules/DMX.png"/>
         <FILE id="eqnFj9" name="Empty.png" compile="0" resource="1" file="Resources/Modules/Empty.png"/>
         <FILE id="yfJH3x" name="Gamepad.png" compile="0" resource="1" file="Resources/Modules/Gamepad.png"/>
+        <FILE id="dJmafw" name="GPIO.png" compile="0" resource="1" file="Resources/Modules/GPIO.png"/>
         <FILE id="I0DSTK" name="HeavyM.png" compile="0" resource="1" file="Resources/Modules/HeavyM.png"/>
         <FILE id="OrCxSg" name="HTTP.png" compile="0" resource="1" file="Resources/Modules/HTTP.png"/>
         <FILE id="jWmnHY" name="JoyCon.png" compile="0" resource="1" file="Resources/Modules/JoyCon.png"/>
@@ -1726,7 +1727,7 @@
                customPList="&lt;plist&gt;&#10;&lt;dict&gt;&#10;&lt;key&gt;NSAppTransportSecurity&lt;/key&gt;&#10;&#9;&lt;dict&gt;&#10;&#9;&#9;&lt;key&gt;NSAllowsArbitraryLoads&lt;/key&gt;&#10;&#9;&#9;&lt;true/&gt;&#10;&#9;&lt;/dict&gt;&#10;&lt;/dict&gt;&#10;&lt;/plist&gt;"
                externalLibraries="Servus&#10;hidapi&#10;JoyShockLibrary" microphonePermissionNeeded="1"
                hardenedRuntimeOptions="com.apple.security.cs.allow-jit,com.apple.security.device.audio-input"
-               extraDefs="JUCE_SUPPORT_CARBON=0&#10;JUCE_COREGRAPHICS_DRAW_ASYNC=1&#10;USE_ABLETONLINK=1&#10;LINK_PLATFORM_MACOSX=1&#10;JUCE_SILENCE_XCODE_15_LINKER_WARNING=1"
+               extraDefs="JUCE_SUPPORT_CARBON=0&#10;JUCE_COREGRAPHICS_DRAW_ASYNC=1&#10;USE_ABLETONLINK=1&#10;LINK_PLATFORM_MACOSX=1"
                xcodeValidArchs="arm64,x86_64" embeddedFrameworks="../../External/sdl/lib/osx/SDL2.framework"
                frameworkSearchPaths="../../External/sdl/lib/osx">
       <CONFIGURATIONS>
@@ -1872,7 +1873,7 @@
                smallIcon="nVz6Li" bigIcon="nVz6Li" hardenedRuntimeOptions="com.apple.security.cs.allow-jit"
                customPList="&lt;plist&gt;&#10;&lt;dict&gt;&#10;&lt;key&gt;NSAppTransportSecurity&lt;/key&gt;&#10;&#9;&lt;dict&gt;&#10;&#9;&#9;&lt;key&gt;NSAllowsArbitraryLoads&lt;/key&gt;&#10;&#9;&#9;&lt;true/&gt;&#10;&#9;&lt;/dict&gt;&#10;&lt;/dict&gt;&#10;&lt;/plist&gt;"
                microphonePermissionNeeded="1" extraFrameworks="IOBluetooth, ForceFeedback, IOKit"
-               documentExtensions="noisette" extraDefs="JUCE_SUPPORT_CARBON=0&#10;JUCE_COREGRAPHICS_DRAW_ASYNC=1&#10;USE_ABLETONLINK=1&#10;LINK_PLATFORM_MACOSX=1&#10;OS_SYSINFO_SUPPORT=0&#10;JUCE_SILENCE_XCODE_15_LINKER_WARNING=1"
+               documentExtensions="noisette" extraDefs="JUCE_SUPPORT_CARBON=0&#10;JUCE_COREGRAPHICS_DRAW_ASYNC=1&#10;USE_ABLETONLINK=1&#10;LINK_PLATFORM_MACOSX=1&#10;OS_SYSINFO_SUPPORT=0"
                xcodeValidArchs="arm64,x86_64" frameworkSearchPaths="../../External/sdl/lib/osx"
                embeddedFrameworks="../../External/sdl/lib/osx/SDL2.framework">
       <CONFIGURATIONS>