added Bomberclone Icon to the win32 binary

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

bomberclone.nsi

@@ -62,9 +62,9 @@ SectionEnd
 ; Optional section (can be disabled by the user)
 Section "Start Menu Shortcuts"
 
-  CreateDirectory "$SMPROGRAMS\bomberclone"
+  CreateDirectory "$SMPROGRAMS\BomberClone"
-  CreateShortCut "$SMPROGRAMS\bomberclone\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
+  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
+  CreateShortCut "$SMPROGRAMS\BomberClone\BomberClone.lnk" "$INSTDIR\bomberclone.exe" "" "$INSTDIR\bomberclone.exe" 0
   
 SectionEnd
 

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}")

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)

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

src/bc-res.rc

@@ -0,0 +1 @@
+101 ICON bomberclone.ico

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 <string.h>
@@ -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];

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..
+