Changeset 18970
- Timestamp:
- 06/25/06 21:39:00 (2 years ago)
- Files:
-
- juggler/trunk/modules/tweek/ChangeLog (modified) (1 diff)
- juggler/trunk/modules/tweek/Makefile.inc.in (modified) (1 diff)
- juggler/trunk/modules/tweek/VERSION (modified) (1 diff)
- juggler/trunk/modules/tweek/common.defs.mk.in (modified) (2 diffs)
- juggler/trunk/modules/tweek/configure.ac (modified) (2 diffs)
- juggler/trunk/modules/tweek/java/Makefile.in (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
juggler/trunk/modules/tweek/ChangeLog
r18940 r18970 1 1 DATE AUTHOR CHANGE 2 2 ---------- ----------- -------------------------------------------------------- 3 2006-06-25 patrick Added support for building universal binaries on Mac 4 OS X. 5 NEW VERSION: 1.1.5 3 6 2006-05-26 dshipton Make and install fully versioned libraries. 4 7 NEW VERSION: 1.1.4 juggler/trunk/modules/tweek/Makefile.inc.in
r18941 r18970 209 209 @$(SHELL) $(MKINSTALLDIRS) $(LIBDIR) 210 210 ifeq (@PLATFORM@, Darwin) 211 ld -dynamic -m -r -d -bind_at_load -o $(subst .dylib,.lo,$@) \ 212 $(OBJS) 211 ifeq ($(ISA), universal) 212 for a in $(UNIVERSAL_ARCH_LIST) ; do \ 213 ld -arch $$a -dynamic -m -r -d -bind_at_load -o \ 214 $(subst .dylib,-$$a.lo,$@) $(OBJS) ; \ 215 done 216 lipo -create $(foreach arch,$(UNIVERSAL_ARCH_LIST),$(subst .dylib,-$(arch).lo,$@)) -output $(subst .dylib,.lo,$@) 217 else 218 ld -dynamic -m -r -d -bind_at_load -o $(subst .dylib,.lo,$@) $(OBJS) 219 endif 213 220 $(CXX) $(EXTRA_LDOPTS) -Wl,-dynamic -nostartfiles -Wl,-dylib \ 214 221 -Wl,-ldylib1.o $(LDOPTS) -o $@ $(subst .dylib,.lo,$@) $(DYLIB_DEPS) 215 rm -f $( subst .dylib,.lo,$@)222 rm -f $(@D)/*.lo 216 223 else 217 224 $(CXX_DLL) $(LDOPTS) $(DYLIB_NAME_FLAG) $(OBJS) \ juggler/trunk/modules/tweek/VERSION
r18882 r18970 1 1.1.5-0 @06/26/2006 02:40:00 UTC@ 1 2 1.1.4-0 @05/24/2006 19:30:00 UTC@ 2 3 1.1.3-0 @02/16/2006 02:25:00 UTC@ juggler/trunk/modules/tweek/common.defs.mk.in
r18604 r18970 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/tweek/configure.ac
r18943 r18970 39 39 AC_REVISION($Revision$) 40 40 AC_CONFIG_AUX_DIR([../../share/config]) 41 DPP_PREREQ([2.1. 0])41 DPP_PREREQ([2.1.2]) 42 42 DPP_INIT 43 43 … … 446 446 # Checks for libraries. 447 447 # ----------------------------------------------------------------------------- 448 VPR_PATH([1.1. 16], [BUILD_CXX='Y'],448 VPR_PATH([1.1.23], [BUILD_CXX='Y'], 449 449 [AC_MSG_WARN([*** VPR required for Tweek C++ API ***]) 450 450 BUILD_CXX='N']) juggler/trunk/modules/tweek/java/Makefile.in
r18932 r18970 94 94 ifeq (@PLATFORM@, Darwin) 95 95 JNILIB_EXT= jnilib 96 97 ifeq ($(ISA), universal) 98 JNI_ABI_FLAGS= $(foreach arch,$(UNIVERSAL_ARCH_LIST),-arch $(arch)) \ 99 $(PLATFORM_SDK) 100 endif 96 101 else 97 102 JNILIB_EXT= @DYNAMICLIB_EXT@ 98 103 endif 99 104 100 JNI_CFLAGS= $(JNI_INC) $(CFLAGS_DYNLIB) 105 JNI_CFLAGS= $(JNI_INC) $(CFLAGS_DYNLIB) $(JNI_ABI_FLAGS) 101 106 JNI_LDFLAGS= @JNI_LDFLAGS@ $(JNI_LIB) 102 107 TWEEK_JNI_LIB= @LIB_PREFIX@tweek_jni.$(JNILIB_EXT)
