From a9fe54453e608ca40d119942b6139ab0545eec0b Mon Sep 17 00:00:00 2001 From: stpohle Date: Tue, 15 Aug 2006 02:15:39 +0000 Subject: [PATCH] added Bomberclone Icon to the win32 binary --- ChangeLog | 4 +++- bomberclone.nsi | 6 +++--- configure.in | 3 +++ data/pixmaps/Makefile.am | 3 ++- data/pixmaps/bomberclone.ico | Bin 0 -> 16958 bytes src/Makefile.am | 10 +++++++++- src/bc-res.rc | 1 + src/game.c | 4 ++-- tools/cross-mingw32-linux.sh | 9 ++++----- 9 files changed, 27 insertions(+), 13 deletions(-) create mode 100644 data/pixmaps/bomberclone.ico create mode 100644 src/bc-res.rc diff --git a/ChangeLog b/ChangeLog index eacbcb1..475ecad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ -$Id: ChangeLog,v 1.109 2006/08/15 00:57:45 stpohle Exp $ +$Id: ChangeLog,v 1.110 2006/08/15 02:15:39 stpohle Exp $ Version 0.11.7 (still in progress) +- Added: BomberClone Icon to the bomberclone win32 binary. + - Added: resolution 1280x800 - Testing: Security Problems found by Luigi Auriemma diff --git a/bomberclone.nsi b/bomberclone.nsi index 3d29e16..abd16ca 100644 --- a/bomberclone.nsi +++ b/bomberclone.nsi @@ -62,9 +62,9 @@ SectionEnd ; Optional section (can be disabled by the user) Section "Start Menu Shortcuts" - CreateDirectory "$SMPROGRAMS\bomberclone" - CreateShortCut "$SMPROGRAMS\bomberclone\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0 - CreateShortCut "$SMPROGRAMS\bomberclone\bomberclone (MakeNSISW).lnk" "$INSTDIR\bomberclone.exe" "" "$INSTDIR\bomberclone.exe" 0 + CreateDirectory "$SMPROGRAMS\BomberClone" + CreateShortCut "$SMPROGRAMS\BomberClone\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0 + CreateShortCut "$SMPROGRAMS\BomberClone\BomberClone.lnk" "$INSTDIR\bomberclone.exe" "" "$INSTDIR\bomberclone.exe" 0 SectionEnd diff --git a/configure.in b/configure.in index e5abc21..f35248d 100644 --- a/configure.in +++ b/configure.in @@ -44,6 +44,7 @@ case "$target" in *cygwin* | *mingw32* | *mingw32msvc* ) CFLAGS="$CFLAGS" LIBS="$LIBS -liberty -lwsock32 -lm" + MINGW32=yes ;; *solaris* ) CFLAGS="$CFLAGS" @@ -243,6 +244,8 @@ AC_SUBST(NO_PREFIX_PACKAGE_MENU_DIR) PACKAGE_MENU_DIR="${packageprefix}/${packagemenudir}" AC_SUBST(PACKAGE_MENU_DIR) +AM_CONDITIONAL(MINGW32, test x$MINGW32 = xyes) + AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${packageprefix}/${packagedatadir}") AC_DEFINE_UNQUOTED(PACKAGE_DOC_DIR, "${packageprefix}/${packagedocdir}") AC_DEFINE_UNQUOTED(PACKAGE_PIXMAPS_DIR, "${packageprefix}/${packagepixmapsdir}") diff --git a/data/pixmaps/Makefile.am b/data/pixmaps/Makefile.am index 1652e37..533c3b0 100644 --- a/data/pixmaps/Makefile.am +++ b/data/pixmaps/Makefile.am @@ -7,6 +7,7 @@ bomberclone_pixmapsdir = $(prefix)/@NO_PREFIX_PACKAGE_PIXMAPS_DIR@ bomberclone_pixmaps_DATA = \ - bomberclone.png + bomberclone.png \ + bomberclone.ico EXTRA_DIST = $(bomberclone_pixmaps_DATA) diff --git a/data/pixmaps/bomberclone.ico b/data/pixmaps/bomberclone.ico new file mode 100644 index 0000000000000000000000000000000000000000..c9c4f1b53ec8d6791b89947b1c2070f1a9948c49 GIT binary patch literal 16958 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 literal 0 HcmV?d00001 diff --git a/src/Makefile.am b/src/Makefile.am index a726257..1ef7bab 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -46,4 +46,12 @@ bomberclone_SOURCES = \ playermenu.c\ broadcast.c -## bomberclone_LDADD = +if MINGW32 +bomberclone_LDADD = bc-res.o + + +bc-res.o: bc-res.rc + ln -s ../data/pixmaps/bomberclone.ico ./ + windres -i bc-res.rc -o bc-res.o + rm bomberclone.ico +endif diff --git a/src/bc-res.rc b/src/bc-res.rc new file mode 100644 index 0000000..82796c5 --- /dev/null +++ b/src/bc-res.rc @@ -0,0 +1 @@ +101 ICON bomberclone.ico diff --git a/src/game.c b/src/game.c index 11041a2..c03e8e1 100644 --- a/src/game.c +++ b/src/game.c @@ -1,4 +1,4 @@ -/* $Id: game.c,v 1.114 2005/08/07 17:58:05 stpohle Exp $ +/* $Id: game.c,v 1.115 2006/08/15 02:15:39 stpohle Exp $ game.c - procedures for the game. */ #include @@ -598,7 +598,7 @@ game_showresultteam (int pos_x, int pos_y, int pos_w, int pos_h) dx, dy, col, - x; + x = 0; SDL_Rect dest, src; char text[255]; diff --git a/tools/cross-mingw32-linux.sh b/tools/cross-mingw32-linux.sh index 2d80237..acaf295 100755 --- a/tools/cross-mingw32-linux.sh +++ b/tools/cross-mingw32-linux.sh @@ -11,13 +11,12 @@ PATH="$PREFIX/bin:$PREFIX/$TARGET/bin:$PATH" export PATH cache=cross-config.cache -sh configure --cache-file="$cache" --disable-debug\ + +sh configure LDFLAGS=../bc-res.o --cache-file="$cache" --disable-debug \ --target=$TARGET --host=$TARGET --build=i386-linux \ $* -make clean - - make $* -strip src/bomberclone.exe +# create the executeable with a icon ressource.. +