aboutsummaryrefslogtreecommitdiffstats
path: root/win32
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2010-01-24 16:25:34 -0800
committerH. Peter Anvin <hpa@zytor.com>2010-01-24 16:25:34 -0800
commit95e6215b6f1d31eebdb1ddeb4c13007c5af30c23 (patch)
tree5dbce6408bb350b242e5c4dd592da103ed6cfb86 /win32
parent8f189531a58aef0655cd04a620931da3a0157eaa (diff)
parent1da816e5101d61edc8a01e3c76a1b89933a8b863 (diff)
downloadsyslinux-95e6215b6f1d31eebdb1ddeb4c13007c5af30c23.tar.gz
syslinux-95e6215b6f1d31eebdb1ddeb4c13007c5af30c23.tar.xz
syslinux-95e6215b6f1d31eebdb1ddeb4c13007c5af30c23.zip
Merge branch 'master' into fsc
Conflicts: com32/lib/MCONFIG com32/lib/readdir.c
Diffstat (limited to 'win32')
-rw-r--r--win32/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/win32/Makefile b/win32/Makefile
index 964b74c5..a0be1d46 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -21,7 +21,7 @@ OSTYPE = $(shell uname -msr)
ifeq ($(findstring CYGWIN,$(OSTYPE)),CYGWIN)
## Compiling on Cygwin
WINPREFIX :=
-WINCFLAGS := -mno-cygwin -W -Wall -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
+WINCFLAGS := -mno-cygwin $(GCCWARN) -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
WINLDFLAGS := -mno-cygwin -Os -s
else
## Compiling on some variant of MinGW
@@ -30,7 +30,7 @@ WINPREFIX :=
else
WINPREFIX := $(shell ./find-mingw.sh gcc)
endif
-WINCFLAGS := -W -Wall -Wno-sign-compare -Os -fomit-frame-pointer \
+WINCFLAGS := $(GCCWARN) -Wno-sign-compare -Os -fomit-frame-pointer \
-D_FILE_OFFSET_BITS=64
WINLDFLAGS := -Os -s
endif