simplified make system

updated make system for BCC
updated make system
updated build system

svn path=/trunk/; revision=2416

17 files changed, 66 insertions, 336 deletions

diff --git a/externals/grill/flext/build/bmake-sub.mak b/externals/grill/flext/build/bmake-sub.mak
deleted file mode 100644
index bf9fc6c5..00000000
--- a/externals/grill/flext/build/bmake-sub.mak
+++ /dev/null
@@ -1,25 +0,0 @@
-!include $(BUILDPATH)config-$(PLATFORM)-$(RTSYS)-$(COMPILER).txt

-

-###############################

-

-# these are project specific

-

-# package info

-!include build\package.txt

-

-# special package settings

-!ifdef USRCONFIG

-!include $(USRCONFIG)

-!endif

-

-# package specific make stuff

-!ifdef USRMAKE

-!include $(USRMAKE)

-!endif

-

-##############################

-

-# platform-specific make stuff

-!include $(BUILDPATH)$(PLATFORM)\$(RTSYS)\make-$(COMPILER).inc

-# general make stuff

-!include $(BUILDPATH)$(PLATFORM)\make-$(COMPILER).inc

diff --git a/externals/grill/flext/build/bmake.mak b/externals/grill/flext/build/bmake.mak
deleted file mode 100644
index 1a3fc47d..00000000
--- a/externals/grill/flext/build/bmake.mak
+++ /dev/null
@@ -1,78 +0,0 @@
-# required settings:

-#

-# PLATFORM - win/mac/lnx

-# RTSYS - pd/max

-# COMPILER - msvc/gcc/mingw/cygwin

-# BUILDPATH including trailing \

-

-# package info

-!include build\package.txt

-

-SYSCONFIG=$(BUILDPATH)config-$(PLATFORM)-$(RTSYS)-$(COMPILER).txt

-SYSDEFAULT=$(BUILDPATH)$(PLATFORM)\$(RTSYS)\config-$(COMPILER).def

-

-

-OPTIONS=-f $(BUILDPATH)bmake-sub.mak -N \

-	PLATFORM=$(PLATFORM) RTSYS=$(RTSYS) COMPILER=$(COMPILER) \

-	BUILDPATH=$(BUILDPATH)

-

-!ifdef HAVECONFIG

-USRCONFIG=config.txt

-USRDEFAULT=build\config-$(PLATFORM).def

-OPTIONS=$(OPTIONS) USRCONFIG=$(USRCONFIG)

-!endif

-

-!ifdef HAVEMAKE

-USRMAKE=build\makefile-$(PLATFORM)-$(COMPILER).inc

-OPTIONS=$(OPTIONS) USRMAKE=$(USRMAKE)

-!endif

-

-

-all: config

-	$(MAKE) $(OPTIONS) all

-

-all-debug: config

-	$(MAKE) $(OPTIONS) DEBUG=1 $@

-

-all-shared: config

-	$(MAKE) $(OPTIONS) SHARED=1 $@

-

-all-shared-debug: config

-	$(MAKE) $(OPTIONS) SHARED=1 DEBUG=1 $@

-

-clean install:

-	$(MAKE) $(OPTIONS) $@

-

-

-config: $(USRMAKE) $(SYSCONFIG) $(USRCONFIG) 

-

-

-.precious: $(SYSCONFIG) $(USRCONFIG)

-

-$(SYSCONFIG): $(SYSDEFAULT)

-	@copy $** $@

-	@echo -------------------------------------------------------------------------

-	@echo A default system configuration file has been created.

-	@echo Please edit $(SYSCONFIG) 

-	@echo to match your platform and start again.

-	@echo -------------------------------------------------------------------------

-	@exit 1

-

-!ifdef HAVECONFIG	

-$(USRCONFIG): $(USRDEFAULT)

-	@copy $** $@

-	@echo -------------------------------------------------------------------------

-	@echo A default package configuration file has been created.

-	@echo Please edit $(USRCONFIG) and start again.

-	@echo -------------------------------------------------------------------------

-	@exit 1

-!endif

-

-!ifdef HAVEMAKE

-$(USRMAKE):

-	@echo -------------------------------------------------------------------------

-	@echo Your combination of platform, system and compiler is not supported yet.

-	@echo Required file: $(USRMAKE)

-	@echo -------------------------------------------------------------------------

-	@exit 1

-!endif

diff --git a/externals/grill/flext/build/build-bcc.bat b/externals/grill/flext/build/build-bcc.bat
deleted file mode 100644
index 00e48b72..00000000
--- a/externals/grill/flext/build/build-bcc.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@set build=%~dp0

-

-make -f %build%bmake.mak -N PLATFORM=%1 RTSYS=%2 COMPILER=bcc BUILDPATH=%build% %3 %4 %5 %6 %7 %8 %9

diff --git a/externals/grill/flext/build/build-cygwin.sh b/externals/grill/flext/build/build-cygwin.sh
deleted file mode 100644
index df3b4f7b..00000000
--- a/externals/grill/flext/build/build-cygwin.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-build=${0%/*}/

-

-make -f ${build}gnumake.mak PLATFORM=$1 RTSYS=$2 COMPILER=cygwin BUILDPATH=${build} $3 $4 $5 $6 $7 $8 $9

diff --git a/externals/grill/flext/build/build-gcc.sh b/externals/grill/flext/build/build-gcc.sh
deleted file mode 100644
index 3fffd918..00000000
--- a/externals/grill/flext/build/build-gcc.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-build=${0%/*}/
-
-make -f ${build}gnumake.mak PLATFORM=$1 RTSYS=$2 COMPILER=gcc BUILDPATH=${build} $3 $4 $5 $6 $7 $8 $9
diff --git a/externals/grill/flext/build/build-mingw.bat b/externals/grill/flext/build/build-mingw.bat
deleted file mode 100644
index 2c946bff..00000000
--- a/externals/grill/flext/build/build-mingw.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@set build=%~dp0

-

-mingw32-make -f %build%gnumake.mak PLATFORM=%1 RTSYS=%2 COMPILER=mingw BUILDPATH=%build% %3 %4 %5 %6 %7 %8 %9

diff --git a/externals/grill/flext/build/build-msvc.bat b/externals/grill/flext/build/build-msvc.bat
deleted file mode 100644
index c50ed8e9..00000000
--- a/externals/grill/flext/build/build-msvc.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@set build=%~dp0

-

-nmake -f %build%nmake.mak PLATFORM=%1 RTSYS=%2 COMPILER=msvc BUILDPATH=%build% %3 %4 %5 %6 %7 %8 %9

diff --git a/externals/grill/flext/build/config-lnx.def b/externals/grill/flext/build/config-lnx.def
new file mode 100644
index 00000000..d112b5a3
--- /dev/null
+++ b/externals/grill/flext/build/config-lnx.def
@@ -0,0 +1,7 @@
+# where is the STK installation?

+# (uncomment the line with # to disable STK support)

+#STK=/usr/local/lib/stk

+

+# where is the Sndobjs installation?

+# (uncomment the line with # to disable SNDOBJ support)

+#SNDOBJ=/usr/local/lib/sndobj

diff --git a/externals/grill/flext/build/config-win.def b/externals/grill/flext/build/config-win.def
new file mode 100644
index 00000000..13515818
--- /dev/null
+++ b/externals/grill/flext/build/config-win.def
@@ -0,0 +1,7 @@
+# where is the STK installation?

+# (uncomment the line with # to disable STK support)

+#STK=c:\data\prog\audio\stk

+

+# where is the Sndobjs installation?

+# (uncomment the line with # to disable SNDOBJ support)

+#SNDOBJ=c:\data\prog\audio\sndobj

diff --git a/externals/grill/flext/build/gnumake-sub.mak b/externals/grill/flext/build/gnumake-sub.mak
deleted file mode 100644
index c4b1f0cf..00000000
--- a/externals/grill/flext/build/gnumake-sub.mak
+++ /dev/null
@@ -1,26 +0,0 @@
-# system settings
-include $(BUILDPATH)config-$(PLATFORM)-$(RTSYS)-$(COMPILER).txt
-
-###############################
-
-# these are project specific
-
-# package info
-include build/package.txt
-
-# special settings
-ifdef USRCONFIG
-include $(USRCONFIG)
-endif
-
-# package specific make stuff
-ifdef USRMAKE
-include $(USRMAKE)
-endif
-
-##############################
-
-# platform-specific make stuff
-include $(BUILDPATH)$(PLATFORM)/$(RTSYS)/make-$(COMPILER).inc
-# general make stuff
-include $(BUILDPATH)$(PLATFORM)/make-$(COMPILER).inc
diff --git a/externals/grill/flext/build/gnumake.mak b/externals/grill/flext/build/gnumake.mak
deleted file mode 100644
index 48283692..00000000
--- a/externals/grill/flext/build/gnumake.mak
+++ /dev/null
@@ -1,89 +0,0 @@
-# required settings:
-#
-# PLATFORM - win/mac/lnx
-# RTSYS - pd/max
-# COMPILER - msvc/gcc/mingw/cygwin
-# BUILDPATH including trailing /
-
-# package info
-include build/package.txt
-
-
-ifeq ($(PLATFORM),win)
-	# substitute eventual \ by /
-	UBUILDPATH=$(subst \,/,$(BUILDPATH))
-else
-	UBUILDPATH=$(BUILDPATH)
-endif
-
-
-SYSCONFIG=$(UBUILDPATH)config-$(PLATFORM)-$(RTSYS)-$(COMPILER).txt
-SYSDEFAULT=$(UBUILDPATH)$(PLATFORM)/$(RTSYS)/config-$(COMPILER).def
-
-
-OPTIONS=-f $(UBUILDPATH)gnumake-sub.mak \
-	PLATFORM=$(PLATFORM) RTSYS=$(RTSYS) COMPILER=$(COMPILER) \
-	BUILDPATH=$(UBUILDPATH)
-
-
-ifdef HAVECONFIG
-USRCONFIG=config.txt
-USRDEFAULT=build/config-$(PLATFORM).def
-OPTIONS+=USRCONFIG=$(USRCONFIG)
-endif
-
-ifdef HAVEMAKE
-USRMAKE=build/makefile-$(PLATFORM)-$(COMPILER).inc
-OPTIONS+=USRMAKE=$(USRMAKE)
-endif
-
-
-all: config
-	$(MAKE) $(OPTIONS) all
-
-all-debug: config
-	$(MAKE) $(OPTIONS) DEBUG=1 $@
-
-all-shared: config
-	$(MAKE) $(OPTIONS) SHARED=1 $@
-
-all-shared-debug: config
-	$(MAKE) $(OPTIONS) SHARED=1 DEBUG=1 $@
-
-clean install:
-	$(MAKE) $(OPTIONS) $@
-
-
-config: $(USRMAKE) $(SYSCONFIG) $(USRCONFIG) 
-
-
-.precious: $(SYSCONFIG) $(USRCONFIG)
-
-$(SYSCONFIG): $(SYSDEFAULT)
-	@cp $< $@
-	@echo -------------------------------------------------------------------------
-	@echo A default system configuration file has been created.
-	@echo Please edit $(SYSCONFIG) 
-	@echo to match your platform and start again.
-	@echo -------------------------------------------------------------------------
-	@false
-
-ifdef HAVECONFIG	
-$(USRCONFIG): $(USRDEFAULT)
-	@cp $< $@
-	@echo -------------------------------------------------------------------------
-	@echo A default package configuration file has been created.
-	@echo Please edit $(USRCONFIG) and start again.
-	@echo -------------------------------------------------------------------------
-	@false
-endif
-
-ifdef HAVEMAKE
-$(USRMAKE):
-	@echo -------------------------------------------------------------------------
-	@echo Your combination of platform, system and compiler is not supported yet.
-	@echo Required file: $(USRMAKE)
-	@echo -------------------------------------------------------------------------
-	@false
-endif
-
diff --git a/externals/grill/flext/build/makefile-win-bcc.inc b/externals/grill/flext/build/makefile-win-bcc.inc
new file mode 100644
index 00000000..23434935
--- /dev/null
+++ b/externals/grill/flext/build/makefile-win-bcc.inc
@@ -0,0 +1,13 @@
+!ifdef SNDOBJ

+SRCS=$(SRCS) $(SRCS_SNDOBJ)

+HDRS=$(HDRS) $(HDRS_SNDOBJ)

+INCPATH=$(INCPATH) /I$(SNDOBJ)\include

+LIBS=$(LIBS) $(SNDOBJ)\lib\sndobj.lib

+!endif

+

+!ifdef STK

+SRCS=$(SRCS) $(SRCS_STK)

+HDRS=$(HDRS) $(HDRS_STK)

+INCPATH=$(INCPATH) /I$(STK)\include

+LIBS=$(LIBS) $(STK)\lib\stk.lib

+!endif

diff --git a/externals/grill/flext/build/makefile-win-cygwin.inc b/externals/grill/flext/build/makefile-win-cygwin.inc
new file mode 100644
index 00000000..a119a298
--- /dev/null
+++ b/externals/grill/flext/build/makefile-win-cygwin.inc
@@ -0,0 +1,13 @@
+ifdef SNDOBJ

+SRCS+=$(SRCS_SNDOBJ)

+HDRS+=$(HDRS_SNDOBJ)

+INCPATH+=-I$(SNDOBJ)

+LIBS+=-lsndobj

+endif

+

+ifdef STK

+SRCS+=$(SRCS_STK)

+HDRS+=$(HDRS_STK)

+INCPATH+=-I$(STK)

+LIBS+=-lstk

+endif

diff --git a/externals/grill/flext/build/makefile-win-mingw.inc b/externals/grill/flext/build/makefile-win-mingw.inc
new file mode 100644
index 00000000..a119a298
--- /dev/null
+++ b/externals/grill/flext/build/makefile-win-mingw.inc
@@ -0,0 +1,13 @@
+ifdef SNDOBJ

+SRCS+=$(SRCS_SNDOBJ)

+HDRS+=$(HDRS_SNDOBJ)

+INCPATH+=-I$(SNDOBJ)

+LIBS+=-lsndobj

+endif

+

+ifdef STK

+SRCS+=$(SRCS_STK)

+HDRS+=$(HDRS_STK)

+INCPATH+=-I$(STK)

+LIBS+=-lstk

+endif

diff --git a/externals/grill/flext/build/makefile-win-msvc.inc b/externals/grill/flext/build/makefile-win-msvc.inc
new file mode 100644
index 00000000..23434935
--- /dev/null
+++ b/externals/grill/flext/build/makefile-win-msvc.inc
@@ -0,0 +1,13 @@
+!ifdef SNDOBJ

+SRCS=$(SRCS) $(SRCS_SNDOBJ)

+HDRS=$(HDRS) $(HDRS_SNDOBJ)

+INCPATH=$(INCPATH) /I$(SNDOBJ)\include

+LIBS=$(LIBS) $(SNDOBJ)\lib\sndobj.lib

+!endif

+

+!ifdef STK

+SRCS=$(SRCS) $(SRCS_STK)

+HDRS=$(HDRS) $(HDRS_STK)

+INCPATH=$(INCPATH) /I$(STK)\include

+LIBS=$(LIBS) $(STK)\lib\stk.lib

+!endif

diff --git a/externals/grill/flext/build/nmake-sub.mak b/externals/grill/flext/build/nmake-sub.mak
deleted file mode 100644
index 75f8ea9e..00000000
--- a/externals/grill/flext/build/nmake-sub.mak
+++ /dev/null
@@ -1,24 +0,0 @@
-# general settings

-!include $(BUILDPATH)config-$(PLATFORM)-$(RTSYS)-$(COMPILER).txt

-

-##############################

-

-# package info

-!include build/package.txt

-

-# special package settings

-!ifdef USRCONFIG

-!include $(USRCONFIG)

-!endif

-

-# package specific make stuff

-!ifdef USRMAKE

-!include $(USRMAKE)

-!endif

-

-##############################

-

-# platform-specific make stuff

-!include $(BUILDPATH)$(PLATFORM)\$(RTSYS)\make-$(COMPILER).inc

-# general make stuff

-!include $(BUILDPATH)$(PLATFORM)\make-$(COMPILER).inc

diff --git a/externals/grill/flext/build/nmake.mak b/externals/grill/flext/build/nmake.mak
deleted file mode 100644
index 35b3de0c..00000000
--- a/externals/grill/flext/build/nmake.mak
+++ /dev/null
@@ -1,79 +0,0 @@
-# required settings:

-#

-# PLATFORM - win/mac/lnx

-# RTSYS - pd/max

-# COMPILER - msvc/gcc/mingw/cygwin

-# BUILDPATH including trailing \

-

-# package info

-!include build\package.txt

-

-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)

-

-

-!ifdef HAVECONFIG

-USRCONFIG=config.txt

-USRDEFAULT=build\config-$(PLATFORM).def

-OPTIONS=$(OPTIONS) USRCONFIG=$(USRCONFIG)

-!endif

-

-!ifdef HAVEMAKE

-USRMAKE=build\makefile-$(PLATFORM)-$(COMPILER).inc

-OPTIONS=$(OPTIONS) USRMAKE=$(USRMAKE)

-!endif

-

-

-all: config

-	$(MAKE) $(OPTIONS) all

-

-all-debug: config

-	$(MAKE) $(OPTIONS) DEBUG=1 $@

-

-all-shared: config

-	$(MAKE) $(OPTIONS) SHARED=1 $@

-

-all-shared-debug: config

-	$(MAKE) $(OPTIONS) SHARED=1 DEBUG=1 $@

-

-clean install:

-	$(MAKE) $(OPTIONS) $@

-

-

-config: $(USRMAKE) $(SYSCONFIG) $(USRCONFIG) 

-

-

-.precious: $(SYSCONFIG) $(USRCONFIG)

-

-$(SYSCONFIG): $(SYSDEFAULT)

-	@copy $** $@

-	@echo -------------------------------------------------------------------------

-	@echo A default system configuration file has been created.

-	@echo Please edit $(SYSCONFIG) 

-	@echo to match your platform and start again.

-	@echo -------------------------------------------------------------------------

-	@exit 1

-

-!ifdef HAVECONFIG	

-$(USRCONFIG): $(USRDEFAULT)

-	@copy $** $@

-	@echo -------------------------------------------------------------------------

-	@echo A default package configuration file has been created.

-	@echo Please edit $(USRCONFIG) and start again.

-	@echo -------------------------------------------------------------------------

-	@exit 1

-!endif

-

-!ifdef HAVEMAKE

-$(USRMAKE):

-	@echo -------------------------------------------------------------------------

-	@echo Your combination of platform, system and compiler is not supported yet.

-	@echo Required file: $(USRMAKE)

-	@echo -------------------------------------------------------------------------

-	@exit 1

-!endif