# HG changeset patch # User Michael Pavone # Date 1461458041 25200 # Node ID 4cbc349a82a9dda1761dab5de173c8f9791c7359 # Parent 8cdd4ddedd9aaf2df80de52c23e5e1a84a5389b6 Inclue menu.bin in release directories. Added a Windows RC file and icon diff -r 8cdd4ddedd9a -r 4cbc349a82a9 Makefile --- a/Makefile Sat Apr 23 12:43:23 2016 -0700 +++ b/Makefile Sat Apr 23 17:34:01 2016 -0700 @@ -125,6 +125,10 @@ 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 @@ %.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 -r 8cdd4ddedd9a -r 4cbc349a82a9 blastem.rc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/blastem.rc Sat Apr 23 17:34:01 2016 -0700 @@ -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 -r 8cdd4ddedd9a -r 4cbc349a82a9 build_release --- a/build_release Sat Apr 23 12:43:23 2016 -0700 +++ b/build_release Sat Apr 23 17:34:01 2016 -0700 @@ -26,19 +26,22 @@ 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 -r 8cdd4ddedd9a -r 4cbc349a82a9 icons/logo.xcf Binary file icons/logo.xcf has changed diff -r 8cdd4ddedd9a -r 4cbc349a82a9 icons/windows.ico Binary file icons/windows.ico has changed diff -r 8cdd4ddedd9a -r 4cbc349a82a9 icons/windows.xcf Binary file icons/windows.xcf has changed diff -r 8cdd4ddedd9a -r 4cbc349a82a9 logo.xcf Binary file logo.xcf has changed