summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile20
1 files changed, 12 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 6731c3807..70cb51326 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ OPT += -ffast-math
# OPT += -fbounds-checking
# OPT += -fstack-protector
# OPT += -fomit-frame-pointer
-OPT += -Wall -Wno-sign-compare
+OPT += -Wall -Wno-sign-compare -Wno-unused-parameter
ifeq ($(GCC_VERSION), 4)
OPT += -Wno-unused-parameter -Wno-pointer-sign
endif
@@ -71,15 +71,19 @@ endif
ifeq ($(findstring CYGWIN,$(PLATFORM)), CYGWIN)
OPT += -DFD_SETSIZE=4096
- ifeq ($(findstring mingw,$(shell gcc --version)), mingw)
- IS_MINGW = 1
- OS_TYPE = -DMINGW
- LIBS += -L../.. -lwsock32
- else
- OS_TYPE = -DCYGWIN
- endif
+ OS_TYPE = -DCYGWIN
endif
+ifeq ($(findstring mingw,$(shell gcc --version)), mingw)
+ IS_MINGW = 1
+ OS_TYPE = -DMINGW
+ OPT += -DFD_SETSIZE=4096
+# CFLAGS += -I../zlib
+# LIBS += -L../../lib
+ LIBS += -lws2_32
+endif
+
+
ifeq ($(findstring x86_64,$(ARCH)), x86_64)
OPT += -m32
endif