diff --git a/.github/workflows/win-builds.yaml b/.github/workflows/win-builds.yaml new file mode 100644 index 0000000000..36ae2ff141 --- /dev/null +++ b/.github/workflows/win-builds.yaml @@ -0,0 +1,93 @@ +name: Windows build +on: push + +jobs: + winstore: + name: Windows (store) + runs-on: windows-latest + steps: + - name: Checkout code + uses: actions/checkout@v2 + with: + submodules: 'recursive' + + - name: Dependencies + shell: bash + run: | + ./ci/win32.deps.sh + + - name: Build + shell: cmd + run: | + call "%cd%\ci\win32store.build.cmd" + + - name: Create certificate + shell: pwsh + env: + OSSIA_WIN32_CERT_SUBJECT: ${{ secrets.OSSIA_WIN32_CERT_SUBJECT }} + OSSIA_WIN32_CERT_PASSWORD: ${{ secrets.OSSIA_WIN32_CERT_PASSWORD }} + run: | + .\ci\win32store.cert.ps1 + + - name: Deploy + shell: cmd + env: + OSSIA_WIN32_CERT_SUBJECT: ${{ secrets.OSSIA_WIN32_CERT_SUBJECT }} + OSSIA_WIN32_CERT_PASSWORD: ${{ secrets.OSSIA_WIN32_CERT_PASSWORD }} + run: | + call "%cd%\ci\win32store.deploy.cmd" + + - name: Upload build + uses: actions/upload-artifact@v2 + with: + name: windows-store + path: | + output/*.appxbundle + + mingw: + runs-on: windows-latest + strategy: + matrix: + include: + - { sys: mingw64, env: x86_64 } + - { sys: mingw32, env: i686 } + - { sys: ucrt64, env: ucrt-x86_64 } + - { sys: clang64, env: clang-x86_64 } + steps: + - name: Check out repository code + uses: actions/checkout@v2 + with: + submodules: 'recursive' + + - name: Setup msys2 and mingw-w64 + uses: msys2/setup-msys2@v2 + with: + msystem: ${{matrix.sys}} + update: true + pacboy: >- + cmake:p + ninja:p + toolchain:p + qt6-base:p + qt6-declarative:p + qt6-websockets:p + qt6-serialport:p + qt6-shadertools:p + qt6-5compat:p + qt6-scxml:p + qt6-tools:p + boost:p + portaudio:p + fftw:p + ffmpeg:p + SDL2:p + + - name: Dependencies + shell: msys2 {0} + run: | + ./ci/mingw.deps.sh + + - name: Build + shell: msys2 {0} + run: | + ./ci/mingw.build.sh diff --git a/3rdparty/Spout/SpoutUtils.cpp b/3rdparty/Spout/SpoutUtils.cpp index a02567cd64..faf9da6055 100644 --- a/3rdparty/Spout/SpoutUtils.cpp +++ b/3rdparty/Spout/SpoutUtils.cpp @@ -742,35 +742,7 @@ namespace spoututils { // Get the default log file path std::string _getLogPath() { - char logpath[MAX_PATH]; - logpath[0] = 0; - - // Retrieve user %appdata% environment variable - char *appdatapath = nullptr; - size_t len; - bool bSuccess = true; - errno_t err = _dupenv_s(&appdatapath, &len, "APPDATA"); - if (err == 0 && appdatapath) { - strcpy_s(logpath, MAX_PATH, appdatapath); - strcat_s(logpath, MAX_PATH, "\\Spout"); - if (_access(logpath, 0) == -1) { - if (!CreateDirectoryA(logpath, NULL)) { - bSuccess = false; - } - } - } - else { - bSuccess = false; - } - - if (!bSuccess) { - // _dupenv_s or CreateDirectory failed - // Find the path of the executable - GetModuleFileNameA(NULL, (LPSTR)logpath, sizeof(logpath)); - PathRemoveFileSpecA((LPSTR)logpath); - } - - return logpath; + return {}; } // Get the name for the current log level diff --git a/3rdparty/Spout/SpoutUtils.h b/3rdparty/Spout/SpoutUtils.h index d061103e40..b428e78afc 100644 --- a/3rdparty/Spout/SpoutUtils.h +++ b/3rdparty/Spout/SpoutUtils.h @@ -52,7 +52,7 @@ // a Visual studio 2017 compiler. "#include " will then fail. // If this is a problem, remove _MSC_VER_ and manually enable/disable the USE_CHRONO define. // -#if _MSC_VER >= 1900 || defined (__clang__) +#if _MSC_VER >= 1900 || defined (__clang__) || (__cplusplus >= 201703L) #define USE_CHRONO #endif diff --git a/ci/mingw.build.sh b/ci/mingw.build.sh index f31d12cb05..db07111661 100755 --- a/ci/mingw.build.sh +++ b/ci/mingw.build.sh @@ -2,15 +2,23 @@ export SCORE_DIR=$PWD -mkdir -p /build || true -cd /build +mkdir -p build || true +cd build + +# FIXME vst3 error in sdk hosting... +# FIXME windres error.. https://gitlab.kitware.com/cmake/cmake/-/merge_requests/24 + cmake $SCORE_DIR \ - -GNinja \ + -G"MinGW Makefiles" \ + -DQT_VERSION="Qt6;6.2" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=install \ + -DSCORE_DISABLED_PLUGINS=score-plugin-vst3 \ -DCMAKE_CXX_FLAGS="-Wa,-mbig-obj" \ - -DSCORE_DYNAMIC_PLUGINS=1 \ + -DCMAKE_C_USE_RESPONSE_FILE_FOR_OBJECTS=1 \ + -DCMAKE_CXX_USE_RESPONSE_FILE_FOR_OBJECTS=1 \ + -DCMAKE_NINJA_FORCE_RESPONSE_FILE=1 \ -DSCORE_PCH=1 cmake --build . diff --git a/ci/mingw.deps.sh b/ci/mingw.deps.sh index 1a66e00295..11ebaa346e 100755 --- a/ci/mingw.deps.sh +++ b/ci/mingw.deps.sh @@ -1,20 +1,15 @@ #!/bin/bash -eux -sudo pacman -S --needed --noconfirm \ - mingw-w64-qt5-base mingw-w64-qt5-declarative mingw-w64-qt5-serialport mingw-w64-qt5-websockets \ - mingw-w64-portaudio \ - mingw-w64-fftw \ - mingw-w64-ffmpeg \ - ninja \ - mingw-w64-gcc +# Done in the GH action for caching: +# pacboy -S --needed --noconfirm \ +# cmake:p ninja:p toolchain:p \ +# qt6-base:p qt6-declarative:p qt6-websockets:p qt6-serialport:p \ +# qt6-shadertools:p qt6-5compat:p qt6-scxml:p qt6-tools:p \ +# boost:p portaudio:p fftw:p ffmpeg:p \ +# SDL2:p -# sudo pacman -S --needed --noconfirm \ -# mingw-w64-x86_64-qt5 \ -# mingw-w64-x86_64-portaudio \ -# mingw-w64-x86_64-fftw \ -# mingw-w64-x86_64-ffmpeg \ -# mingw-w64-x86_64-cmake \ -# mingw-w64-x86_64-ninja \ -# mingw-w64-x86_64-gcc +# TODO: +# jack2:p not available on clang? +# lv2 suil lilv -source ci/common.deps.sh +# source ci/common.deps.sh diff --git a/ci/win32store.build.cmd b/ci/win32store.build.cmd index 757c877b39..68b38c801e 100644 --- a/ci/win32store.build.cmd +++ b/ci/win32store.build.cmd @@ -1,19 +1,30 @@ +set SCORE_DIR=%cd% mkdir build cd build +mkdir install + set PATH=%PATH%;c:\ossia-sdk\llvm\bin -cmake -GNinja %BUILD_SOURCESDIRECTORY% ^ +cmake -GNinja %SCORE_DIR% ^ -DCMAKE_C_COMPILER=c:/ossia-sdk/llvm/bin/clang.exe ^ -DCMAKE_CXX_COMPILER=c:/ossia-sdk/llvm/bin/clang++.exe ^ + -DCMAKE_C_FLAGS=" -flto -fno-stack-protector -Ofast -fno-finite-math-only -D_WIN32_WINNT_=0x0A00 -DWINVER=0x0A00 " ^ + -DCMAKE_CXX_FLAGS=" -flto -fno-stack-protector -Ofast -fno-finite-math-only -D_WIN32_WINNT_=0x0A00 -DWINVER=0x0A00 " ^ -DOSSIA_SDK=c:\ossia-sdk ^ -DCMAKE_INSTALL_PREFIX=install ^ -DCMAKE_BUILD_TYPE=Release ^ -DCMAKE_UNITY_BUILD=1 ^ -DOSSIA_STATIC_EXPORT=0 ^ -DSCORE_INSTALL_HEADERS=0 ^ - -DSCORE_DISABLED_PLUGINS="score-plugin-faust;score-plugin-jit;score-plugin-pd" ^ + -DSCORE_DISABLED_PLUGINS="score-plugin-faust;score-plugin-jit" ^ -DSCORE_DEPLOYMENT_BUILD=1 ^ - -DSCORE_MSSTORE_DEPLOYMENT=1 + -DSCORE_MSSTORE_DEPLOYMENT=1 ^ + -DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=1 cmake --build . -cmake --build . --target install +cmake --build . --target install/strip +REM +REM llvm-strip install/score.exe +REM llvm-strip install/ossia-score-vstpuppet.exe +REM llvm-strip install/ossia-score-vst3puppet.exe +REM diff --git a/ci/win32store.cert.ps1 b/ci/win32store.cert.ps1 new file mode 100644 index 0000000000..b484b9e1e2 --- /dev/null +++ b/ci/win32store.cert.ps1 @@ -0,0 +1,14 @@ +$cert = New-SelfSignedCertificate ` + -Type Custom ` + -Subject $Env:OSSIA_WIN32_CERT_SUBJECT ` + -KeyUsage DigitalSignature ` + -FriendlyName "ossia.io" ` + -CertStoreLocation "Cert:\CurrentUser\My" ` + -TextExtension @("2.5.29.37={text}1.3.6.1.5.5.7.3.3", "2.5.29.19={text}") + +$password = ConvertTo-SecureString -String $Env:OSSIA_WIN32_CERT_PASSWORD -Force -AsPlainText + +Export-PfxCertificate ` + -cert "Cert:\CurrentUser\My\$($cert.Thumbprint)" ` + -FilePath ossia-selfsigned.pfx ` + -Password $password diff --git a/ci/win32store.deploy.cmd b/ci/win32store.deploy.cmd index 22ea237041..6b1b822397 100644 --- a/ci/win32store.deploy.cmd +++ b/ci/win32store.deploy.cmd @@ -1,22 +1,47 @@ -set SCORE_PATH=%CD% -cd build -cd install - -REM makepri createconfig /cf priconfig.xml /dq en-US -REM makepri.exe new /pr %cd% /cf %cd%\priconfig.xml +@echo off +set SCORE_PATH=%cd% +set BUILD_PATH=%cd%\build +set OSSIA_WIN32_CERTIFICATE=%SCORE_PATH%\ossia-selfsigned.pfx +cd %BUILD_PATH% +rmdir output /s +cd install +REM Cleanup unused things +rmdir faust\docs /s + +del /s /q *.eot +del /s /q *.ttf +del /s /q *.woff +del /s /q *.md +del /s /q *.css +del /s /q *.html +del /s /q *.gz +del /s /q *.jpg +del /s /q *.jpeg +del /s /q *.xml +del /s /q *.pri + +REM Create resource files +REM (Necessary for multi-scale images, etc.) +makepri.exe createconfig /cf priconfig.xml /dq en-US +makepri.exe new /pr %cd% /cf %cd%\priconfig.xml /mn %cd%\manifests\Package.appxmanifest + +REM Embed manifest inside score.exe mt.exe -nologo -manifest score.exe.manifest -outputresource:"score.exe;#1" -signtool sign /fd sha256 /a /f %OSSIA_WIN32_CERTIFICATE% /p %OSSIA_WIN32_CERTIFICATE_PASSWORD% /debug score.exe -signtool sign /fd sha256 /a /f %OSSIA_WIN32_CERTIFICATE% /p %OSSIA_WIN32_CERTIFICATE_PASSWORD% /debug libc++.dll -signtool sign /fd sha256 /a /f %OSSIA_WIN32_CERTIFICATE% /p %OSSIA_WIN32_CERTIFICATE_PASSWORD% /debug libunwind.dll -signtool sign /fd sha256 /a /f %OSSIA_WIN32_CERTIFICATE% /p %OSSIA_WIN32_CERTIFICATE_PASSWORD% /debug libwinpthread-1.dll -signtool sign /fd sha256 /a /f %OSSIA_WIN32_CERTIFICATE% /p %OSSIA_WIN32_CERTIFICATE_PASSWORD% /debug ossia-score-vstpuppet.exe -signtool sign /fd sha256 /a /f %OSSIA_WIN32_CERTIFICATE% /p %OSSIA_WIN32_CERTIFICATE_PASSWORD% /debug ossia-score-vst3puppet.exe +REM Sign every binary file +signtool sign /fd sha256 /a /f %OSSIA_WIN32_CERTIFICATE% /p %OSSIA_WIN32_CERT_PASSWORD% score.exe +signtool sign /fd sha256 /a /f %OSSIA_WIN32_CERTIFICATE% /p %OSSIA_WIN32_CERT_PASSWORD% ossia-score-vstpuppet.exe +signtool sign /fd sha256 /a /f %OSSIA_WIN32_CERTIFICATE% /p %OSSIA_WIN32_CERT_PASSWORD% ossia-score-vst3puppet.exe +signtool sign /fd sha256 /a /f %OSSIA_WIN32_CERTIFICATE% /p %OSSIA_WIN32_CERT_PASSWORD% libc++.dll +signtool sign /fd sha256 /a /f %OSSIA_WIN32_CERTIFICATE% /p %OSSIA_WIN32_CERT_PASSWORD% libunwind.dll +signtool sign /fd sha256 /a /f %OSSIA_WIN32_CERTIFICATE% /p %OSSIA_WIN32_CERT_PASSWORD% libwinpthread-1.dll -makeappx build /v /f %SCORE_PATH%\cmake\Deployment\Windows\store\PackagingLayout.xml /op ..\output /bv %GITTAGNOV%.0 /pv %GITTAGNOV%.0 /ca +REM Create the appxbundle +makeappx build /v /f %SCORE_PATH%\cmake\Deployment\Windows\store\PackagingLayout.xml /op %SCORE_PATH%\output /bv %GITTAGNOV%.0 /pv %GITTAGNOV%.0 /ca -signtool sign /fd sha256 /a /f %OSSIA_WIN32_CERTIFICATE% /p %OSSIA_WIN32_CERTIFICATE_PASSWORD% /debug %SCORE_PATH%\build\output\ossia-score.appxbundle +REM Sign the appxbundle +signtool sign /fd sha256 /a /f %OSSIA_WIN32_CERTIFICATE% /p %OSSIA_WIN32_CERT_PASSWORD% %SCORE_PATH%\output\ossia-score.appxbundle diff --git a/cmake/Deployment/Windows/store/PackagingLayout.xml b/cmake/Deployment/Windows/store/PackagingLayout.xml index 4a3f04d5df..ee0c9b011d 100644 --- a/cmake/Deployment/Windows/store/PackagingLayout.xml +++ b/cmake/Deployment/Windows/store/PackagingLayout.xml @@ -3,12 +3,16 @@ + + + + diff --git a/cmake/Deployment/Windows/store/images/LargeTile.scale-100.png b/cmake/Deployment/Windows/store/images/LargeTile.scale-100.png new file mode 100644 index 0000000000..6482de1368 Binary files /dev/null and b/cmake/Deployment/Windows/store/images/LargeTile.scale-100.png differ diff --git a/cmake/Deployment/Windows/store/images/LargeTile.scale-125.png b/cmake/Deployment/Windows/store/images/LargeTile.scale-125.png new file mode 100644 index 0000000000..3adaa275ae Binary files /dev/null and b/cmake/Deployment/Windows/store/images/LargeTile.scale-125.png differ diff --git a/cmake/Deployment/Windows/store/images/LargeTile.scale-150.png b/cmake/Deployment/Windows/store/images/LargeTile.scale-150.png new file mode 100644 index 0000000000..4c43627fde Binary files /dev/null and b/cmake/Deployment/Windows/store/images/LargeTile.scale-150.png differ diff --git a/cmake/Deployment/Windows/store/images/LargeTile.scale-200.png b/cmake/Deployment/Windows/store/images/LargeTile.scale-200.png new file mode 100644 index 0000000000..2c7ae0b757 Binary files /dev/null and b/cmake/Deployment/Windows/store/images/LargeTile.scale-200.png differ diff --git a/cmake/Deployment/Windows/store/images/LargeTile.scale-400.png b/cmake/Deployment/Windows/store/images/LargeTile.scale-400.png new file mode 100644 index 0000000000..4d66996249 Binary files /dev/null and b/cmake/Deployment/Windows/store/images/LargeTile.scale-400.png differ diff --git a/cmake/Deployment/Windows/store/images/SmallTile.scale-100.png b/cmake/Deployment/Windows/store/images/SmallTile.scale-100.png new file mode 100644 index 0000000000..2106c8eaeb Binary files /dev/null and b/cmake/Deployment/Windows/store/images/SmallTile.scale-100.png differ diff --git a/cmake/Deployment/Windows/store/images/SmallTile.scale-125.png b/cmake/Deployment/Windows/store/images/SmallTile.scale-125.png new file mode 100644 index 0000000000..e4dfe06617 Binary files /dev/null and b/cmake/Deployment/Windows/store/images/SmallTile.scale-125.png differ diff --git a/cmake/Deployment/Windows/store/images/SmallTile.scale-150.png b/cmake/Deployment/Windows/store/images/SmallTile.scale-150.png new file mode 100644 index 0000000000..27959d0e88 Binary files /dev/null and b/cmake/Deployment/Windows/store/images/SmallTile.scale-150.png differ diff --git a/cmake/Deployment/Windows/store/images/SmallTile.scale-200.png b/cmake/Deployment/Windows/store/images/SmallTile.scale-200.png new file mode 100644 index 0000000000..c77dacbe37 Binary files /dev/null and b/cmake/Deployment/Windows/store/images/SmallTile.scale-200.png differ diff --git a/cmake/Deployment/Windows/store/images/SmallTile.scale-400.png b/cmake/Deployment/Windows/store/images/SmallTile.scale-400.png new file mode 100644 index 0000000000..1416c1cf27 Binary files /dev/null and b/cmake/Deployment/Windows/store/images/SmallTile.scale-400.png differ diff --git a/cmake/Deployment/Windows/store/images/SplashScreen.scale-100.png b/cmake/Deployment/Windows/store/images/SplashScreen.scale-100.png new file mode 100644 index 0000000000..11a65c01ea Binary files /dev/null and b/cmake/Deployment/Windows/store/images/SplashScreen.scale-100.png differ diff --git a/cmake/Deployment/Windows/store/images/SplashScreen.scale-125.png b/cmake/Deployment/Windows/store/images/SplashScreen.scale-125.png new file mode 100644 index 0000000000..54825ff4e1 Binary files /dev/null and b/cmake/Deployment/Windows/store/images/SplashScreen.scale-125.png differ diff --git a/cmake/Deployment/Windows/store/images/SplashScreen.scale-150.png b/cmake/Deployment/Windows/store/images/SplashScreen.scale-150.png new file mode 100644 index 0000000000..fcc2e47a88 Binary files /dev/null and b/cmake/Deployment/Windows/store/images/SplashScreen.scale-150.png differ diff --git a/cmake/Deployment/Windows/store/images/SplashScreen.scale-200.png b/cmake/Deployment/Windows/store/images/SplashScreen.scale-200.png new file mode 100644 index 0000000000..603ef36836 Binary files /dev/null and b/cmake/Deployment/Windows/store/images/SplashScreen.scale-200.png differ diff --git a/cmake/Deployment/Windows/store/images/SplashScreen.scale-400.png b/cmake/Deployment/Windows/store/images/SplashScreen.scale-400.png new file mode 100644 index 0000000000..40bbe21cf0 Binary files /dev/null and b/cmake/Deployment/Windows/store/images/SplashScreen.scale-400.png differ diff --git a/cmake/Deployment/Windows/store/images/Square150x150Logo.scale-100.png b/cmake/Deployment/Windows/store/images/Square150x150Logo.scale-100.png new file mode 100644 index 0000000000..3bf64a24e4 Binary files /dev/null and b/cmake/Deployment/Windows/store/images/Square150x150Logo.scale-100.png differ diff --git a/cmake/Deployment/Windows/store/images/Square150x150Logo.scale-125.png b/cmake/Deployment/Windows/store/images/Square150x150Logo.scale-125.png new file mode 100644 index 0000000000..434085874f Binary files /dev/null and b/cmake/Deployment/Windows/store/images/Square150x150Logo.scale-125.png differ diff --git a/cmake/Deployment/Windows/store/images/Square150x150Logo.scale-150.png b/cmake/Deployment/Windows/store/images/Square150x150Logo.scale-150.png new file mode 100644 index 0000000000..a3b9c8191c Binary files /dev/null and b/cmake/Deployment/Windows/store/images/Square150x150Logo.scale-150.png differ diff --git a/cmake/Deployment/Windows/store/images/Square150x150Logo.scale-200.png b/cmake/Deployment/Windows/store/images/Square150x150Logo.scale-200.png new file mode 100644 index 0000000000..1204996925 Binary files /dev/null and b/cmake/Deployment/Windows/store/images/Square150x150Logo.scale-200.png differ diff --git a/cmake/Deployment/Windows/store/images/Square150x150Logo.scale-400.png b/cmake/Deployment/Windows/store/images/Square150x150Logo.scale-400.png new file mode 100644 index 0000000000..fa36c5a69e Binary files /dev/null and b/cmake/Deployment/Windows/store/images/Square150x150Logo.scale-400.png differ diff --git a/cmake/Deployment/Windows/store/images/Square44x44Logo.altform-lightunplated_targetsize-16.png b/cmake/Deployment/Windows/store/images/Square44x44Logo.altform-lightunplated_targetsize-16.png new file mode 100644 index 0000000000..3803517a23 Binary files /dev/null and b/cmake/Deployment/Windows/store/images/Square44x44Logo.altform-lightunplated_targetsize-16.png differ diff --git a/cmake/Deployment/Windows/store/images/Square44x44Logo.altform-lightunplated_targetsize-24.png b/cmake/Deployment/Windows/store/images/Square44x44Logo.altform-lightunplated_targetsize-24.png new file mode 100644 index 0000000000..13cd03c746 Binary files /dev/null and b/cmake/Deployment/Windows/store/images/Square44x44Logo.altform-lightunplated_targetsize-24.png differ diff --git a/cmake/Deployment/Windows/store/images/Square44x44Logo.altform-lightunplated_targetsize-256.png b/cmake/Deployment/Windows/store/images/Square44x44Logo.altform-lightunplated_targetsize-256.png new file mode 100644 index 0000000000..a16d51bcad Binary files /dev/null and b/cmake/Deployment/Windows/store/images/Square44x44Logo.altform-lightunplated_targetsize-256.png differ diff --git a/cmake/Deployment/Windows/store/images/Square44x44Logo.altform-lightunplated_targetsize-32.png b/cmake/Deployment/Windows/store/images/Square44x44Logo.altform-lightunplated_targetsize-32.png new file mode 100644 index 0000000000..810e8f16bc Binary files /dev/null and b/cmake/Deployment/Windows/store/images/Square44x44Logo.altform-lightunplated_targetsize-32.png differ diff --git a/cmake/Deployment/Windows/store/images/Square44x44Logo.altform-lightunplated_targetsize-48.png b/cmake/Deployment/Windows/store/images/Square44x44Logo.altform-lightunplated_targetsize-48.png new file mode 100644 index 0000000000..b6f8655abc Binary files /dev/null and b/cmake/Deployment/Windows/store/images/Square44x44Logo.altform-lightunplated_targetsize-48.png differ diff --git a/cmake/Deployment/Windows/store/images/Square44x44Logo.altform-unplated_targetsize-16.png b/cmake/Deployment/Windows/store/images/Square44x44Logo.altform-unplated_targetsize-16.png new file mode 100644 index 0000000000..79920d89f9 Binary files /dev/null and b/cmake/Deployment/Windows/store/images/Square44x44Logo.altform-unplated_targetsize-16.png differ diff --git a/cmake/Deployment/Windows/store/images/Square44x44Logo.altform-unplated_targetsize-256.png b/cmake/Deployment/Windows/store/images/Square44x44Logo.altform-unplated_targetsize-256.png new file mode 100644 index 0000000000..355140452a Binary files /dev/null and b/cmake/Deployment/Windows/store/images/Square44x44Logo.altform-unplated_targetsize-256.png differ diff --git a/cmake/Deployment/Windows/store/images/Square44x44Logo.altform-unplated_targetsize-32.png b/cmake/Deployment/Windows/store/images/Square44x44Logo.altform-unplated_targetsize-32.png new file mode 100644 index 0000000000..0baf092e0d Binary files /dev/null and b/cmake/Deployment/Windows/store/images/Square44x44Logo.altform-unplated_targetsize-32.png differ diff --git a/cmake/Deployment/Windows/store/images/Square44x44Logo.altform-unplated_targetsize-48.png b/cmake/Deployment/Windows/store/images/Square44x44Logo.altform-unplated_targetsize-48.png new file mode 100644 index 0000000000..5356f83534 Binary files /dev/null and b/cmake/Deployment/Windows/store/images/Square44x44Logo.altform-unplated_targetsize-48.png differ diff --git a/cmake/Deployment/Windows/store/images/Square44x44Logo.scale-100.png b/cmake/Deployment/Windows/store/images/Square44x44Logo.scale-100.png new file mode 100644 index 0000000000..5da6223505 Binary files /dev/null and b/cmake/Deployment/Windows/store/images/Square44x44Logo.scale-100.png differ diff --git a/cmake/Deployment/Windows/store/images/Square44x44Logo.scale-125.png b/cmake/Deployment/Windows/store/images/Square44x44Logo.scale-125.png new file mode 100644 index 0000000000..15e84fb316 Binary files /dev/null and b/cmake/Deployment/Windows/store/images/Square44x44Logo.scale-125.png differ diff --git a/cmake/Deployment/Windows/store/images/Square44x44Logo.scale-150.png b/cmake/Deployment/Windows/store/images/Square44x44Logo.scale-150.png new file mode 100644 index 0000000000..7be0fb4fd7 Binary files /dev/null and b/cmake/Deployment/Windows/store/images/Square44x44Logo.scale-150.png differ diff --git a/cmake/Deployment/Windows/store/images/Square44x44Logo.scale-200.png b/cmake/Deployment/Windows/store/images/Square44x44Logo.scale-200.png new file mode 100644 index 0000000000..bec1a15ae4 Binary files /dev/null and b/cmake/Deployment/Windows/store/images/Square44x44Logo.scale-200.png differ diff --git a/cmake/Deployment/Windows/store/images/Square44x44Logo.scale-400.png b/cmake/Deployment/Windows/store/images/Square44x44Logo.scale-400.png new file mode 100644 index 0000000000..e5455ba291 Binary files /dev/null and b/cmake/Deployment/Windows/store/images/Square44x44Logo.scale-400.png differ diff --git a/cmake/Deployment/Windows/store/images/Square44x44Logo.targetsize-16.png b/cmake/Deployment/Windows/store/images/Square44x44Logo.targetsize-16.png new file mode 100644 index 0000000000..0735e16e99 Binary files /dev/null and b/cmake/Deployment/Windows/store/images/Square44x44Logo.targetsize-16.png differ diff --git a/cmake/Deployment/Windows/store/images/Square44x44Logo.targetsize-24.png b/cmake/Deployment/Windows/store/images/Square44x44Logo.targetsize-24.png new file mode 100644 index 0000000000..3d77666bb1 Binary files /dev/null and b/cmake/Deployment/Windows/store/images/Square44x44Logo.targetsize-24.png differ diff --git a/cmake/Deployment/Windows/store/images/Square44x44Logo.targetsize-24_altform-unplated.png b/cmake/Deployment/Windows/store/images/Square44x44Logo.targetsize-24_altform-unplated.png new file mode 100644 index 0000000000..a2817c40b2 Binary files /dev/null and b/cmake/Deployment/Windows/store/images/Square44x44Logo.targetsize-24_altform-unplated.png differ diff --git a/cmake/Deployment/Windows/store/images/Square44x44Logo.targetsize-256.png b/cmake/Deployment/Windows/store/images/Square44x44Logo.targetsize-256.png new file mode 100644 index 0000000000..88042e2812 Binary files /dev/null and b/cmake/Deployment/Windows/store/images/Square44x44Logo.targetsize-256.png differ diff --git a/cmake/Deployment/Windows/store/images/Square44x44Logo.targetsize-32.png b/cmake/Deployment/Windows/store/images/Square44x44Logo.targetsize-32.png new file mode 100644 index 0000000000..2c9ad4aad1 Binary files /dev/null and b/cmake/Deployment/Windows/store/images/Square44x44Logo.targetsize-32.png differ diff --git a/cmake/Deployment/Windows/store/images/Square44x44Logo.targetsize-48.png b/cmake/Deployment/Windows/store/images/Square44x44Logo.targetsize-48.png new file mode 100644 index 0000000000..d0de09e1bb Binary files /dev/null and b/cmake/Deployment/Windows/store/images/Square44x44Logo.targetsize-48.png differ diff --git a/cmake/Deployment/Windows/store/images/StoreLogo.scale-100.png b/cmake/Deployment/Windows/store/images/StoreLogo.scale-100.png new file mode 100644 index 0000000000..fd137a906c Binary files /dev/null and b/cmake/Deployment/Windows/store/images/StoreLogo.scale-100.png differ diff --git a/cmake/Deployment/Windows/store/images/StoreLogo.scale-125.png b/cmake/Deployment/Windows/store/images/StoreLogo.scale-125.png new file mode 100644 index 0000000000..39745b5116 Binary files /dev/null and b/cmake/Deployment/Windows/store/images/StoreLogo.scale-125.png differ diff --git a/cmake/Deployment/Windows/store/images/StoreLogo.scale-150.png b/cmake/Deployment/Windows/store/images/StoreLogo.scale-150.png new file mode 100644 index 0000000000..21977debd8 Binary files /dev/null and b/cmake/Deployment/Windows/store/images/StoreLogo.scale-150.png differ diff --git a/cmake/Deployment/Windows/store/images/StoreLogo.scale-200.png b/cmake/Deployment/Windows/store/images/StoreLogo.scale-200.png new file mode 100644 index 0000000000..04b560c087 Binary files /dev/null and b/cmake/Deployment/Windows/store/images/StoreLogo.scale-200.png differ diff --git a/cmake/Deployment/Windows/store/images/StoreLogo.scale-400.png b/cmake/Deployment/Windows/store/images/StoreLogo.scale-400.png new file mode 100644 index 0000000000..0f7f6bf22f Binary files /dev/null and b/cmake/Deployment/Windows/store/images/StoreLogo.scale-400.png differ diff --git a/cmake/Deployment/Windows/store/images/Wide310x150Logo.scale-100.png b/cmake/Deployment/Windows/store/images/Wide310x150Logo.scale-100.png new file mode 100644 index 0000000000..0afd60720e Binary files /dev/null and b/cmake/Deployment/Windows/store/images/Wide310x150Logo.scale-100.png differ diff --git a/cmake/Deployment/Windows/store/images/Wide310x150Logo.scale-125.png b/cmake/Deployment/Windows/store/images/Wide310x150Logo.scale-125.png new file mode 100644 index 0000000000..076097ea7e Binary files /dev/null and b/cmake/Deployment/Windows/store/images/Wide310x150Logo.scale-125.png differ diff --git a/cmake/Deployment/Windows/store/images/Wide310x150Logo.scale-150.png b/cmake/Deployment/Windows/store/images/Wide310x150Logo.scale-150.png new file mode 100644 index 0000000000..39a1646a9c Binary files /dev/null and b/cmake/Deployment/Windows/store/images/Wide310x150Logo.scale-150.png differ diff --git a/cmake/Deployment/Windows/store/images/Wide310x150Logo.scale-200.png b/cmake/Deployment/Windows/store/images/Wide310x150Logo.scale-200.png new file mode 100644 index 0000000000..11a65c01ea Binary files /dev/null and b/cmake/Deployment/Windows/store/images/Wide310x150Logo.scale-200.png differ diff --git a/cmake/Deployment/Windows/store/images/Wide310x150Logo.scale-400.png b/cmake/Deployment/Windows/store/images/Wide310x150Logo.scale-400.png new file mode 100644 index 0000000000..603ef36836 Binary files /dev/null and b/cmake/Deployment/Windows/store/images/Wide310x150Logo.scale-400.png differ diff --git a/cmake/Deployment/Windows/store/images/ossia-150x150.png b/cmake/Deployment/Windows/store/images/ossia-150x150.png deleted file mode 100644 index 98ca1883a3..0000000000 Binary files a/cmake/Deployment/Windows/store/images/ossia-150x150.png and /dev/null differ diff --git a/cmake/Deployment/Windows/store/images/ossia-44x44.png b/cmake/Deployment/Windows/store/images/ossia-44x44.png deleted file mode 100644 index 1f70391961..0000000000 Binary files a/cmake/Deployment/Windows/store/images/ossia-44x44.png and /dev/null differ diff --git a/cmake/Deployment/Windows/store/images/ossia-50x50.png b/cmake/Deployment/Windows/store/images/ossia-50x50.png deleted file mode 100644 index 2ef37df855..0000000000 Binary files a/cmake/Deployment/Windows/store/images/ossia-50x50.png and /dev/null differ diff --git a/cmake/Deployment/Windows/store/manifests/Package.appxmanifest.in b/cmake/Deployment/Windows/store/manifests/Package.appxmanifest.in index aa5566503a..c55cf1205e 100644 --- a/cmake/Deployment/Windows/store/manifests/Package.appxmanifest.in +++ b/cmake/Deployment/Windows/store/manifests/Package.appxmanifest.in @@ -16,7 +16,7 @@ ossia score ossia.io - images/ossia-50x50.png + images/StoreLogo.png @@ -30,10 +30,11 @@ - + + diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index f162fcdc3d..3d8593c6f1 100755 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -86,7 +86,19 @@ if(MSVC) endif() if(WIN32) - target_sources(${APPNAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../lib/resources/score.rc") + if(MSVC OR ("${CMAKE_RC_COMPILER}" MATCHES ".*llvm.*")) + target_sources(${APPNAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../lib/resources/score.rc") + else() + add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/score-icon.obj" + COMMAND "${CMAKE_RC_COMPILER}" + -D GCC_WINDRES + -I "${CMAKE_CURRENT_SOURCE_DIR}" + -I "${CMAKE_CURRENT_BINARY_DIR}" + -o "${CMAKE_CURRENT_BINARY_DIR}/score-icon.obj" + -i "${CMAKE_CURRENT_SOURCE_DIR}/../lib/resources/score.rc" + VERBATIM) + target_sources(${APPNAME} PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/score-icon.obj") + endif() endif() if(UNIX AND NOT APPLE)