Merge branch 'main' of github.com:Tracktion/melatonin_inspector

.github/workflows/ci.yml

@@ -3,6 +3,10 @@ name: CI
 on:
   workflow_dispatch:
   push:
+  pull_request:
+    branches:
+      - main
+      - next
 
 env:
   CMAKE_BUILD_PARALLEL_LEVEL: 3 # Use up to 3 cpus to build juceaide, etc
@@ -28,15 +32,33 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        app: [member_enabled, member_disabled, unique_ptr_enabled, unique_ptr_disabled]
-        os: [macos-latest, windows-latest]
+        app: [ member_enabled, member_disabled, unique_ptr_enabled, unique_ptr_disabled ]
+        os: [ macos-14, windows-2022, ubuntu-latest ]
 
     steps:
       - name: Checkout
         uses: actions/checkout@v3
         with:
           fetch-depth: 1
 
+      - name: Install Linux Deps
+        if: runner.os == 'Linux'
+        run: |
+          sudo apt-get update
+          sudo apt install libasound2-dev libx11-dev libxcomposite-dev libxcursor-dev libxext-dev libxinerama-dev libxrandr-dev libxrender-dev libfreetype6-dev libglu1-mesa-dev libjack-jackd2-dev
+          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 9
+          sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 9
+
+      # This block can be removed once 15.1 is default (JUCE requires it when building on macOS 14)
+      - name: Use latest Xcode on system (macOS)
+        if: ${{ matrix.os == 'macos-14' }}
+        uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: latest-stable
+
+      - name: Run sccache-cache
+        uses: mozilla-actions/sccache-action@v0.0.4
+
       - name: Configure
         run: cmake -B Builds -DTARGET_NAME:STRING=${{ matrix.app }}
 
@@ -46,19 +68,20 @@ jobs:
       - name: Run
         if: ${{ matrix.os == 'macos-latest' }}
         working-directory: Builds/${{ matrix.app }}_artefacts
-        timeout-minutes: 1
+        timeout-minutes: 2
         run: |
           ls -ahl
           ${{ matrix.app }}.app/Contents/MacOS/${{ matrix.app }} &
 
       - name: Run
         if: ${{ matrix.os == 'windows-latest' }}
         working-directory: Builds/${{ matrix.app }}_artefacts
-        timeout-minutes: 1
+        timeout-minutes: 2
         run: |
           ls -ahl
           ./Debug/${{ matrix.app }}.exe &
 
       - uses: OrbitalOwen/desktop-screenshot-action@0.1
+        if: ${{ matrix.os == 'windows-latest' }}
         with:
           file-name: ${{ matrix.os }}-${{matrix.app}}.jpg

CMakeLists.txt

@@ -24,6 +24,12 @@ if (MelatoninInspector_IS_TOP_LEVEL)
 
     juce_add_gui_app ("${TARGET_NAME}" VERSION 1.0.0)
     target_sources("${TARGET_NAME}" PRIVATE "tests/${TARGET_NAME}.cpp")
+
+    target_compile_definitions("${TARGET_NAME}" PUBLIC
+        JUCE_USE_CURL=0
+        JUCE_WEB_BROWSER=0
+    )
+
     set_target_properties("${TARGET_NAME}" PROPERTIES COMPILE_WARNING_AS_ERROR ON)
 
 endif ()
@@ -46,10 +52,11 @@ endif ()
 # Assets are precompiled in the module to make it Projucer friendly
 #
 # To add or modify images:
-#  * Uncomment the following lines to generate the assets again
+#  * Uncomment the following CMake lines to generate the MelatoninInspectorAssets binary
+#  * uncomment #include "InspectorBinaryData.h in misc.h and comment out the LatestCompiledAssets include
 #  * build as you would normally via CMake
-#  * run modules/melatonin_inspector/copy_cmake_assets.rb from your main PROJECT folder
-#  * comment these lines back out
+#  * run ./modules/melatonin_inspector/copy_cmake_assets.rb from your root PROJECT folder (not the melatonin_inspector folder)
+#  * comment these lines back out and swap the misc.h include again
 
 #file(GLOB_RECURSE MelatoninInspectorAssetFiles CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/Assets/*")
 #juce_add_binary_data(MelatoninInspectorAssets SOURCES ${MelatoninInspectorAssetFiles} HEADER_NAME InspectorBinaryData.h NAMESPACE InspectorBinaryData)

LatestCompiledAssets/BinaryData1.cpp

@@ -94,12 +94,16 @@ const char* getNamedResource (const char* resourceNameUTF8, int& numBytes)
         case 0xf2aeeae3:  numBytes = 303; return expandon_png;
         case 0x14ab743c:  numBytes = 673; return eyedropperoff_png;
         case 0xc74a0a86:  numBytes = 671; return eyedropperon_png;
+        case 0x219463ce:  numBytes = 516; return lockoff_png;
+        case 0x649be0b4:  numBytes = 474; return lockon_png;
         case 0x78ded995:  numBytes = 25781; return logo_png;
-        case 0x48464668:  numBytes = 1076; return moveoff_png;
+        case 0x48464668:  numBytes = 1093; return moveoff_png;
         case 0xd13642da:  numBytes = 958; return moveon_png;
         case 0xd5ac3312:  numBytes = 941; return search_png;
         case 0xca80f4b8:  numBytes = 1419; return speedometeroff_png;
         case 0x40c48a8a:  numBytes = 1371; return speedometeron_png;
+        case 0x4714be24:  numBytes = 531; return taboff_png;
+        case 0x8f1be39e:  numBytes = 503; return tabon_png;
         case 0xf76847cf:  numBytes = 850; return timingoff_png;
         case 0x10aaf893:  numBytes = 867; return timingon_png;
         default: break;
@@ -121,12 +125,16 @@ const char* namedResourceList[] =
     "expandon_png",
     "eyedropperoff_png",
     "eyedropperon_png",
+    "lockoff_png",
+    "lockon_png",
     "logo_png",
     "moveoff_png",
     "moveon_png",
     "search_png",
     "speedometeroff_png",
     "speedometeron_png",
+    "taboff_png",
+    "tabon_png",
     "timingoff_png",
     "timingon_png"
 };
@@ -143,12 +151,16 @@ const char* originalFilenames[] =
     "expand-on.png",
     "eyedropper-off.png",
     "eyedropper-on.png",
+    "lock-off.png",
+    "lock-on.png",
     "logo.png",
     "move-off.png",
     "move-on.png",
     "search.png",
     "speedometer-off.png",
     "speedometer-on.png",
+    "tab-off.png",
+    "tab-on.png",
     "timing-off.png",
     "timing-on.png"
 };