Remove ICO file from repository

Instead generate it as a pre-build step. It can't be generated as part
of the CMake build process because MSVC changes the PATH so that another
convert.exe conflicts with imagemagick's.
This commit is contained in:
Oliver Hamlet
2016-12-01 19:03:12 +00:00
parent 7e2f071aec
commit c80d1eb5f7
7 changed files with 13 additions and 8 deletions
+1 -3
View File
@@ -4,7 +4,7 @@ const path = require('path');
const svgPath = path.join('resources', 'icon.svg');
const buildDirectory = path.join('build', 'icon');
const outputPath = path.join('resources', 'icon.ico');
const outputPath = path.join(buildDirectory, 'icon.ico');
const sizes = [16, 20, 24, 30, 32, 36, 40, 48, 60, 64, 72, 80, 96, 128, 256];
@@ -29,5 +29,3 @@ sizes.forEach((size) => {
convertArgs.push(outputPath);
childProcess.execFileSync('convert', convertArgs);
fs.removeSync(buildDirectory);
+1 -1
View File
@@ -47,7 +47,7 @@ DefaultDirName={pf}\{#MyAppName}
SourceDir=..\
OutputBaseFilename=LOOT Installer
OutputDir=build
SetupIconFile=resources\icon.ico
SetupIconFile=build\icon\icon.ico
Compression=lzma
SolidCompression=yes
DisableDirPage=no