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.mak | 112 ++++++++++---------------------
 1 file changed, 34 insertions(+), 78 deletions(-)

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

diff --git a/externals/grill/flext/buildsys/nmake.mak b/externals/grill/flext/buildsys/nmake.mak
index 40a8d8c4..5fe434b4 100644
--- a/externals/grill/flext/buildsys/nmake.mak
+++ b/externals/grill/flext/buildsys/nmake.mak
@@ -5,20 +5,48 @@
 # COMPILER - msvc/gcc/mingw/cygwin
 # BUILDPATH including trailing \
 
+###############################################
 # package info
+
 USRINFO=package.txt
 
 !include $(USRINFO)
 
+###############################################
+# check variables
+
+!ifndef BUILDCLASS
+!error BUILDCLASS must be specified in $(USRINFO)
+!endif
+
+!ifndef BUILDMODE
+!error BUILDMODE must be specified in $(USRINFO)
+!endif
+
+!ifndef BUILDTYPE
+!error BUILDTYPE must be specified in $(USRINFO)
+!endif
+
+##############################
+
+!ifndef TARGETMODE
+TARGETMODE=$(BUILDMODE)
+!endif
+
+!ifndef TARGETTYPE
+TARGETTYPE=$(BUILDTYPE)
+!endif
+
+###############################################
 
 SYSCONFIG=$(BUILDPATH)config-$(PLATFORM)-$(RTSYS)-$(COMPILER).txt
 SYSDEFAULT=$(BUILDPATH)$(PLATFORM)\$(RTSYS)\config-$(COMPILER).def
 
-
 OPTIONS=-f $(BUILDPATH)nmake-sub.mak \
 	PLATFORM=$(PLATFORM) RTSYS=$(RTSYS) COMPILER=$(COMPILER) \
 	BUILDPATH=$(BUILDPATH) USRINFO=$(USRINFO)
 
+###############################################
 
 !ifdef BUILDDIR
 USRCONFIG=config.txt
@@ -29,86 +57,14 @@ USRMAKE=$(BUILDDIR)\makefile-$(PLATFORM)-$(COMPILER).inc
 OPTIONS=$(OPTIONS) USRCONFIG=$(USRCONFIG) USRMAKE=$(USRMAKE)
 !endif
 
+###############################################
+# include file describing default target dependencies
 
-!ifdef FLEXTBUILD
-all: flext
-!else
-all: build-sr
-
-shared: build-tr
-!endif
-
-flext: flext-release flext-debug
-
-flext-release: build-dr build-tr build-sr
-
-flext-debug: build-dd build-td build-sd
-
-install: install-dr install-tr install-sr install-dd install-td install-sd
-
-clean: clean-dr clean-tr clean-sr clean-dd clean-td clean-sd
-
-
-build-sr: config
-	$(MAKE) $(OPTIONS) _all_
-
-build-sd: config
-	$(MAKE) $(OPTIONS) DEBUG=1 _all_
-
-build-tr: config
-	$(MAKE) $(OPTIONS) THREADED=1 _all_
-
-build-td: config
-	$(MAKE) $(OPTIONS) THREADED=1 DEBUG=1 _all_
-
-build-dr: config
-	$(MAKE) $(OPTIONS) SHARED=1 _all_
-
-build-dd: config
-	$(MAKE) $(OPTIONS) SHARED=1 DEBUG=1 _all_
-
-
-install-sr:
-	$(MAKE) $(OPTIONS) _install_
-
-install-sd:
-	$(MAKE) $(OPTIONS) DEBUG=1 _install_
-
-install-tr:
-	$(MAKE) $(OPTIONS) THREADED=1 _install_
-
-install-td:
-	$(MAKE) $(OPTIONS) THREADED=1 DEBUG=1 _install_
-
-install-dr:
-	$(MAKE) $(OPTIONS) SHARED=1 _install_
-
-install-dd:
-	$(MAKE) $(OPTIONS) SHARED=1 DEBUG=1 _install_
-
-
-clean-sr:
-	$(MAKE) $(OPTIONS) _clean_
-
-clean-sd:
-	$(MAKE) $(OPTIONS) DEBUG=1 _clean_
-
-clean-tr:
-	$(MAKE) $(OPTIONS) THREADED=1 _clean_
-
-clean-td:
-	$(MAKE) $(OPTIONS) THREADED=1 DEBUG=1 _clean_
-
-clean-dr:
-	$(MAKE) $(OPTIONS) SHARED=1 _clean_
-
-clean-dd:
-	$(MAKE) $(OPTIONS) SHARED=1 DEBUG=1 _clean_
-
-
+!include $(BUILDPATH)targets.inc
 
-config: $(USRMAKE) $(SYSCONFIG) $(USRCONFIG) 
+!include $(BUILDPATH)targets-$(BUILDCLASS).inc
 
+###############################################
 
 .precious: $(SYSCONFIG) $(USRCONFIG)
 
-- 
cgit v1.2.1