diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2013-08-22 15:06:06 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2013-08-22 15:17:10 -0700 |
| commit | af84f7a0672dc9ff2d0a9e250b9e1adb9c5de4dc (patch) | |
| tree | c5315d449e0a78ee5fc6922b83c87ecb5cd77c0f /Makefile.in | |
| parent | d8fd4be8d734203197e888ada6e14128fc5d53da (diff) | |
| download | tmwa-af84f7a0672dc9ff2d0a9e250b9e1adb9c5de4dc.tar.gz tmwa-af84f7a0672dc9ff2d0a9e250b9e1adb9c5de4dc.tar.bz2 tmwa-af84f7a0672dc9ff2d0a9e250b9e1adb9c5de4dc.tar.xz tmwa-af84f7a0672dc9ff2d0a9e250b9e1adb9c5de4dc.zip | |
Move contents of make.defs where they belong
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index d216b50..4b32d71 100644 --- a/Makefile.in +++ b/Makefile.in @@ -10,7 +10,28 @@ SHELL=/bin/bash BUILD_DIR = obj default: login-server char-server map-server ladmin eathena-monitor .DELETE_ON_ERROR: -include make.defs + +# this used to be in make.defs +CXXFLAGS += ${WARNINGS} +ifeq (${ENABLE_WARNINGS},yes) +WARNINGS = -include src/warnings.hpp +endif + +# gdb bug 15801 +ifeq (${ENABLE_ABI6},yes) +CXX += -fabi-version=6 +endif +ifeq (${ENABLE_CYGWIN_HACKS},yes) +override CXX += -std=gnu++0x +else +override CXX += -std=c++0x +endif +# for linking +override CC = ${CXX} + +override CXXFLAGS += -fstack-protector -fno-strict-aliasing +override CXXFLAGS += -fvisibility=hidden +# end what used to be in make.defs .PHONY: all clean common most # With no prerequisites, no target should ever be implicitly deleted. |