From 1611d50c03d8f79560ffc3bc63c268894f411abc Mon Sep 17 00:00:00 2001
From: Thomas Grill <xovo@users.sourceforge.net>
Date: Mon, 3 Jan 2005 05:00:31 +0000
Subject: updated make system build system for OSX simplified make system
 reconsidered flext::buffer:Update added object construction and destruction
 flags updated build system

svn path=/trunk/; revision=2447
---
 externals/grill/flext/buildsys/gnumake-sub.mak | 48 +++++++++++++++++++++-----
 1 file changed, 40 insertions(+), 8 deletions(-)

(limited to 'externals/grill/flext/buildsys/gnumake-sub.mak')

diff --git a/externals/grill/flext/buildsys/gnumake-sub.mak b/externals/grill/flext/buildsys/gnumake-sub.mak
index 91440532..46a40de6 100644
--- a/externals/grill/flext/buildsys/gnumake-sub.mak
+++ b/externals/grill/flext/buildsys/gnumake-sub.mak
@@ -2,28 +2,60 @@
 include $(BUILDPATH)config-$(PLATFORM)-$(RTSYS)-$(COMPILER).txt
 
 ###############################
-
-# these are project specific
+# project specific definitions
 
 # package info
 include $(USRINFO)
 
 # special settings
 ifdef USRCONFIG
-include $(USRCONFIG)
+	include $(USRCONFIG)
 endif
 
 # package specific make stuff
 ifdef USRMAKE
-include $(USRMAKE)
+	include $(USRMAKE)
+endif
+
+##############################
+
+ifndef TARGETMODE
+ifdef DEBUG
+	TARGETMODE=debug
+else
+	TARGETMODE=release
+endif
+endif
+
+ifndef TARGETTYPE
+ifdef SHARED
+	TARGETTYPE=shared
+else
+ifdef THREADED
+	TARGETTYPE=multi
+else
+	TARGETTYPE=single
+endif
+endif
 endif
 
 ##############################
+# flext-specific definitions
+
+include $(BUILDPATH)gnumake-$(BUILDCLASS).inc
 
-# flext-specific make stuff
-include $(BUILDPATH)gnumake-flext.inc
+include $(BUILDPATH)gnumake.inc
 
+##############################
 # platform-specific make stuff
-include $(BUILDPATH)$(PLATFORM)/$(RTSYS)/make-$(COMPILER).inc
+
+include $(BUILDPATH)$(PLATFORM)/$(RTSYS)/gnumake-$(COMPILER)-$(BUILDCLASS).inc
+
+include $(BUILDPATH)$(PLATFORM)/$(RTSYS)/gnumake-$(COMPILER).inc
+
+##############################
 # general make stuff
-include $(BUILDPATH)$(PLATFORM)/make-$(COMPILER).inc
+
+include $(BUILDPATH)$(PLATFORM)/gnumake-$(COMPILER)-$(BUILDCLASS).inc
+
+include $(BUILDPATH)$(PLATFORM)/gnumake-$(COMPILER).inc
-- 
cgit v1.2.1