summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2017-02-26 14:25:55 +0100
committerRobin Gareus <robin@gareus.org>2017-02-26 14:26:13 +0100
commit96ec230c32dd9910d9875a37d5e60aeb15219dd8 (patch)
tree1caf5543e15c1a0c6c3bac693ba3ce6915766a6c
parent4e96285ba557c2523b402105f3d4ac030ab7aa95 (diff)
Fix windows builds, rename icons following 4e96285ba5
-rw-r--r--gtk2_ardour/icons/Ardour.ico (renamed from gtk2_ardour/icons/ardour.ico)bin287558 -> 287558 bytes
-rw-r--r--gtk2_ardour/icons/ArdourBug.ico (renamed from gtk2_ardour/icons/ardour_bug.ico)bin119654 -> 119654 bytes
-rwxr-xr-xtools/x-win/package.sh4
3 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/icons/ardour.ico b/gtk2_ardour/icons/Ardour.ico
index 9cf40da9f0..9cf40da9f0 100644
--- a/gtk2_ardour/icons/ardour.ico
+++ b/gtk2_ardour/icons/Ardour.ico
Binary files differ
diff --git a/gtk2_ardour/icons/ardour_bug.ico b/gtk2_ardour/icons/ArdourBug.ico
index d72afb00e3..d72afb00e3 100644
--- a/gtk2_ardour/icons/ardour_bug.ico
+++ b/gtk2_ardour/icons/ArdourBug.ico
Binary files differ
diff --git a/tools/x-win/package.sh b/tools/x-win/package.sh
index 67ee61f5ed..290c2b4969 100755
--- a/tools/x-win/package.sh
+++ b/tools/x-win/package.sh
@@ -190,7 +190,7 @@ cp -r $PREFIX/etc/${LOWERCASE_DIRNAME}/* $DESTDIR/share/${LOWERCASE_DIRNAME}/
cp COPYING $DESTDIR/share/
cp gtk2_ardour/icons/${PRODUCT_ICON} $DESTDIR/share/
-cp gtk2_ardour/icons/ardour_bug.ico $DESTDIR/share/
+cp gtk2_ardour/icons/ArdourBug.ico $DESTDIR/share/
#prefer built-in defaults
rm -f $DESTDIR/share/${LOWERCASE_DIRNAME}/system_config
@@ -448,7 +448,7 @@ EOF
if test -f "$DESTDIR/debug.bat"; then
cat >> $NSISFILE << EOF
- CreateShortCut "\$SMPROGRAMS\\${PRODUCT_ID}${SFX}\\${PROGRAM_NAME}${PROGRAM_VERSION} GDB.lnk" "\$INSTDIR\\debug.bat" "" "\$INSTDIR\\share\\ardour_bug.ico" 0
+ CreateShortCut "\$SMPROGRAMS\\${PRODUCT_ID}${SFX}\\${PROGRAM_NAME}${PROGRAM_VERSION} GDB.lnk" "\$INSTDIR\\debug.bat" "" "\$INSTDIR\\share\\ArdourBug.ico" 0
EOF
fi