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/nmake-sub.mak | 42 +++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 4 deletions(-)

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

diff --git a/externals/grill/flext/buildsys/nmake-sub.mak b/externals/grill/flext/buildsys/nmake-sub.mak
index 9e640fff..81ba3983 100644
--- a/externals/grill/flext/buildsys/nmake-sub.mak
+++ b/externals/grill/flext/buildsys/nmake-sub.mak
@@ -2,6 +2,7 @@
 !include $(BUILDPATH)config-$(PLATFORM)-$(RTSYS)-$(COMPILER).txt
 
 ##############################
+# project-specific definitions
 
 # package info
 !include $(USRINFO)
@@ -18,10 +19,43 @@
 
 ##############################
 
-# flext-specific make stuff
-!include $(BUILDPATH)nmake-flext.inc
+!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)nmake-$(BUILDCLASS).inc
 
+!include $(BUILDPATH)nmake.inc
+
+##############################
 # platform-specific make stuff
-!include $(BUILDPATH)$(PLATFORM)\$(RTSYS)\make-$(COMPILER).inc
+
+!include $(BUILDPATH)$(PLATFORM)\$(RTSYS)\nmake-$(COMPILER)-$(BUILDCLASS).inc
+
+!include $(BUILDPATH)$(PLATFORM)\$(RTSYS)\nmake-$(COMPILER).inc
+
+##############################
 # general make stuff
-!include $(BUILDPATH)$(PLATFORM)\make-$(COMPILER).inc
+
+!include $(BUILDPATH)$(PLATFORM)\nmake-$(COMPILER)-$(BUILDCLASS).inc
+
+!include $(BUILDPATH)$(PLATFORM)\nmake-$(COMPILER).inc
-- 
cgit v1.2.1