Changeset 18969

Show
Ignore:
Timestamp:
06/25/06 21:36:18 (2 years ago)
Author:
patrick
Message:

Added support for building universal binaries on Mac OS X.
Bumped version to 1.1.23.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • juggler/trunk/modules/vapor/ChangeLog

    r18858 r18969  
    11DATE       AUTHOR   CHANGE 
    22---------- -------- ----------------------------------------------------------- 
     32006-06-25 patrick  Added support for building universal binaries on Mac OS X. 
     4                    NEW VERSION: 1.1.23 
    352006-05-23 patrick  Applied versioning to the header and data directories. 
    46                    NEW VERSION: 1.1.22 

  • juggler/trunk/modules/vapor/Makefile.inc.in

    r18938 r18969  
    182182        @$(SHELL) $(MKINSTALLDIRS) $(LIBDIR) 
    183183ifeq (@PLATFORM@, Darwin) 
     184ifeq ($(ISA), universal) 
     185        for a in $(UNIVERSAL_ARCH_LIST) ; do                            \ 
     186            ld -arch $$a -dynamic -m -r -d -bind_at_load -o             \ 
     187              $(subst .dylib,-$$a.lo,$@) $(OBJS) ;                      \ 
     188         done 
     189        lipo -create $(foreach arch,$(UNIVERSAL_ARCH_LIST),$(subst .dylib,-$(arch).lo,$@)) -output $(subst .dylib,.lo,$@) 
     190else 
    184191        ld -dynamic -m -r -d -bind_at_load -o $(subst .dylib,.lo,$@) $(OBJS) 
     192endif 
    185193        $(CXX) $(EXTRA_LDOPTS) -Wl,-dynamic -nostartfiles -Wl,-dylib    \ 
    186194          -Wl,-ldylib1.o $(LDOPTS) -o $@ $(subst .dylib,.lo,$@)         \ 
    187195          $(DYLIB_DEPS) 
    188         rm -f $(subst .dylib,.lo,$@) 
     196        rm -f $(@D)/*.lo 
    189197else 
    190198        $(CXX_DLL) $(LDOPTS) $(DYLIB_NAME_FLAG) $(OBJS) $(DYLIB_DEPS) 

  • juggler/trunk/modules/vapor/VERSION

    r18858 r18969  
     11.1.23-0 @06/26/2006 02:40:00 UTC@ 
    121.1.22-0 @05/23/2006 13:55:00 UTC@ 
    231.1.21-0 @05/23/2006 13:50:00 UTC@ 

  • juggler/trunk/modules/vapor/common.defs.mk.in

    r18604 r18969  
    218218OBJ_NAME_FLAG=          @OBJ_NAME_FLAG@ 
    219219OS_TYPE=                @OS_TYPE@ 
     220PLATFORM_SDK=           @PLATFORM_SDK@ 
    220221PERL=                   @PERL@ 
    221222RANLIB=                 @RANLIB@ 
    222223RMIC=                   @RMIC@ 
     224UNIVERSAL_ARCH_LIST=    @UNIVERSAL_ARCH_LIST@ 
    223225 
    224226# Warning levels for C and C++ needed by dpp.obj-common.mk. 
    …… 
    365367   endif 
    366368endif 
     369ifeq ($(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 
     388endif 
    367389 
    368390endif 

  • juggler/trunk/modules/vapor/configure.ac

    r18942 r18969  
    4949AC_REVISION($Revision$) 
    5050AC_CONFIG_AUX_DIR([../../share/config]) 
    51 DPP_PREREQ([2.1.0]) 
     51DPP_PREREQ([2.1.2]) 
    5252DPP_INIT 
    5353 
    …… 
    681681CXXFLAGS="$CXXFLAGS $ABI_FLAGS" 
    682682CPPFLAGS="$CPPFLAGS $BOOST_INCLUDES" 
    683 LDFLAGS="$LDFLAGS $BOOST_LDFLAGS $ABI_FLAGS" 
     683# NOTE: We do not need $ABI_FLAGS in $LDFLAGS since $CXXFLAGS and $LDFLAGS 
     684# are used together by AC_TRY_LINK(). 
     685LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" 
    684686LIBS="$LIBS -l$boost_fs_name" 
    685687 
    …… 
    757759 
    758760# Verify that we have a new enough version of CppDOM. 
    759 min_cppdom_version='0.3.1' 
     761if test "x$PLATFORM" = "xDarwin" -a "x$ISA" = "xuniversal" ; then 
     762   min_cppdom_version='0.6.4' 
     763else 
     764   min_cppdom_version='0.3.1' 
     765fi 
     766 
    760767AC_MSG_CHECKING([whether CppDOM version is >= $min_cppdom_version]) 
    761768DPP_VERSION_CHECK([$cppdom_version], [$min_cppdom_version],