From cc716ca00420c23bdb02831f8fc205d4588e1f75 Mon Sep 17 00:00:00 2001
From: ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Mon, 9 Apr 2007 00:46:55 +0000
Subject: * Played around with MinGW a bit today... - adjusted code so that it
 handles mingw-specific compatibility problems - adjusted the makefile, mingw
 is not a subset of cygwin * As an experiment Corrected many /W4 warnings on
 the txt login server

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10192 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 Makefile | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'Makefile')

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
-- 
cgit v1.2.3-70-g09d2