From a9e7727e7f66c0877957b469e172ed2f70aa5d64 Mon Sep 17 00:00:00 2001 From: Michael Pavone Date: Sat, 23 Apr 2016 17:34:01 -0700 Subject: Inclue menu.bin in release directories. Added a Windows RC file and icon --- Makefile | 6 ++++++ blastem.rc | 25 +++++++++++++++++++++++++ build_release | 7 +++++-- icons/logo.xcf | Bin 0 -> 1300 bytes icons/windows.ico | Bin 0 -> 3725 bytes icons/windows.xcf | Bin 0 -> 6953 bytes logo.xcf | Bin 1300 -> 0 bytes 7 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 blastem.rc create mode 100644 icons/logo.xcf create mode 100644 icons/windows.ico create mode 100644 icons/windows.xcf delete mode 100644 logo.xcf diff --git a/Makefile b/Makefile index 00bc65b..9435795 100644 --- a/Makefile +++ b/Makefile @@ -125,6 +125,10 @@ else MAINOBJS+= $(Z80OBJS) endif +ifeq ($(OS),Windows) +MAINOBJS+= res.o +endif + ALL=dis$(EXE) zdis$(EXE) stateview$(EXE) vgmplay$(EXE) blastem$(EXE) ifneq ($(OS),Windows) ALL+= termhelper @@ -205,6 +209,8 @@ vos_prog_info : vos_prog_info.o vos_program_module.o %.bin : %.sz8 vasmz80_mot -Fbin -spaces -o $@ $< +res.o : blastem.rc + wine windres blastem.rc res.o arrow.tiles : arrow.png cursor.tiles : cursor.png diff --git a/blastem.rc b/blastem.rc new file mode 100644 index 0000000..f5044d8 --- /dev/null +++ b/blastem.rc @@ -0,0 +1,25 @@ +1 VERSIONINFO +FILEVERSION 0,4,0,0 +PRODUCTVERSION 0,4,0,0 +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904E4" + BEGIN + VALUE "CompanyName", "RetroDev" + VALUE "FileDescription", "BlastEm - A fast and accurate Genesis/Megadrive emulator" + VALUE "FileVersion", "1.0" + VALUE "InternalName", "blastem" + VALUE "LegalCopyright", "Copyright 2011-2016 Michael Pavone" + VALUE "OriginalFilename", "blastem.exe" + VALUE "ProductName", "BlastEm" + VALUE "ProductVersion", "0.4.0" + END + END + + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END +2 ICON "icons/windows.ico" diff --git a/build_release b/build_release index ceef42c..185c102 100755 --- a/build_release +++ b/build_release @@ -26,19 +26,22 @@ if [ $OS = "Linux" ]; then fi make PORTABLE=1 clean all +make menu.bin if [ $OS = "Windows" ]; then binaries="dis.exe zdis.exe stateview.exe vgmplay.exe blastem.exe SDL2.dll" cmd="wine blastem.exe" txt=".txt" else + binaries="dis zdis stateview vgmplay blastem termhelper" if [ $OS = "Darwin" ]; then - binaries="dis zdis stateview vgmplay blastem termhelper Frameworks" + binaries="$binaries Frameworks" else - binaries="dis zdis stateview vgmplay blastem termhelper lib" + binaries="$binaries lib" fi cmd="./blastem" txt="" fi +binaries="$binaries menu.bin" ver=`$cmd -v | awk '/blastem/ { gsub(/\r/, "", $2); print $2 }'` if [ $OS = "Windows" ]; then suffix='-win32' diff --git a/icons/logo.xcf b/icons/logo.xcf new file mode 100644 index 0000000..3476a7c Binary files /dev/null and b/icons/logo.xcf differ diff --git a/icons/windows.ico b/icons/windows.ico new file mode 100644 index 0000000..5eeae15 Binary files /dev/null and b/icons/windows.ico differ diff --git a/icons/windows.xcf b/icons/windows.xcf new file mode 100644 index 0000000..ab34f5d Binary files /dev/null and b/icons/windows.xcf differ diff --git a/logo.xcf b/logo.xcf deleted file mode 100644 index 3476a7c..0000000 Binary files a/logo.xcf and /dev/null differ -- cgit v1.2.3