From 982a363630c095a2fcffb5ea2c7ec59e21c63e38 Mon Sep 17 00:00:00 2001
From: rderooy <robert.de.rooy@gmail.com>
Date: Wed, 9 Sep 2020 09:14:11 +0200
Subject: [PATCH] Move src/dosbox.ico to contrib/icons/dosbox-x.ixo

This could break the windows build, which I did not test!
---
 Makefile.am                                  |   8 ++++----
 src/dosbox.ico => contrib/icons/dosbox-x.ico | Bin
 src/CMakeLists.txt                           |   2 +-
 src/Makefile.am                              |   2 +-
 src/winres.rc                                |   2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename src/dosbox.ico => contrib/icons/dosbox-x.ico (100%)

diff --git a/Makefile.am b/Makefile.am
index 7dbd94462..d29c36d9e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS = src include
 
 .PHONY: dosbox-x.app
 
-dosbox-x.app: src/dosbox-x src/dosbox.icns
+dosbox-x.app: src/dosbox-x contrib/icons/dosbox.icns
 	rm -Rfv dosbox-x.app
 	mkdir dosbox-x.app
 	mkdir dosbox-x.app/Contents
@@ -13,7 +13,7 @@ dosbox-x.app: src/dosbox-x src/dosbox.icns
 	mkdir dosbox-x.app/Contents/Resources
 	cp -v src/dosbox.plist dosbox-x.app/Contents/Info.plist
 	cp -v src/dosbox.pkginfo dosbox-x.app/Contents/PkgInfo
-	cp -v src/dosbox.icns dosbox-x.app/Contents/Resources/DosBox.icns
+	cp -v contrib/icons/dosbox.icns dosbox-x.app/Contents/Resources/DosBox.icns
 	cp -v contrib/fonts/FREECG98.BMP dosbox-x.app/Contents/Resources/freecg98.bmp
 	cp -v src/dosbox-x dosbox-x.app/Contents/MacOS/DosBox
 # this is where it gets ugly
@@ -35,13 +35,13 @@ dosbox-x.app: src/dosbox-x src/dosbox.icns
 		done; \
 	done
 
-src/dosbox.icns: src/dosbox.ico
+contrib/icons/dosbox.icns: contrib/icons/dosbox-x.ico
 	rm -Rfv src/dosbox.iconset
 	mkdir src/dosbox.iconset
 	sips -z 16 16    contrib/icons/dosbox-x.png    --out src/dosbox.iconset/icon_16x16.png
 	sips -z 32 32    contrib/icons/dosbox-x.png    --out src/dosbox.iconset/icon_16x16@2.png
 	sips -z 32 32    contrib/icons/dosbox-x.png    --out src/dosbox.iconset/icon_32x32.png
-	iconutil -c icns -o src/dosbox.icns src/dosbox.iconset
+	iconutil -c icns -o contrib/icons/dosbox.icns src/dosbox.iconset
 	rm -Rfv src/dosbox.iconset
 
 dox:
diff --git a/src/dosbox.ico b/contrib/icons/dosbox-x.ico
similarity index 100%
rename from src/dosbox.ico
rename to contrib/icons/dosbox-x.ico
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a2860f724..8cfac371f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,7 +1,7 @@
 set(SRC
 	"${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
 	"${CMAKE_CURRENT_LIST_DIR}/dosbox.cpp"
-	"${CMAKE_CURRENT_LIST_DIR}/dosbox.ico"
+	"${CMAKE_CURRENT_LIST_DIR}/../contrib/icons/dosbox-x.ico"
 	"${CMAKE_CURRENT_LIST_DIR}/dosbox.pkginfo"
 	"${CMAKE_CURRENT_LIST_DIR}/dosbox.plist"
 	"${CMAKE_CURRENT_LIST_DIR}/../contrib/icons/dosbox-x.png"
diff --git a/src/Makefile.am b/src/Makefile.am
index 5ce2d0423..60f285baa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -57,6 +57,6 @@ dosbox_x_js_install:
 	sudo cp -v dosbox-x.data dosbox-x.html dosbox-x.js dosbox-x.wasm /var/www/html/em/
 endif
 
-EXTRA_DIST = winres.rc dosbox.ico
+EXTRA_DIST = winres.rc ../contrib/icons/dosbox-x.ico
 
 
diff --git a/src/winres.rc b/src/winres.rc
index 5d176390e..e52cdebd1 100755
--- a/src/winres.rc
+++ b/src/winres.rc
@@ -3,7 +3,7 @@
 #include "../include/resource.h"
 
 // icon resource
-dosbox_ico ICON "dosbox.ico"
+dosbox_ico ICON "../contrib/icons/dosbox-x.ico"
 IDI_MAPPER ICON "mapper.ico"
 IDI_CFG_GUI ICON "cfggui.ico"
 IDI_PAUSE ICON "pause.ico"