From 7d237bf606940cede753ae1c07a59c1ec24027bf Mon Sep 17 00:00:00 2001 From: Thomas Grill Date: Tue, 4 Jan 2005 04:58:53 +0000 Subject: updated build system - some cleanups updated for build system updated build system for OSX cleanups updated build system svn path=/trunk/; revision=2458 --- externals/grill/flext/buildsys/bmake.mak | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'externals/grill/flext/buildsys/bmake.mak') diff --git a/externals/grill/flext/buildsys/bmake.mak b/externals/grill/flext/buildsys/bmake.mak index ef061486..1fb937ce 100644 --- a/externals/grill/flext/buildsys/bmake.mak +++ b/externals/grill/flext/buildsys/bmake.mak @@ -8,23 +8,25 @@ ############################################### # package info -USRINFO=package.txt +!ifndef PKGINFO +PKGINFO=package.txt +!endif -!include $(USRINFO) +!include $(PKGINFO) ############################################### # check variables !ifndef BUILDCLASS -!error BUILDCLASS must be specified in $(USRINFO) +BUILDCLASS=ext !endif !ifndef BUILDMODE -!error BUILDMODE must be specified in $(USRINFO) +BUILDMODE=release !endif !ifndef BUILDTYPE -!error BUILDTYPE must be specified in $(USRINFO) +BUILDTYPE=single !endif ############################## @@ -44,7 +46,7 @@ SYSDEFAULT=$(BUILDPATH)$(PLATFORM)\$(RTSYS)\config-$(COMPILER).def OPTIONS=-f $(BUILDPATH)bmake-sub.mak -N \ PLATFORM=$(PLATFORM) RTSYS=$(RTSYS) COMPILER=$(COMPILER) \ - BUILDPATH=$(BUILDPATH) USRINFO=$(USRINFO) + BUILDPATH=$(BUILDPATH) PKGINFO=$(PKGINFO) BUILDCLASS=$(BUILDCLASS) ############################################### @@ -52,7 +54,7 @@ OPTIONS=-f $(BUILDPATH)bmake-sub.mak -N \ USRCONFIG=config.txt USRDEFAULT=$(BUILDDIR)\config-$(PLATFORM).def -USRMAKE=$(BUILDDIR)\makefile-$(PLATFORM)-$(COMPILER).inc +USRMAKE=$(BUILDDIR)\bmake-$(PLATFORM)-$(COMPILER).inc OPTIONS=$(OPTIONS) USRCONFIG=$(USRCONFIG) USRMAKE=$(USRMAKE) !endif -- cgit v1.2.1