From af84f7a0672dc9ff2d0a9e250b9e1adb9c5de4dc Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Thu, 22 Aug 2013 15:06:06 -0700
Subject: Move contents of make.defs where they belong

---
 Makefile.in | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

(limited to 'Makefile.in')

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