Update of /cvsroot/pure-data/externals/grill/flext/build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24525/build
Modified Files: bmake.mak gnumake.mak nmake.mak Added Files: bmake-sub.mak build-bcc.bat build-cygwin.sh build-gcc.sh build-mingw.bat build-msvc.bat gnumake-sub.mak nmake-sub.mak Removed Files: config-lnx-pd-gcc.def config-mac-pd-gcc.def config-win-max-mingw.def config-win-max-msvc.def config-win-pd-bcc.def config-win-pd-cygwin.def config-win-pd-mingw.def config-win-pd-msvc.def make-lnx-gen-gcc.inc make-lnx-pd-gcc.inc make-mac-gen-gcc.inc make-mac-pd-gcc.inc make-win-gen-bcc.inc make-win-gen-cygwin.inc make-win-gen-mingw.inc make-win-gen-msvc.inc make-win-max-mingw.inc make-win-max-msvc.inc make-win-msvc.inc make-win-pd-bcc.inc make-win-pd-cygwin.inc make-win-pd-mingw.inc make-win-pd-msvc.inc Log Message: simplified make system updated make system
--- config-win-pd-cygwin.def DELETED ---
--- NEW FILE: build-bcc.bat --- @set build=%~dp0
make -f %build%bmake.mak -N PLATFORM=%1 RTSYS=%2 COMPILER=bcc BUILDPATH=%build% %3 %4 %5 %6 %7 %8 %9
--- NEW FILE: gnumake-sub.mak --- # 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
--- config-mac-pd-gcc.def DELETED ---
--- make-lnx-pd-gcc.inc DELETED ---
--- make-win-pd-msvc.inc DELETED ---
--- NEW FILE: build-mingw.bat --- @set build=%~dp0
mingw32-make -f %build%gnumake.mak PLATFORM=%1 RTSYS=%2 COMPILER=mingw BUILDPATH=%build% %3 %4 %5 %6 %7 %8 %9
--- NEW FILE: build-msvc.bat --- @set build=%~dp0
nmake -f %build%nmake.mak PLATFORM=%1 RTSYS=%2 COMPILER=msvc BUILDPATH=%build% %3 %4 %5 %6 %7 %8 %9
--- make-mac-gen-gcc.inc DELETED ---
Index: bmake.mak =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/build/bmake.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** bmake.mak 18 Dec 2004 05:01:10 -0000 1.1 --- bmake.mak 19 Dec 2004 05:04:13 -0000 1.2 *************** *** 1,29 **** ! # PLATFORM - win # RTSYS - pd/max ! # COMPILER - bcc
! # this should be improved ! BUILDPATH=..\flext\build
! # general settings ! !include $(BUILDPATH)\config-$(PLATFORM)-$(RTSYS)-$(COMPILER).txt
- ###############################
! # these are project specific
! # special package settings ! !include config-$(PLATFORM)-$(COMPILER).txt
! # package specific make stuff ! !include makefile-$(PLATFORM)-$(COMPILER).txt
- # package info - !include make-files.txt
! ##############################
! # platform-specific make stuff ! !include $(BUILDPATH)\make-$(PLATFORM)-$(RTSYS)-$(COMPILER).inc ! # general make stuff ! !include $(BUILDPATH)\make-$(PLATFORM)-gen-$(COMPILER).inc --- 1,78 ---- ! # 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
--- make-win-gen-cygwin.inc DELETED ---
--- NEW FILE: bmake-sub.mak --- !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
--- config-win-pd-mingw.def DELETED ---
--- make-lnx-gen-gcc.inc DELETED ---
--- config-lnx-pd-gcc.def DELETED ---
--- config-win-pd-msvc.def DELETED ---
--- make-win-pd-cygwin.inc DELETED ---
--- NEW FILE: build-cygwin.sh --- build=${0%/*}/
make -f ${build}gnumake.mak PLATFORM=$1 RTSYS=$2 COMPILER=cygwin BUILDPATH=${build} $3 $4 $5 $6 $7 $8 $9
--- make-win-max-mingw.inc DELETED ---
--- make-win-gen-msvc.inc DELETED ---
--- config-win-max-msvc.def DELETED ---
--- NEW FILE: build-gcc.sh --- build=${0%/*}/
make -f ${build}gnumake.mak PLATFORM=$1 RTSYS=$2 COMPILER=gcc BUILDPATH=${build} $3 $4 $5 $6 $7 $8 $9
--- make-mac-pd-gcc.inc DELETED ---
--- make-win-msvc.inc DELETED ---
--- make-win-gen-bcc.inc DELETED ---
--- make-win-pd-bcc.inc DELETED ---
--- NEW FILE: nmake-sub.mak --- # 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
--- make-win-pd-mingw.inc DELETED ---
--- config-win-pd-bcc.def DELETED ---
Index: gnumake.mak =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/build/gnumake.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** gnumake.mak 18 Dec 2004 05:01:10 -0000 1.1 --- gnumake.mak 19 Dec 2004 05:04:13 -0000 1.2 *************** *** 1,28 **** ! # PLATFORM - win/mac/lnx ! # RTSYS - pd/max ! # COMPILER - msvc/gcc/mingw/cygwin ! ! # this should be improved ! BUILDPATH=../flext/build ! ! include $(BUILDPATH)/config-$(PLATFORM)-$(RTSYS)-$(COMPILER).txt ! ! ############################### ! ! # these are project specific ! ! # special settings ! include config-$(PLATFORM)-$(COMPILER).txt ! ! # package specific make stuff ! include makefile-$(PLATFORM)-$(COMPILER).txt ! ! # package info ! include make-files.txt ! ! ############################## ! ! # platform-specific make stuff ! include $(BUILDPATH)/make-$(PLATFORM)-$(RTSYS)-$(COMPILER).inc ! # general make stuff ! include $(BUILDPATH)/make-$(PLATFORM)-gen-$(COMPILER).inc --- 1,89 ---- ! # 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 !
--- make-win-gen-mingw.inc DELETED ---
--- config-win-max-mingw.def DELETED ---
--- make-win-max-msvc.inc DELETED ---
Index: nmake.mak =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/build/nmake.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** nmake.mak 18 Dec 2004 05:01:10 -0000 1.1 --- nmake.mak 19 Dec 2004 05:04:14 -0000 1.2 *************** *** 1,30 **** # PLATFORM - win/mac/lnx # RTSYS - pd/max # COMPILER - msvc/gcc/mingw/cygwin
! # general settings ! !include config-$(PLATFORM)-$(RTSYS)-$(COMPILER).txt
! ###############################
- # these are project specific
! # special package settings ! !if exist(config-$(PLATFORM)-$(COMPILER).txt) ! !include config-$(PLATFORM)-$(COMPILER).txt !endif
! # package specific make stuff ! !if exist(makefile-$(PLATFORM)-$(COMPILER).txt) ! !include makefile-$(PLATFORM)-$(COMPILER).txt !endif
- # package info - !include make-files.txt
! ##############################
! # platform-specific make stuff ! !include make-$(PLATFORM)-$(RTSYS)-$(COMPILER).inc ! # general make stuff ! !include make-$(PLATFORM)-gen-$(COMPILER).inc --- 1,79 ---- + # 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