DISTRHO
/
Ildaeil
mirror of https://github.com/DISTRHO/Ildaeil.git
1
0
Fork 0
Code Issues 0 Releases 4 Wiki Activity
Browse Source

Add files for standalone icon on mac/win; install meson on CI 

Signed-off-by: falkTX <falktx@falktx.com>
tags/v1.3
falkTX 1 year ago
parent
9daee99e35
commit
dc8bc80494
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
8 changed files with 64 additions and 11 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +10
    -9
      .github/workflows/build.yml
  2. +1
    -0
      .gitignore
  3. +4
    -0
      plugins/Common/Makefile.mk
  4. +27
    -2
      plugins/Standalone/Makefile
  5. +20
    -0
      plugins/Standalone/macOS/Info.plist
  6. BIN
      plugins/Standalone/macOS/distrho.icns
  7. BIN
      plugins/Standalone/win32/distrho.ico
  8. +2
    -0
      plugins/Standalone/win32/distrho.rc

+ 10
- 9
.github/workflows/build.yml View File

@@ -4,8 +4,6 @@ on: [push, pull_request]


env: env:
CACHE_VERSION: 7 CACHE_VERSION: 7
DEBIAN_FRONTEND: noninteractive
HOMEBREW_NO_AUTO_UPDATE: 1
PAWPAW_SKIP_LTO: 1 PAWPAW_SKIP_LTO: 1
PAWPAW_SKIP_FFTW: 1 PAWPAW_SKIP_FFTW: 1
PAWPAW_SKIP_GLIB: 1 PAWPAW_SKIP_GLIB: 1
@@ -44,7 +42,7 @@ jobs:
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-arm64.list echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-arm64.list
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-arm64.list echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-arm64.list
sudo apt-get update -qq sudo apt-get update -qq
sudo apt-get install -yqq g++-aarch64-linux-gnu libasound2-dev:arm64 libdbus-1-dev:arm64 libgl1-mesa-dev:arm64 libglib2.0-dev:arm64 libx11-dev:arm64 libxcursor-dev:arm64 libxext-dev:arm64 libxrandr-dev:arm64 gperf qemu-user-static
sudo apt-get install -yqq g++-aarch64-linux-gnu libasound2-dev:arm64 libdbus-1-dev:arm64 libgl1-mesa-dev:arm64 libglib2.0-dev:arm64 libx11-dev:arm64 libxcursor-dev:arm64 libxext-dev:arm64 libxrandr-dev:arm64 gperf meson qemu-user-static
- name: Set up dependencies (armhf) - name: Set up dependencies (armhf)
if: ${{ matrix.target == 'armhf' }} if: ${{ matrix.target == 'armhf' }}
run: | run: |
@@ -54,13 +52,13 @@ jobs:
echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports focal-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-armhf.list echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports focal-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-armhf.list
echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-armhf.list echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-armhf.list
sudo apt-get update -qq sudo apt-get update -qq
sudo apt-get install -yqq g++-arm-linux-gnueabihf libasound2-dev:armhf libdbus-1-dev:armhf libgl1-mesa-dev:armhf libglib2.0-dev:armhf libx11-dev:armhf libxcursor-dev:armhf libxext-dev:armhf libxrandr-dev:armhf gperf qemu-user-static
sudo apt-get install -yqq g++-arm-linux-gnueabihf libasound2-dev:armhf libdbus-1-dev:armhf libgl1-mesa-dev:armhf libglib2.0-dev:armhf libx11-dev:armhf libxcursor-dev:armhf libxext-dev:armhf libxrandr-dev:armhf gperf meson qemu-user-static
- name: Set up dependencies (i386) - name: Set up dependencies (i386)
if: ${{ matrix.target == 'i386' }} if: ${{ matrix.target == 'i386' }}
run: | run: |
sudo dpkg --add-architecture i386 sudo dpkg --add-architecture i386
sudo apt-get update -qq sudo apt-get update -qq
sudo apt-get install -yqq g++-i686-linux-gnu libasound2-dev:i386 libdbus-1-dev:i386 libgl1-mesa-dev:i386 libglib2.0-dev:i386 libx11-dev:i386 libxcursor-dev:i386 libxext-dev:i386 libxrandr-dev:i386 gperf
sudo apt-get install -yqq g++-i686-linux-gnu libasound2-dev:i386 libdbus-1-dev:i386 libgl1-mesa-dev:i386 libglib2.0-dev:i386 libx11-dev:i386 libxcursor-dev:i386 libxext-dev:i386 libxrandr-dev:i386 gperf meson
sudo apt-get install -yqq binutils-mingw-w64-i686 g++-mingw-w64-i686 mingw-w64 libwine-dev:i386 wine-stable wine64-tools sudo apt-get install -yqq binutils-mingw-w64-i686 g++-mingw-w64-i686 mingw-w64 libwine-dev:i386 wine-stable wine64-tools
- name: Set up dependencies (riscv64) - name: Set up dependencies (riscv64)
if: ${{ matrix.target == 'riscv64' }} if: ${{ matrix.target == 'riscv64' }}
@@ -71,13 +69,13 @@ jobs:
echo "deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports focal-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-riscv64.list echo "deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports focal-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-riscv64.list
echo "deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-riscv64.list echo "deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-riscv64.list
sudo apt-get update -qq sudo apt-get update -qq
sudo apt-get install -yqq g++-riscv64-linux-gnu libasound2-dev:riscv64 libdbus-1-dev:riscv64 libgl1-mesa-dev:riscv64 libglapi-mesa:riscv64 libglvnd0:riscv64 libglib2.0-dev:riscv64 libx11-dev:riscv64 libxcursor-dev:riscv64 libxext-dev:riscv64 libxrandr-dev:riscv64 gperf qemu-user-static
sudo apt-get install -yqq g++-riscv64-linux-gnu libasound2-dev:riscv64 libdbus-1-dev:riscv64 libgl1-mesa-dev:riscv64 libglapi-mesa:riscv64 libglvnd0:riscv64 libglib2.0-dev:riscv64 libx11-dev:riscv64 libxcursor-dev:riscv64 libxext-dev:riscv64 libxrandr-dev:riscv64 gperf meson qemu-user-static
- name: Set up dependencies (x86_64) - name: Set up dependencies (x86_64)
if: ${{ matrix.target == 'x86_64' }} if: ${{ matrix.target == 'x86_64' }}
run: | run: |
sudo dpkg --add-architecture i386 sudo dpkg --add-architecture i386
sudo apt-get update -qq sudo apt-get update -qq
sudo apt-get install -yqq libasound2-dev libdbus-1-dev libgl1-mesa-dev libglib2.0-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev gperf
sudo apt-get install -yqq libasound2-dev libdbus-1-dev libgl1-mesa-dev libglib2.0-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev gperf meson
sudo apt-get install -yqq g++-multilib libx11-dev:i386 sudo apt-get install -yqq g++-multilib libx11-dev:i386
sudo apt-get install -yqq binutils-mingw-w64-i686 binutils-mingw-w64-x86-64 g++-mingw-w64-i686 g++-mingw-w64-x86-64 mingw-w64 wine-stable wine64-tools sudo apt-get install -yqq binutils-mingw-w64-i686 binutils-mingw-w64-x86-64 g++-mingw-w64-i686 g++-mingw-w64-x86-64 mingw-w64 wine-stable wine64-tools
- name: Build extra dependencies - name: Build extra dependencies
@@ -125,6 +123,9 @@ jobs:
path: | path: |
~/PawPawBuilds ~/PawPawBuilds
key: macos-${{ matrix.target }}-v${{ env.CACHE_VERSION }} key: macos-${{ matrix.target }}-v${{ env.CACHE_VERSION }}
- name: Set up dependencies
run: |
brew install meson
- name: Build extra dependencies - name: Build extra dependencies
run: | run: |
git clone --depth=1 https://github.com/DISTRHO/PawPaw.git git clone --depth=1 https://github.com/DISTRHO/PawPaw.git
@@ -174,11 +175,11 @@ jobs:
- name: Set up dependencies (win32) - name: Set up dependencies (win32)
if: ${{ matrix.target == 'win32' }} if: ${{ matrix.target == 'win32' }}
run: | run: |
sudo apt-get install -yqq --allow-downgrades binutils-mingw-w64-i686 libc6:i386 libgcc-s1:i386 libstdc++6:i386 g++-mingw-w64-i686 gperf mingw-w64 wine-stable
sudo apt-get install -yqq --allow-downgrades binutils-mingw-w64-i686 libc6:i386 libgcc-s1:i386 libstdc++6:i386 g++-mingw-w64-i686 gperf meson mingw-w64 wine-stable
- name: Set up dependencies (win64) - name: Set up dependencies (win64)
if: ${{ matrix.target == 'win64' }} if: ${{ matrix.target == 'win64' }}
run: | run: |
sudo apt-get install -yqq --allow-downgrades binutils-mingw-w64-x86-64 libc6:i386 libgcc-s1:i386 libstdc++6:i386 g++-mingw-w64-x86-64 gperf mingw-w64 wine-stable
sudo apt-get install -yqq --allow-downgrades binutils-mingw-w64-x86-64 libc6:i386 libgcc-s1:i386 libstdc++6:i386 g++-mingw-w64-x86-64 gperf meson mingw-w64 wine-stable
- name: Build extra dependencies - name: Build extra dependencies
run: | run: |
git clone --depth=1 https://github.com/DISTRHO/PawPaw.git git clone --depth=1 https://github.com/DISTRHO/PawPaw.git


+ 1
- 0
.gitignore View File

@@ -1,3 +1,4 @@
/bin/ /bin/
/build/ /build/
.kdev4/ .kdev4/
.DS_Store

+ 4
- 0
plugins/Common/Makefile.mk View File

@@ -33,6 +33,10 @@ FILES_UI = \
../Common/PluginHostWindow.cpp \ ../Common/PluginHostWindow.cpp \
../../dpf-widgets/opengl/DearImGui.cpp ../../dpf-widgets/opengl/DearImGui.cpp


ifeq ($(STANDALONE)$(WINDOWS),truetrue)
FILES_UI += distrho.rc
endif

# --------------------------------------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------------------------------------
# Carla stuff # Carla stuff




+ 27
- 2
plugins/Standalone/Makefile View File

@@ -4,13 +4,38 @@
# Created by falkTX # Created by falkTX
# #


# --------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------
# Project name, used for binaries # Project name, used for binaries


NAME = Ildaeil NAME = Ildaeil


# --------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------
# Do some magic # Do some magic


STANDALONE = true STANDALONE = true
include ../Common/Makefile.mk include ../Common/Makefile.mk

# ---------------------------------------------------------------------------------------------------------------------
# Extra rules for macOS app bundle

$(TARGET_DIR)/Ildaeil.app/Contents/Info.plist: macOS/Info.plist $(TARGET_DIR)/Ildaeil.app/Contents/Resources/distrho.icns
-@mkdir -p $(shell dirname $@)
cp $< $@

$(TARGET_DIR)/Ildaeil.app/Contents/Resources/distrho.icns: macOS/distrho.icns
-@mkdir -p $(shell dirname $@)
cp $< $@

# ---------------------------------------------------------------------------------------------------------------------
# Extra rules for Windows icon

ifeq ($(WINDOWS),true)
WINDRES ?= $(subst gcc,windres,$(CC))

$(BUILD_DIR)/distrho.rc.o: win32/distrho.rc win32/distrho.ico
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling distrho.rc"
$(SILENT)$(WINDRES) $< -O coff -o $@
endif

# ---------------------------------------------------------------------------------------------------------------------

+ 20
- 0
plugins/Standalone/macOS/Info.plist View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>Ildaeil</string>
<key>CFBundleIconFile</key>
<string>distrho.icns</string>
<key>CFBundleIdentifier</key>
<string>Ildaeil</string>
<key>NSHighResolutionCapable</key>
<true/>
<key>NSRequiresAquaSystemAppearance</key>
<false/>
<key>NSMicrophoneUsageDescription</key>
<string>Ildaeil requires microphone permissions for audio input.</string>
</dict>
</plist>

BIN
plugins/Standalone/macOS/distrho.icns View File


BIN
plugins/Standalone/win32/distrho.ico View File

Before After

+ 2
- 0
plugins/Standalone/win32/distrho.rc View File

@@ -0,0 +1,2 @@
id ICON "distrho.ico"
401 ICON "distrho.ico"

Write Preview
Loading…
Cancel
Save