From 4f7b984f9f848ba6adae2040c520a97bb5c0e354 Mon Sep 17 00:00:00 2001
From: Pixel <pixel@nobis-crew.org>
Date: Fri, 7 Oct 2011 16:11:02 -0700
Subject: Simplifying Makefile, by offloading defines to config files, and
 using -imacros to load them.

---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index c3ef5c4..59fa941 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ LDFLAGS += -g
 endif
 
 ifeq ($(SYSTEM),Darwin)
-    LIBCORO_CFLAGS = -DCORO_SJLJ
+    CONFIG_H = darwin-config.h
     ARCH_FLAGS = -arch i386
     LIBS = -liconv
     LD = g++ -arch i386
@@ -33,7 +33,7 @@ ifeq ($(SYSTEM),Darwin)
         AS = i686-apple-darwin-as -arch i386
     endif
 else
-    LIBCORO_CFLAGS = -DCORO_ASM
+    CONFIG_H = linux-config.h
     ARCH_FLAGS = -march=i686 -m32
     ASFLAGS = -march=i686 --32
     STRIP = strip --strip-unneeded
@@ -41,7 +41,7 @@ endif
 
 INCLUDES = -Iincludes -Ilibcoro
 
-CPPFLAGS_NO_ARCH += $(INCLUDES) -DSTDC_HEADERS -fexceptions -DWORDS_LITTLEENDIAN $(HAVES) $(LIBCORO_CFLAGS) -Wno-deprecated -D_FILE_OFFSET_BITS=64
+CPPFLAGS_NO_ARCH += $(INCLUDES) -fexceptions -Wno-deprecated -imacros $(CONFIG_H)
 CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)
 
 LDFLAGS += $(ARCH_FLAGS) $(LIBS)
-- 
cgit v1.2.3