diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-04-09 00:46:55 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-04-09 00:46:55 +0000 |
| commit | cc716ca00420c23bdb02831f8fc205d4588e1f75 (patch) | |
| tree | b7f3182f6e59f705eff9ee14ad35075fa52acf80 /Makefile | |
| parent | 4ae1b3c2a335d95a5425ecf5c19c5be2ab21e13a (diff) | |
| download | hercules-cc716ca00420c23bdb02831f8fc205d4588e1f75.tar.gz hercules-cc716ca00420c23bdb02831f8fc205d4588e1f75.tar.bz2 hercules-cc716ca00420c23bdb02831f8fc205d4588e1f75.tar.xz hercules-cc716ca00420c23bdb02831f8fc205d4588e1f75.zip | |
* 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
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 20 |
1 files changed, 12 insertions, 8 deletions
@@ -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 |