[PD-cvs] externals/grill/flext/buildsys bmake-sub.mak,1.2,1.3 bmake.mak,1.2,1.3 gnumake-sub.mak,1.2,1.3 gnumake.mak,1.2,1.3 nmake-sub.mak,1.2,1.3 nmake.mak,1.2,1.3

Thomas Grill xovo at users.sourceforge.net
Tue Jan 4 05:58:54 CET 2005


Update of /cvsroot/pure-data/externals/grill/flext/buildsys
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18444/buildsys

Modified Files:
	bmake-sub.mak bmake.mak gnumake-sub.mak gnumake.mak 
	nmake-sub.mak nmake.mak 
Log Message:
updated build system - some cleanups
updated for build system
updated build system for OSX
cleanups
updated build system


Index: bmake.mak
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/bmake.mak,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** bmake.mak	3 Jan 2005 05:00:26 -0000	1.2
--- bmake.mak	4 Jan 2005 04:58:52 -0000	1.3
***************
*** 9,15 ****
  # package info
  
! USRINFO=package.txt
  
! !include $(USRINFO)
  
  ###############################################
--- 9,17 ----
  # package info
  
! !ifndef PKGINFO
! PKGINFO=package.txt
! !endif
  
! !include $(PKGINFO)
  
  ###############################################
***************
*** 17,29 ****
  
  !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
  
--- 19,31 ----
  
  !ifndef BUILDCLASS
! BUILDCLASS=ext
  !endif
  
  !ifndef BUILDMODE
! BUILDMODE=release
  !endif
  
  !ifndef BUILDTYPE
! BUILDTYPE=single
  !endif
  
***************
*** 45,49 ****
  OPTIONS=-f $(BUILDPATH)bmake-sub.mak -N \
  	PLATFORM=$(PLATFORM) RTSYS=$(RTSYS) COMPILER=$(COMPILER) \
! 	BUILDPATH=$(BUILDPATH) USRINFO=$(USRINFO)
  
  ###############################################
--- 47,51 ----
  OPTIONS=-f $(BUILDPATH)bmake-sub.mak -N \
  	PLATFORM=$(PLATFORM) RTSYS=$(RTSYS) COMPILER=$(COMPILER) \
! 	BUILDPATH=$(BUILDPATH) PKGINFO=$(PKGINFO) BUILDCLASS=$(BUILDCLASS)
  
  ###############################################
***************
*** 53,57 ****
  USRDEFAULT=$(BUILDDIR)\config-$(PLATFORM).def
  
! USRMAKE=$(BUILDDIR)\makefile-$(PLATFORM)-$(COMPILER).inc
  
  OPTIONS=$(OPTIONS) USRCONFIG=$(USRCONFIG) USRMAKE=$(USRMAKE)
--- 55,59 ----
  USRDEFAULT=$(BUILDDIR)\config-$(PLATFORM).def
  
! USRMAKE=$(BUILDDIR)\bmake-$(PLATFORM)-$(COMPILER).inc
  
  OPTIONS=$(OPTIONS) USRCONFIG=$(USRCONFIG) USRMAKE=$(USRMAKE)

Index: nmake-sub.mak
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/nmake-sub.mak,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** nmake-sub.mak	3 Jan 2005 05:00:26 -0000	1.2
--- nmake-sub.mak	4 Jan 2005 04:58:52 -0000	1.3
***************
*** 6,10 ****
  
  # package info
! !include $(USRINFO)
  
  # special package settings
--- 6,10 ----
  
  # package info
! !include $(PKGINFO)
  
  # special package settings

Index: gnumake-sub.mak
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/gnumake-sub.mak,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** gnumake-sub.mak	3 Jan 2005 05:00:26 -0000	1.2
--- gnumake-sub.mak	4 Jan 2005 04:58:52 -0000	1.3
***************
*** 6,10 ****
  
  # package info
! include $(USRINFO)
  
  # special settings
--- 6,10 ----
  
  # package info
! include $(PKGINFO)
  
  # special settings

Index: gnumake.mak
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/gnumake.mak,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** gnumake.mak	3 Jan 2005 05:00:26 -0000	1.2
--- gnumake.mak	4 Jan 2005 04:58:52 -0000	1.3
***************
*** 9,15 ****
  # package info
  
! USRINFO=package.txt
  
! include $(USRINFO)
  
  ###############################################
--- 9,17 ----
  # package info
  
! ifndef PKGINFO
! PKGINFO=package.txt
! endif
  
! include $(PKGINFO)
  
  ###############################################
***************
*** 17,29 ****
  
  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
  
--- 19,31 ----
  
  ifndef BUILDCLASS
! BUILDCLASS=ext
  endif
  
  ifndef BUILDMODE
! BUILDMODE=release
  endif
  
  ifndef BUILDTYPE
! BUILDTYPE=single
  endif
  
***************
*** 54,58 ****
  OPTIONS=-f $(UBUILDPATH)gnumake-sub.mak \
  	PLATFORM=$(PLATFORM) RTSYS=$(RTSYS) COMPILER=$(COMPILER) \
! 	BUILDPATH=$(UBUILDPATH) USRINFO=$(USRINFO)
  
  ###############################################
--- 56,60 ----
  OPTIONS=-f $(UBUILDPATH)gnumake-sub.mak \
  	PLATFORM=$(PLATFORM) RTSYS=$(RTSYS) COMPILER=$(COMPILER) \
! 	BUILDPATH=$(UBUILDPATH) PKGINFO=$(PKGINFO) BUILDCLASS=$(BUILDCLASS)
  
  ###############################################
***************
*** 62,66 ****
  USRDEFAULT=$(BUILDDIR)/config-$(PLATFORM).def
  
! USRMAKE=$(BUILDDIR)/makefile-$(PLATFORM)-$(COMPILER).inc
  
  OPTIONS+=USRCONFIG=$(USRCONFIG) USRMAKE=$(USRMAKE)
--- 64,68 ----
  USRDEFAULT=$(BUILDDIR)/config-$(PLATFORM).def
  
! USRMAKE=$(BUILDDIR)/gnumake-$(PLATFORM)-$(COMPILER).inc
  
  OPTIONS+=USRCONFIG=$(USRCONFIG) USRMAKE=$(USRMAKE)

Index: nmake.mak
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/nmake.mak,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** nmake.mak	3 Jan 2005 05:00:26 -0000	1.2
--- nmake.mak	4 Jan 2005 04:58:52 -0000	1.3
***************
*** 9,15 ****
  # package info
  
! USRINFO=package.txt
  
! !include $(USRINFO)
  
  ###############################################
--- 9,17 ----
  # package info
  
! !ifndef PKGINFO
! PKGINFO=package.txt
! !endif
  
! !include $(PKGINFO)
  
  ###############################################
***************
*** 17,29 ****
  
  !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
  
--- 19,31 ----
  
  !ifndef BUILDCLASS
! BUILDCLASS=ext
  !endif
  
  !ifndef BUILDMODE
! BUILDMODE=release
  !endif
  
  !ifndef BUILDTYPE
! BUILDTYPE=single
  !endif
  
***************
*** 45,49 ****
  OPTIONS=-f $(BUILDPATH)nmake-sub.mak \
  	PLATFORM=$(PLATFORM) RTSYS=$(RTSYS) COMPILER=$(COMPILER) \
! 	BUILDPATH=$(BUILDPATH) USRINFO=$(USRINFO)
  
  ###############################################
--- 47,51 ----
  OPTIONS=-f $(BUILDPATH)nmake-sub.mak \
  	PLATFORM=$(PLATFORM) RTSYS=$(RTSYS) COMPILER=$(COMPILER) \
! 	BUILDPATH=$(BUILDPATH) PKGINFO=$(PKGINFO) BUILDCLASS=$(BUILDCLASS)
  
  ###############################################
***************
*** 53,57 ****
  USRDEFAULT=$(BUILDDIR)\config-$(PLATFORM).def
  
! USRMAKE=$(BUILDDIR)\makefile-$(PLATFORM)-$(COMPILER).inc
  
  OPTIONS=$(OPTIONS) USRCONFIG=$(USRCONFIG) USRMAKE=$(USRMAKE)
--- 55,59 ----
  USRDEFAULT=$(BUILDDIR)\config-$(PLATFORM).def
  
! USRMAKE=$(BUILDDIR)\nmake-$(PLATFORM)-$(COMPILER).inc
  
  OPTIONS=$(OPTIONS) USRCONFIG=$(USRCONFIG) USRMAKE=$(USRMAKE)

Index: bmake-sub.mak
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/bmake-sub.mak,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** bmake-sub.mak	3 Jan 2005 05:00:26 -0000	1.2
--- bmake-sub.mak	4 Jan 2005 04:58:52 -0000	1.3
***************
*** 6,10 ****
  
  # package info
! !include $(USRINFO)
  
  # special package settings
--- 6,10 ----
  
  # package info
! !include $(PKGINFO)
  
  # special package settings





More information about the Pd-cvs mailing list