[PD-cvs] externals/grill/flext/buildsys/mac gnumake-gcc-ext.inc, 1.3, 1.4 gnumake-gcc-flext.inc, 1.3, 1.4 gnumake-gcc.inc, 1.4, 1.5

Thomas Grill xovo at users.sourceforge.net
Mon Apr 11 00:22:42 CEST 2005


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

Modified Files:
	gnumake-gcc-ext.inc gnumake-gcc-flext.inc gnumake-gcc.inc 
Log Message:
fixed library versioning
updates for build system
small fix
updates to build system
fix tutorial compilation
install build system and a convenient script
first steps to flext framework for OSX


Index: gnumake-gcc.inc
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/mac/gnumake-gcc.inc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** gnumake-gcc.inc	10 Jan 2005 04:58:41 -0000	1.4
--- gnumake-gcc.inc	10 Apr 2005 22:22:39 -0000	1.5
***************
*** 1,4 ****
--- 1,22 ----
  ##############################################
  
+ ifneq (,$(findstring Frameworks,$(FLEXTPREFIX)))
+ FLEXTFRAMEWORK=$(FLEXTPREFIX)/flext.framework
+ endif
+ 
+ ifdef FLEXTFRAMEWORK
+ FLEXTLIB=$(FLEXTFRAMEWORK)
+ FLEXTINC=$(FLEXTFRAMEWORK)/Headers
+ FLEXTSYS=$(FLEXTFRAMEWORK)/Resources
+ else
+ FLEXTLIB=$(FLEXTPREFIX)/lib
+ FLEXTINC=$(FLEXTPREFIX)/include/flext
+ FLEXTSYS=$(FLEXTPREFIX)/lib/flext
+ endif
+ 
+ FLEXTBIN=$(FLEXTPREFIX)/bin
+ 
+ ##############################################
+ 
  LDFLAGS += -dynamic -Wl,-x -framework ApplicationServices -framework vecLib
  

Index: gnumake-gcc-ext.inc
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/mac/gnumake-gcc-ext.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** gnumake-gcc-ext.inc	5 Jan 2005 05:04:10 -0000	1.3
--- gnumake-gcc-ext.inc	10 Apr 2005 22:22:39 -0000	1.4
***************
*** 2,6 ****
  
  INCPATH += -I$(FLEXTINC)
! LIBPATH += -L$(FLEXTLIB) -L$(FLEXTSHLIB)
  LIBS += -l$(FLEXTNAME)
  
--- 2,6 ----
  
  INCPATH += -I$(FLEXTINC)
! LIBPATH += -L$(FLEXTLIB)
  LIBS += -l$(FLEXTNAME)
  
***************
*** 68,70 ****
--- 68,71 ----
  
  _install_:: $(INSTPATH)
+ # copy plain file or whole bundle
  	cp -R $(INSTTARGET) $(INSTPATH)

Index: gnumake-gcc-flext.inc
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/mac/gnumake-gcc-flext.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** gnumake-gcc-flext.inc	5 Jan 2005 05:04:10 -0000	1.3
--- gnumake-gcc-flext.inc	10 Apr 2005 22:22:39 -0000	1.4
***************
*** 2,6 ****
  
  ifdef SHARED
! #LDFLAGS += -dylib_install_name $(FLEXTSHLIB)/$(OUTNAME).$(EXT)
  endif
  
--- 2,11 ----
  
  ifdef SHARED
! LDFLAGS += -install_name $(FLEXTLIB)/$(TARGETNAME)
! # PKGVERSION must be in the 0.0.0 format
! LDFLAGS += -current_version $(PKGVERSION)
! # strip last number
! LDFLAGS += -compatibility_version $(basename $(PKGVERSION))
! LDFLAGS += -preload -seg1addr 0xd0000000
  endif
  
***************
*** 57,77 ****
  ##############################################
  
- ifdef SHARED
- FLEXTLIBINST=$(FLEXTSHLIB)
- else
- FLEXTLIBINST=$(FLEXTLIB)
- endif
- 
  $(FLEXTINC):
  	-mkdir -p $@
  
! $(FLEXTLIBINST):
  	-mkdir -p $@
  
! _install_: $(FLEXTINC) $(FLEXTLIBINST)
! 	install $(TARGET) $(FLEXTLIBINST)
  ifndef SHARED
  # have to rerun ranlib at install dir ?!
! 	ranlib $(FLEXTLIBINST)/$(notdir $(TARGET))  
  endif
  	install $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTINC)
--- 62,106 ----
  ##############################################
  
  $(FLEXTINC):
  	-mkdir -p $@
  
! $(FLEXTLIB):
  	-mkdir -p $@
  
! _install_: $(FLEXTINC) $(FLEXTLIB)
! ifdef FLEXTFRAMEWORK
! # --- install as framework ---
! ifndef PKGVERSION
! $(error Need package version)
! endif
! 	mkdir -p $(FLEXTFRAMEWORK)/Versions/$(basename $(PKGVERSION))/Headers
! 	ln -sfh ./$(basename $(PKGVERSION)) $(FLEXTFRAMEWORK)/Versions/Current
! 	ln -sfh ./Versions/Current/Headers $(FLEXTFRAMEWORK)/Headers
! 	install $(TARGET) $(FLEXTFRAMEWORK)/Versions/Current
! ifdef SHARED
! 	# make link without lib... and extension
! 	ln -sf ./Versions/Current/$(VERNAME) $(FLEXTFRAMEWORK)/$(patsubst lib%,%,$(basename $(TARGETNAME)))
! else
! 	ranlib $(FRAMEWORK)/Versions/Current/$(VERNAME) 
! 	ln -sf ./Versions/Current/$(VERNAME) $(FLEXTFRAMEWORK)/$(TARGETNAME)
! endif
! 	install $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTFRAMEWORK)/Headers
! else
! # --- install as dynamic library ---
! 	install $(TARGET) $(FLEXTLIB)
  ifndef SHARED
  # have to rerun ranlib at install dir ?!
! 	ranlib $(FLEXTLIB)/$(VERNAME)  
! endif
! ifdef VERNAME
! 	ln -sf $(FLEXTLIB)/$(VERNAME) $(FLEXTLIB)/$(TARGETNAME)
  endif
  	install $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTINC)
+ endif
+ # transfer build system
+ 	cp -rf buildsys $(FLEXTSYS)
+ 	install build.sh $(FLEXTSYS)
+ 	chmod -R a+rx $(FLEXTSYS)
+ # make convenience script
+ 	echo bash $(FLEXTSYS)/build.sh $$\* > $(FLEXTBIN)/flext-build.sh
+ 	chmod a+rx $(FLEXTBIN)/flext-build.sh





More information about the Pd-cvs mailing list