joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-05-08 19:32:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move src/dosbox.ico to contrib/icons/dosbox-x.ixo

Browse Source 
This could break the windows build, which I did not test!
This commit is contained in:
rderooy 2020-09-09 09:14:11 +02:00
parent 8c5772b54c
commit 982a363630
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.am
View File

@ -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:

0
src/dosbox.ico → contrib/icons/dosbox-x.ico
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

2
src/CMakeLists.txt
View File

@ -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"

2
src/Makefile.am
View File

@ -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

2
src/winres.rc
View File

@ -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"