diff --git a/.travis.yml b/.travis.yml index 2fe3adb7..61da0e10 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,6 @@ addons: - libasound2-dev - libxtst-dev # Scripting dependencies - - inkscape - imagemagick cache: diff --git a/appveyor.yml b/appveyor.yml index 174e28b0..92114608 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -25,7 +25,7 @@ environment: secure: fBQJmUDK/EgEUWjjbo6bWcitczeFTJZT4OZ3ZZ4FoUT6soBsTWPQJnr8YEVMFhGP install: - - choco install -y doxygen.portable InnoSetup inkscape imagemagick.tool + - choco install -y doxygen.portable InnoSetup imagemagick.tool - python -m pip install sphinx breathe sphinx_rtd_theme - npm install - .\node_modules\.bin\bower install diff --git a/scripts/create_ico.js b/scripts/create_ico.js index e4fcb4b8..0b0d7bb8 100644 --- a/scripts/create_ico.js +++ b/scripts/create_ico.js @@ -6,6 +6,9 @@ const svgPath = path.join('resources', 'icon.svg'); const buildDirectory = path.join('build', 'icon'); const outputPath = path.join(buildDirectory, 'icon.ico'); +const svgSize = 192; +const svgDPI = 90; + const sizes = [16, 20, 24, 30, 32, 36, 40, 48, 60, 64, 72, 80, 96, 128, 256]; fs.mkdirsSync(buildDirectory); @@ -15,15 +18,13 @@ sizes.forEach((size) => { const pngFile = path.join(buildDirectory, `icon-${size}.png`); convertArgs.push(pngFile); - helpers.safeExecFileSync('inkscape', [ - '-z', - '-e', - pngFile, - '-w', - size, - '-h', - size, + helpers.safeExecFileSync('convert', [ + '-density', + (size / svgSize) * svgDPI, + '-background', + 'none', svgPath, + pngFile, ]); });