# HG changeset patch
# User Volker Grabsch <vog@notjusthosting.com>
# Date 1301233766 -7200
# Node ID 4e48476ea587a9bc2d397c890a8fe594a6fdb4fa
# Parent  9e49c835d73e6ccf2efb000e4fc1ec43311369de
fix compiler errors instead of suppressing them

diff -r 9e49c835d73e -r 4e48476ea587 src/guile.mk
--- a/src/guile.mk	Sat Mar 26 20:32:06 2011 +0100
+++ b/src/guile.mk	Sun Mar 27 15:49:26 2011 +0200
@@ -36,7 +36,7 @@
     $(MAKE) -C '$(1)' -j 1 install schemelib_DATA=
 
     '$(TARGET)-gcc' \
-        -W -Wall -Werror -ansi -pedantic -Wno-unused-but-set-variable \
+        -W -Wall -Werror -ansi -pedantic \
         '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-guile.exe' \
         `'$(TARGET)-pkg-config' guile-1.8 --cflags --libs`
 endef
diff -r 9e49c835d73e -r 4e48476ea587 src/jpeg-test.c
--- a/src/jpeg-test.c	Sat Mar 26 20:32:06 2011 +0100
+++ b/src/jpeg-test.c	Sun Mar 27 15:49:26 2011 +0200
@@ -16,6 +16,9 @@
 
     test_boolean = TRUE;
     test_int32 = 1;
+    (void)test_boolean;
+    (void)test_int32;
+
     jpeg_create_decompress(&cinfo);
     jpeg_destroy_decompress(&cinfo);
 
diff -r 9e49c835d73e -r 4e48476ea587 src/jpeg.mk
--- a/src/jpeg.mk	Sat Mar 26 20:32:06 2011 +0100
+++ b/src/jpeg.mk	Sun Mar 27 15:49:26 2011 +0200
@@ -26,7 +26,7 @@
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS=
 
     '$(TARGET)-gcc' \
-        -W -Wall -Werror -ansi -pedantic -Werror -Wno-unused-but-set-variable \
+        -W -Wall -Werror -ansi -pedantic -Werror \
         '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-jpeg.exe' \
         -ljpeg
 endef
diff -r 9e49c835d73e -r 4e48476ea587 src/physfs-1-fix-gcc46-warnings.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/physfs-1-fix-gcc46-warnings.patch	Sun Mar 27 15:49:26 2011 +0200
@@ -0,0 +1,30 @@
+This file is part of mingw-cross-env.
+See doc/index.html for further information.
+
+This patch has been taken from:
+http://icculus.org/pipermail/physfs/2011-March/000990.html
+
+diff -ru physfs-2.0.2.orig/archivers/wad.c physfs-2.0.2/archivers/wad.c
+--- physfs-2.0.2.orig/archivers/wad.c	2011-02-18 22:17:31.000000000 +0100
++++ physfs-2.0.2/archivers/wad.c	2011-03-27 14:55:10.000000000 +0200
+@@ -245,9 +245,6 @@
+     PHYSFS_uint32 fileCount;
+     PHYSFS_uint32 directoryOffset;
+     WADentry *entry;
+-    char lastDirectory[9];
+-
+-    lastDirectory[8] = 0; /* Make sure lastDirectory stays null-terminated. */
+ 
+     BAIL_IF_MACRO(!wad_open(name, forWriting, &fh, &fileCount,&directoryOffset), NULL, 0);
+     info->entryCount = fileCount;
+diff -ru physfs-2.0.2.orig/platform/windows.c physfs-2.0.2/platform/windows.c
+--- physfs-2.0.2.orig/platform/windows.c	2011-02-18 22:17:31.000000000 +0100
++++ physfs-2.0.2/platform/windows.c	2011-03-27 14:54:17.000000000 +0200
+@@ -462,6 +462,7 @@
+              */	
+     		rc = pGetUserProfileDirectoryW(accessToken, &dummy, &psize);
+             assert(!rc);  /* !!! FIXME: handle this gracefully. */
++            (void)rc;
+ 
+             /* Allocate memory for the profile directory */
+             wstr = (LPWSTR) __PHYSFS_smallAlloc(psize * sizeof (WCHAR));
diff -r 9e49c835d73e -r 4e48476ea587 src/physfs.mk
--- a/src/physfs.mk	Sat Mar 26 20:32:06 2011 +0100
+++ b/src/physfs.mk	Sun Mar 27 15:49:26 2011 +0200
@@ -24,8 +24,7 @@
         -DPHYSFS_BUILD_SHARED=FALSE \
         -DPHYSFS_INTERNAL_ZLIB=FALSE \
         -DPHYSFS_BUILD_TEST=FALSE \
-        -DPHYSFS_BUILD_WX_TEST=FALSE \
-        -DCMAKE_C_FLAGS='-Wno-unused-but-set-variable'
+        -DPHYSFS_BUILD_WX_TEST=FALSE
         $(MAKE) -C '$(1)' -j '$(JOBS)' install
 
     '$(TARGET)-gcc' \
diff -r 9e49c835d73e -r 4e48476ea587 src/sdl-test.c
--- a/src/sdl-test.c	Sat Mar 26 20:32:06 2011 +0100
+++ b/src/sdl-test.c	Sun Mar 27 15:49:26 2011 +0200
@@ -13,6 +13,7 @@
     if (SDL_Init(SDL_INIT_EVERYTHING) < 0) return 1;
 
     screen = SDL_SetVideoMode(640, 480, 32, SDL_HWSURFACE);
+    (void)screen;
 
     SDL_Quit();
     return 0;
diff -r 9e49c835d73e -r 4e48476ea587 src/sdl.mk
--- a/src/sdl.mk	Sat Mar 26 20:32:06 2011 +0100
+++ b/src/sdl.mk	Sun Mar 27 15:49:26 2011 +0200
@@ -33,7 +33,7 @@
     ln -sf $(PREFIX)/$(TARGET)/bin/sdl-config $(PREFIX)/bin/$(TARGET)-sdl-config
 
     '$(TARGET)-gcc' \
-        -W -Wall -Werror -ansi -pedantic -Wno-unused-but-set-variable \
+        -W -Wall -Werror -ansi -pedantic \
         '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-sdl.exe' \
         `'$(TARGET)-pkg-config' sdl --cflags --libs`
 endef
diff -r 9e49c835d73e -r 4e48476ea587 src/sdl_mixer-test.c
--- a/src/sdl_mixer-test.c	Sat Mar 26 20:32:06 2011 +0100
+++ b/src/sdl_mixer-test.c	Sun Mar 27 15:49:26 2011 +0200
@@ -11,6 +11,7 @@
     (void)argv;
 
     initted = Mix_Init(MIX_INIT_FLAC | MIX_INIT_OGG | MIX_INIT_MOD);
+    (void)initted;
     Mix_Quit();
     return 0;
 }
diff -r 9e49c835d73e -r 4e48476ea587 src/sdl_mixer.mk
--- a/src/sdl_mixer.mk	Sat Mar 26 20:32:06 2011 +0100
+++ b/src/sdl_mixer.mk	Sun Mar 27 15:49:26 2011 +0200
@@ -48,7 +48,7 @@
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 
     '$(TARGET)-gcc' \
-        -W -Wall -Werror -ansi -pedantic -Wno-unused-but-set-variable \
+        -W -Wall -Werror -ansi -pedantic \
         '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-sdl_mixer.exe' \
         `'$(TARGET)-pkg-config' SDL_mixer --cflags --libs`
 endef