Update of /cvsroot/pure-data/externals/grill/flext/buildsys In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29038/buildsys
Modified Files: bmake-flext.inc bmake-sub.mak bmake.mak gnumake-flext.inc gnumake-sub.mak gnumake.mak nmake-flext.inc nmake-sub.mak nmake.mak Added Files: bmake-ext.inc bmake.inc gnumake-ext.inc gnumake.inc nmake-ext.inc nmake.inc targets-ext.inc targets-flext.inc targets.inc Log Message: updated make system build system for OSX simplified make system reconsidered flext::buffer:Update added object construction and destruction flags updated build system
--- NEW FILE: gnumake-ext.inc --- OUTNAME=$(NAME)
Index: bmake.mak =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/bmake.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** bmake.mak 20 Dec 2004 05:06:16 -0000 1.1 --- bmake.mak 3 Jan 2005 05:00:26 -0000 1.2 *************** *** 6,23 **** # BUILDPATH including trailing \
# package info USRINFO=package.txt
!include $(USRINFO)
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) USRINFO=$(USRINFO)
!ifdef BUILDDIR --- 6,51 ---- # 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)bmake-sub.mak -N \ PLATFORM=$(PLATFORM) RTSYS=$(RTSYS) COMPILER=$(COMPILER) \ BUILDPATH=$(BUILDPATH) USRINFO=$(USRINFO)
+ ###############################################
!ifdef BUILDDIR *************** *** 30,112 **** !endif
! !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_ !
! config: $(USRMAKE) $(SYSCONFIG) $(USRCONFIG)
.precious: $(SYSCONFIG) $(USRCONFIG) --- 58,69 ---- !endif
+ ############################################### + # include file describing default target dependencies
! !include $(BUILDPATH)targets.inc
! !include $(BUILDPATH)targets-$(BUILDCLASS).inc
+ ###############################################
.precious: $(SYSCONFIG) $(USRCONFIG)
--- NEW FILE: bmake.inc --- ############################################## # flext defines ##############################################
!ifdef SHARED # --- shared --- DEFS=$(DEFS) /DFLEXT_SHARED
!else !ifdef THREADED # --- static multi-threaded --- DEFS=$(DEFS) /DFLEXT_THREADS
!else # --- static single-threaded ---
!endif !endif
############################################## # name of flext library ##############################################
!ifdef SHARED
!ifdef DEBUG FLEXTNAME=flext-$(RTSYS)_d !else FLEXTNAME=flext-$(RTSYS) !endif
!else
!ifdef THREADED !ifdef DEBUG FLEXTNAME=flext-$(RTSYS)_td !else FLEXTNAME=flext-$(RTSYS)_t !endif !else !ifdef DEBUG FLEXTNAME=flext-$(RTSYS)_sd !else FLEXTNAME=flext-$(RTSYS)_s !endif !endif
!endif # SHARED
############################################## # product name and folder ##############################################
OUTNAME=$(NAME) OUTSUB=$(TARGETMODE)-$(TARGETTYPE)
--- NEW FILE: bmake-ext.inc --- OUTNAME=$(NAME)
Index: gnumake-flext.inc =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/gnumake-flext.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** gnumake-flext.inc 20 Dec 2004 05:06:16 -0000 1.1 --- gnumake-flext.inc 3 Jan 2005 05:00:26 -0000 1.2 *************** *** 1,89 **** - ############################################## - # flext defines - ############################################## - - ifdef SHARED - # --- shared --- - DEFS+=-DFLEXT_SHARED - - else - ifdef THREADED - # --- static multi-threaded --- - DEFS+=-DFLEXT_THREADS - - else - # --- static single-threaded --- - - endif - endif - - - ifdef FLEXTBUILD DEFS+=-DFLEXT_EXPORTS - endif - - ############################################## - # name of flext library - ############################################## - - ifdef SHARED - - ifdef DEBUG - FLEXTNAME=flext-$(RTSYS)_d - else - FLEXTNAME=flext-$(RTSYS) - endif - - else - - ifdef THREADED - ifdef DEBUG - FLEXTNAME=flext-$(RTSYS)_td - else - FLEXTNAME=flext-$(RTSYS)_t - endif - else - ifdef DEBUG - FLEXTNAME=flext-$(RTSYS)_d - else - FLEXTNAME=flext-$(RTSYS) - endif - endif - - endif # SHARED - - ############################################## - # build subdirectories - ############################################## - - ifdef FLEXTBUILD - - ifdef SHARED - - ifdef DEBUG - OUTSUB=dd - else - OUTSUB=dr - endif
! else # SHARED ! ! ifdef THREADED ! ifdef DEBUG ! OUTSUB=td ! else ! OUTSUB=tr ! endif ! else ! ifdef DEBUG ! OUTSUB=sd ! else ! OUTSUB=sr ! endif ! endif ! ! endif # SHARED ! ! else # FLEXTBUILD ! OUTSUB=. ! endif # FLEXTBUILD --- 1,3 ---- DEFS+=-DFLEXT_EXPORTS
! OUTNAME=lib$(FLEXTNAME)
Index: gnumake-sub.mak =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/gnumake-sub.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** gnumake-sub.mak 20 Dec 2004 05:06:16 -0000 1.1 --- gnumake-sub.mak 3 Jan 2005 05:00:26 -0000 1.2 *************** *** 3,8 ****
############################### ! ! # these are project specific
# package info --- 3,7 ----
############################### ! # project specific definitions
# package info *************** *** 11,29 **** # special settings ifdef USRCONFIG ! include $(USRCONFIG) endif
# package specific make stuff ifdef USRMAKE ! include $(USRMAKE) endif
##############################
! # flext-specific make stuff ! include $(BUILDPATH)gnumake-flext.inc
# platform-specific make stuff ! include $(BUILDPATH)$(PLATFORM)/$(RTSYS)/make-$(COMPILER).inc # general make stuff ! include $(BUILDPATH)$(PLATFORM)/make-$(COMPILER).inc --- 10,61 ---- # special settings ifdef USRCONFIG ! include $(USRCONFIG) endif
# package specific make stuff ifdef 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
+ include $(BUILDPATH)gnumake.inc + + ############################## # platform-specific make stuff ! ! include $(BUILDPATH)$(PLATFORM)/$(RTSYS)/gnumake-$(COMPILER)-$(BUILDCLASS).inc ! ! include $(BUILDPATH)$(PLATFORM)/$(RTSYS)/gnumake-$(COMPILER).inc ! ! ############################## # general make stuff ! ! include $(BUILDPATH)$(PLATFORM)/gnumake-$(COMPILER)-$(BUILDCLASS).inc ! ! include $(BUILDPATH)$(PLATFORM)/gnumake-$(COMPILER).inc
--- NEW FILE: nmake-ext.inc --- OUTNAME=$(NAME)
Index: bmake-sub.mak =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/bmake-sub.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** bmake-sub.mak 20 Dec 2004 05:06:16 -0000 1.1 --- bmake-sub.mak 3 Jan 2005 05:00:26 -0000 1.2 *************** *** 1,7 **** !include $(BUILDPATH)config-$(PLATFORM)-$(RTSYS)-$(COMPILER).txt
############################### ! ! # these are project specific
# package info --- 1,7 ---- + # general settings !include $(BUILDPATH)config-$(PLATFORM)-$(RTSYS)-$(COMPILER).txt
############################### ! # project-specific definitions
# package info *************** *** 20,28 **** ##############################
# flext-specific make stuff - !include $(BUILDPATH)bmake-flext.inc
# platform-specific make stuff ! !include $(BUILDPATH)$(PLATFORM)$(RTSYS)\make-$(COMPILER).inc # general make stuff ! !include $(BUILDPATH)$(PLATFORM)\make-$(COMPILER).inc --- 20,61 ---- ##############################
+ !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 make stuff
+ !include $(BUILDPATH)bmake-$(BUILDCLASS).inc + + !include $(BUILDPATH)bmake.inc + + ############################## # platform-specific make stuff ! ! !include $(BUILDPATH)$(PLATFORM)$(RTSYS)\bmake-$(COMPILER)-$(BUILDCLASS).inc ! ! !include $(BUILDPATH)$(PLATFORM)$(RTSYS)\bmake-$(COMPILER).inc ! ! ############################## # general make stuff ! ! !include $(BUILDPATH)$(PLATFORM)\bmake-$(COMPILER)-$(BUILDCLASS).inc ! ! !include $(BUILDPATH)$(PLATFORM)\bmake-$(COMPILER).inc
Index: bmake-flext.inc =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/bmake-flext.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** bmake-flext.inc 20 Dec 2004 05:06:16 -0000 1.1 --- bmake-flext.inc 3 Jan 2005 05:00:26 -0000 1.2 *************** *** 1,90 **** - ############################################## - # flext defines - ############################################## - - !ifdef SHARED - # --- shared --- - DEFS=$(DEFS) /DFLEXT_SHARED - - !else - !ifdef THREADED - # --- static multi-threaded --- - DEFS=$(DEFS) /DFLEXT_THREADS - - !else - # --- static single-threaded --- - - !endif - !endif - - - !ifdef FLEXTBUILD DEFS=$(DEFS) /DFLEXT_EXPORTS - !endif - - ############################################## - # name of flext library - ############################################## - - !ifdef SHARED - - !ifdef DEBUG - FLEXTNAME=flext-$(RTSYS)_d - !else - FLEXTNAME=flext-$(RTSYS) - !endif - - !else - - !ifdef THREADED - !ifdef DEBUG - FLEXTNAME=flext-$(RTSYS)_td - !else - FLEXTNAME=flext-$(RTSYS)_t - !endif - !else - !ifdef DEBUG - FLEXTNAME=flext-$(RTSYS)_d - !else - FLEXTNAME=flext-$(RTSYS) - !endif - !endif - - !endif # SHARED - - ############################################## - # build subdirectories - ############################################## - - !ifdef FLEXTBUILD - - !ifdef SHARED - - !ifdef DEBUG - OUTSUB=dd - !else - OUTSUB=dr - !endif - - !else # SHARED - - !ifdef THREADED - !ifdef DEBUG - OUTSUB=td - !else - OUTSUB=tr - !endif - !else - !ifdef DEBUG - OUTSUB=sd - !else - OUTSUB=sr - !endif - !endif - - !endif # SHARED - - !else # FLEXTBUILD - OUTSUB=. - !endif # FLEXTBUILD
--- 1,3 ---- DEFS=$(DEFS) /DFLEXT_EXPORTS
+ OUTNAME=$(FLEXTNAME)
Index: nmake-sub.mak =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/nmake-sub.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** nmake-sub.mak 20 Dec 2004 05:06:16 -0000 1.1 --- nmake-sub.mak 3 Jan 2005 05:00:26 -0000 1.2 *************** *** 3,6 **** --- 3,7 ----
############################## + # project-specific definitions
# package info *************** *** 19,27 **** ##############################
! # flext-specific make stuff ! !include $(BUILDPATH)nmake-flext.inc
# platform-specific make stuff ! !include $(BUILDPATH)$(PLATFORM)$(RTSYS)\make-$(COMPILER).inc # general make stuff ! !include $(BUILDPATH)$(PLATFORM)\make-$(COMPILER).inc --- 20,61 ---- ##############################
! !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)\nmake-$(COMPILER)-$(BUILDCLASS).inc ! ! !include $(BUILDPATH)$(PLATFORM)$(RTSYS)\nmake-$(COMPILER).inc ! ! ############################## # general make stuff ! ! !include $(BUILDPATH)$(PLATFORM)\nmake-$(COMPILER)-$(BUILDCLASS).inc ! ! !include $(BUILDPATH)$(PLATFORM)\nmake-$(COMPILER).inc
Index: nmake-flext.inc =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/nmake-flext.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** nmake-flext.inc 20 Dec 2004 05:06:16 -0000 1.1 --- nmake-flext.inc 3 Jan 2005 05:00:26 -0000 1.2 *************** *** 1,88 **** - ############################################## - # flext defines - ############################################## - - !ifdef SHARED - # --- shared --- - DEFS=$(DEFS) /DFLEXT_SHARED - - !elseifdef THREADED - # --- static multi-threaded --- - DEFS=$(DEFS) /DFLEXT_THREADS - - !else - # --- static single-threaded --- - - !endif - - - !ifdef FLEXTBUILD DEFS=$(DEFS) /DFLEXT_EXPORTS - !endif - - ############################################## - # name of flext library - ############################################## - - !ifdef SHARED - - !ifdef DEBUG - FLEXTNAME=flext-$(RTSYS)_d - !else - FLEXTNAME=flext-$(RTSYS) - !endif - - !else - - !ifdef THREADED - !ifdef DEBUG - FLEXTNAME=flext-$(RTSYS)_td - !else - FLEXTNAME=flext-$(RTSYS)_t - !endif - !else - !ifdef DEBUG - FLEXTNAME=flext-$(RTSYS)_d - !else - FLEXTNAME=flext-$(RTSYS) - !endif - !endif - - !endif # SHARED - - ############################################## - # build subdirectories - ############################################## - - !ifdef FLEXTBUILD - - !ifdef SHARED - - !ifdef DEBUG - OUTSUB=dd - !else - OUTSUB=dr - !endif - - !else # SHARED - - !ifdef THREADED - !ifdef DEBUG - OUTSUB=td - !else - OUTSUB=tr - !endif - !else - !ifdef DEBUG - OUTSUB=sd - !else - OUTSUB=sr - !endif - !endif - - !endif # SHARED - - !else # FLEXTBUILD - OUTSUB=. - !endif # FLEXTBUILD
--- 1,3 ---- DEFS=$(DEFS) /DFLEXT_EXPORTS
+ OUTNAME=$(FLEXTNAME)
--- NEW FILE: targets.inc --- all: build-default-default
clean: clean-default-default
install: install-default-default
###########################################################
build-default-default: build-$(TARGETMODE)-$(TARGETTYPE)
install-default-default: install-$(TARGETMODE)-$(TARGETTYPE)
clean-default-default: clean-$(TARGETMODE)-$(TARGETTYPE)
###########################################################
build-release-single: config $(MAKE) $(OPTIONS) _build_
build-debug-single: config $(MAKE) $(OPTIONS) DEBUG=1 _build_
build-release-multi: config $(MAKE) $(OPTIONS) THREADED=1 _build_
build-debug-multi: config $(MAKE) $(OPTIONS) THREADED=1 DEBUG=1 _build_
build-release-shared: config $(MAKE) $(OPTIONS) SHARED=1 _build_
build-debug-shared: config $(MAKE) $(OPTIONS) SHARED=1 DEBUG=1 _build_
###########################################################
install-release-single: $(MAKE) $(OPTIONS) _install_
install-debug-single: $(MAKE) $(OPTIONS) DEBUG=1 _install_
install-release-multi: $(MAKE) $(OPTIONS) THREADED=1 _install_
install-debug-multi: $(MAKE) $(OPTIONS) THREADED=1 DEBUG=1 _install_
install-release-shared: $(MAKE) $(OPTIONS) SHARED=1 _install_
install-debug-shared: $(MAKE) $(OPTIONS) SHARED=1 DEBUG=1 _install_
###########################################################
clean-release-single: $(MAKE) $(OPTIONS) _clean_
clean-debug-single: $(MAKE) $(OPTIONS) DEBUG=1 _clean_
clean-release-multi: $(MAKE) $(OPTIONS) THREADED=1 _clean_
clean-debug-multi: $(MAKE) $(OPTIONS) THREADED=1 DEBUG=1 _clean_
clean-release-shared: $(MAKE) $(OPTIONS) SHARED=1 _clean_
clean-debug-shared: $(MAKE) $(OPTIONS) SHARED=1 DEBUG=1 _clean_
###########################################################
config: $(USRMAKE) $(SYSCONFIG) $(USRCONFIG)
--- NEW FILE: targets-ext.inc ---
Index: gnumake.mak =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/gnumake.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** gnumake.mak 20 Dec 2004 05:06:16 -0000 1.1 --- gnumake.mak 3 Jan 2005 05:00:26 -0000 1.2 *************** *** 6,14 **** --- 6,42 ---- # 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 + + ###############################################
ifeq ($(PLATFORM),win) *************** *** 19,31 **** 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) USRINFO=$(USRINFO)
ifdef BUILDDIR --- 47,60 ---- 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) USRINFO=$(USRINFO)
+ ###############################################
ifdef BUILDDIR *************** *** 38,121 **** endif
! 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_ ! !
! config: $(USRMAKE) $(SYSCONFIG) $(USRCONFIG)
.precious: $(SYSCONFIG) $(USRCONFIG) --- 67,78 ---- endif
+ ############################################### + # include file describing default target dependencies
! include $(BUILDPATH)targets.inc
! include $(BUILDPATH)targets-$(BUILDCLASS).inc
+ ###############################################
.precious: $(SYSCONFIG) $(USRCONFIG)
--- NEW FILE: nmake.inc --- ############################################## # flext defines ##############################################
!ifdef SHARED # --- shared --- DEFS=$(DEFS) /DFLEXT_SHARED
!elseifdef THREADED # --- static multi-threaded --- DEFS=$(DEFS) /DFLEXT_THREADS
!else # --- static single-threaded ---
!endif
############################################## # name of flext library ##############################################
!ifdef SHARED
!ifdef DEBUG FLEXTNAME=flext-$(RTSYS)_d !else FLEXTNAME=flext-$(RTSYS) !endif
!else
!ifdef THREADED !ifdef DEBUG FLEXTNAME=flext-$(RTSYS)_td !else FLEXTNAME=flext-$(RTSYS)_t !endif !else !ifdef DEBUG FLEXTNAME=flext-$(RTSYS)_sd !else FLEXTNAME=flext-$(RTSYS)_s !endif !endif
!endif # SHARED
############################################## # product name and folder ##############################################
OUTSUB=$(TARGETMODE)-$(TARGETTYPE)
--- NEW FILE: targets-flext.inc --- build-default-default: build-all-all
install-default-default: install-all-all
clean-default-default: clean-all-all
###################################################
build-all-all: build-release-all build-debug-all
build-release-all: build-release-single build-release-multi build-release-shared
build-debug-all: build-debug-single build-debug-multi build-debug-shared
###################################################
install-all-all: install-release-all install-debug-all
install-release-all: install-release-single install-release-multi install-release-shared
install-debug-all: install-debug-single install-debug-multi install-debug-shared
###################################################
clean-all-all: clean-release-all clean-debug-all
clean-release-all: clean-release-single clean-release-multi clean-release-shared
clean-debug-all: clean-debug-single clean-debug-multi clean-debug-shared
Index: nmake.mak =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/nmake.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** nmake.mak 20 Dec 2004 05:06:16 -0000 1.1 --- nmake.mak 3 Jan 2005 05:00:26 -0000 1.2 *************** *** 6,23 **** # BUILDPATH including trailing \
# package info USRINFO=package.txt
!include $(USRINFO)
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 --- 6,51 ---- # 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 *************** *** 30,113 **** !endif
! !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_ ! !
! config: $(USRMAKE) $(SYSCONFIG) $(USRCONFIG)
.precious: $(SYSCONFIG) $(USRCONFIG) --- 58,69 ---- !endif
+ ############################################### + # include file describing default target dependencies
! !include $(BUILDPATH)targets.inc
! !include $(BUILDPATH)targets-$(BUILDCLASS).inc
+ ###############################################
.precious: $(SYSCONFIG) $(USRCONFIG)
--- NEW FILE: gnumake.inc --- ############################################## # flext defines ##############################################
ifdef SHARED # --- shared --- DEFS+=-DFLEXT_SHARED
else ifdef THREADED # --- static multi-threaded --- DEFS+=-DFLEXT_THREADS
else # --- static single-threaded ---
endif endif
############################################## # name of flext library ##############################################
ifdef SHARED
ifdef DEBUG FLEXTNAME=flext-$(RTSYS)_d else FLEXTNAME=flext-$(RTSYS) endif
else
ifdef THREADED ifdef DEBUG FLEXTNAME=flext-$(RTSYS)_td else FLEXTNAME=flext-$(RTSYS)_t endif else ifdef DEBUG FLEXTNAME=flext-$(RTSYS)_sd else FLEXTNAME=flext-$(RTSYS)_s endif endif
endif # SHARED
############################################## # product name and folder ##############################################
OUTSUB=$(TARGETMODE)-$(TARGETTYPE)