Changeset 18972
- Timestamp:
- 06/25/06 21:43:31 (2 years ago)
- Files:
-
- juggler/trunk/modules/sonix/ChangeLog (modified) (1 diff)
- juggler/trunk/modules/sonix/Makefile.inc.in (modified) (1 diff)
- juggler/trunk/modules/sonix/VERSION (modified) (1 diff)
- juggler/trunk/modules/sonix/common.defs.mk.in (modified) (2 diffs)
- juggler/trunk/modules/sonix/configure.ac (modified) (2 diffs)
- juggler/trunk/modules/sonix/plugins/common.defs.mk.in (modified) (2 diffs)
- juggler/trunk/modules/sonix/plugins/configure.ac (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
juggler/trunk/modules/sonix/ChangeLog
r18876 r18972 1 1 DATE AUTHOR CHANGE 2 2 ----------- ----------- ------------------------------------------------------- 3 Jun-25-2006 patrick Added support for building universal binaries on Mac 4 OS X. 5 NEW VERSION: 1.1.4 3 6 May-24-2006 dshipton Libraries and plugins fully versioned for parallel 4 7 installations. juggler/trunk/modules/sonix/Makefile.inc.in
r18945 r18972 177 177 @$(SHELL) $(MKINSTALLDIRS) $(LIBDIR) 178 178 ifeq (@PLATFORM@, Darwin) 179 ld -dynamic -m -r -d -bind_at_load -o $(subst .dylib,.lo,$@) \ 180 $(OBJS) 179 ifeq ($(ISA), universal) 180 for a in $(UNIVERSAL_ARCH_LIST) ; do \ 181 ld -arch $$a -dynamic -m -r -d -bind_at_load -o \ 182 $(subst .dylib,-$$a.lo,$@) $(OBJS) ; \ 183 done 184 lipo -create $(foreach arch,$(UNIVERSAL_ARCH_LIST),$(subst .dylib,-$(arch).lo,$@)) -output $(subst .dylib,.lo,$@) 185 else 186 ld -dynamic -m -r -d -bind_at_load -o $(subst .dylib,.lo,$@) $(OBJS) 187 endif 181 188 $(CXX) $(EXTRA_LDOPTS) -Wl,-dynamic -nostartfiles -Wl,-dylib \ 182 189 -Wl,-ldylib1.o $(LDOPTS) -o $@ $(subst .dylib,.lo,$@) $(DYLIB_DEPS) 183 rm -f $( subst .dylib,.lo,$@)190 rm -f $(@D)/*.lo 184 191 else 185 192 $(CXX_DLL) $(LDOPTS) $(DYLIB_NAME_FLAG) $(OBJS) \ juggler/trunk/modules/sonix/VERSION
r18876 r18972 1 1.1.4-0 @06/26/2006 02:45:00 UTC@ 1 2 1.1.3-0 @05/24/2006 14:50:00 UTC@ 2 3 1.1.2-0 @08/17/2005 15:10:00 UTC@ juggler/trunk/modules/sonix/common.defs.mk.in
r18604 r18972 218 218 OBJ_NAME_FLAG= @OBJ_NAME_FLAG@ 219 219 OS_TYPE= @OS_TYPE@ 220 PLATFORM_SDK= @PLATFORM_SDK@ 220 221 PERL= @PERL@ 221 222 RANLIB= @RANLIB@ 222 223 RMIC= @RMIC@ 224 UNIVERSAL_ARCH_LIST= @UNIVERSAL_ARCH_LIST@ 223 225 224 226 # Warning levels for C and C++ needed by dpp.obj-common.mk. … … 365 367 endif 366 368 endif 369 ifeq ($(ABI), Mach-O) 370 ifeq ($(ISA), powerpc) 371 CFLAGS+= -arch ppc $(PLATFORM_SDK) 372 CXXFLAGS+= -arch ppc $(PLATFORM_SDK) 373 LDOPTS+= -arch ppc $(PLATFORM_SDK) 374 endif 375 ifeq ($(ISA), i386) 376 CFLAGS+= -arch i386 $(PLATFORM_SDK) 377 CXXFLAGS+= -arch i386 $(PLATFORM_SDK) 378 LDOPTS+= -arch i386 $(PLATFORM_SDK) 379 endif 380 ifeq ($(ISA), universal) 381 CFLAGS+= $(foreach arch,$(UNIVERSAL_ARCH_LIST),-arch $(arch)) \ 382 $(PLATFORM_SDK) 383 CXXFLAGS+= $(foreach arch,$(UNIVERSAL_ARCH_LIST),-arch $(arch)) \ 384 $(PLATFORM_SDK) 385 LDOPTS+= $(foreach arch,$(UNIVERSAL_ARCH_LIST),-arch $(arch)) \ 386 $(PLATFORM_SDK) 387 endif 388 endif 367 389 368 390 endif juggler/trunk/modules/sonix/configure.ac
r18945 r18972 41 41 AC_REVISION([$Revision$]) 42 42 AC_CONFIG_AUX_DIR([../../share/config]) 43 DPP_PREREQ([2.1. 0])43 DPP_PREREQ([2.1.2]) 44 44 DPP_INIT 45 45 … … 129 129 # Checks for libraries. 130 130 # ----------------------------------------------------------------------------- 131 VPR_PATH([1.1. 10], [VPR_SUBSYSTEM=`$VPR_CONFIG --subsystem`],131 VPR_PATH([1.1.23], [VPR_SUBSYSTEM=`$VPR_CONFIG --subsystem`], 132 132 [AC_MSG_ERROR([*** VPR required for Sonix ***])]) 133 133 juggler/trunk/modules/sonix/plugins/common.defs.mk.in
r18684 r18972 218 218 OBJ_NAME_FLAG= @OBJ_NAME_FLAG@ 219 219 OS_TYPE= @OS_TYPE@ 220 PLATFORM_SDK= @PLATFORM_SDK@ 220 221 PERL= @PERL@ 221 222 RANLIB= @RANLIB@ 222 223 RMIC= @RMIC@ 224 UNIVERSAL_ARCH_LIST= @UNIVERSAL_ARCH_LIST@ 223 225 224 226 # Warning levels for C and C++ needed by dpp.obj-common.mk. … … 365 367 endif 366 368 endif 369 ifeq ($(ABI), Mach-O) 370 ifeq ($(ISA), powerpc) 371 CFLAGS+= -arch ppc $(PLATFORM_SDK) 372 CXXFLAGS+= -arch ppc $(PLATFORM_SDK) 373 LDOPTS+= -arch ppc $(PLATFORM_SDK) 374 endif 375 ifeq ($(ISA), i386) 376 CFLAGS+= -arch i386 $(PLATFORM_SDK) 377 CXXFLAGS+= -arch i386 $(PLATFORM_SDK) 378 LDOPTS+= -arch i386 $(PLATFORM_SDK) 379 endif 380 ifeq ($(ISA), universal) 381 CFLAGS+= $(foreach arch,$(UNIVERSAL_ARCH_LIST),-arch $(arch)) \ 382 $(PLATFORM_SDK) 383 CXXFLAGS+= $(foreach arch,$(UNIVERSAL_ARCH_LIST),-arch $(arch)) \ 384 $(PLATFORM_SDK) 385 LDOPTS+= $(foreach arch,$(UNIVERSAL_ARCH_LIST),-arch $(arch)) \ 386 $(PLATFORM_SDK) 387 endif 388 endif 367 389 368 390 endif juggler/trunk/modules/sonix/plugins/configure.ac
r18934 r18972 38 38 AC_REVISION($Revision$) 39 39 AC_CONFIG_AUX_DIR([../../../share/config]) 40 DPP_PREREQ([2. 0.2])40 DPP_PREREQ([2.1.2]) 41 41 DPP_INIT 42 42 … … 145 145 # Checks for libraries. 146 146 # ----------------------------------------------------------------------------- 147 VPR_PATH([ 0.32.0], [VPR_SUBSYSTEM=`$VPR_CONFIG --subsystem`],147 VPR_PATH([1.1.23], [VPR_SUBSYSTEM=`$VPR_CONFIG --subsystem`], 148 148 [AC_MSG_ERROR([*** VPR required for Sonix plug-ins ***])]) 149 149 150 SNX_PATH([ 0.5.0], [BUILD_PLUGINS='Y'],150 SNX_PATH([1.1.4], [BUILD_PLUGINS='Y'], 151 151 [AC_MSG_WARN([*** Sonix required for Sonix plug-ins ***]) 152 152 BUILD_PLUGINS='N'
