Changeset 20955

Show
Ignore:
Timestamp:
11/28/07 21:31:30 (11 months ago)
Author:
patrick
Message:

Merged Doozer++ 2.1.12 from its vendor branch. This version adds support for
the x86_64 architecture on Mac OS X.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • juggler/branches/2.2/Doozer++/ChangeLog

    r20300 r20955  
    11DATE       AUTHOR       CHANGE 
    22---------- ------------ ------------------------------------------------------- 
     32007-05-30 patrickh     Added support for x86_64 binaries on Mac OS X. 
     4                        NEW VERSION: 2.1.12 
    352007-05-30 patrickh     Added support for DragonFly (a fork of FreeBSD 4). 
    46                        NEW VERSION: 2.1.11 

  • juggler/branches/2.2/Doozer++/config/abi.m4

    r20300 r20955  
    2929dnl ----------------------------------------------------------------- 
    3030dnl File:          abi.m4,v 
    31 dnl Date modified: 2006/12/31 16:54:59 
    32 dnl Version:       1.24 
     31dnl Date modified: 2007/11/28 21:08:23 
     32dnl Version:       1.26 
    3333dnl ----------------------------------------------------------------- 
    3434dnl ************** <auto-copyright.pl END do not edit this line> ************** 
    …… 
    6161dnl                      DARWIN_PPC (Mach-O/PowerPC) 
    6262dnl                      DARWIN_i386 (Mach-O/i386) 
     63dnl                      DARWIN_x86_64 (Mach-O/x86_64) 
    6364dnl                      DARWIN_UNIVERSAL (Mach-O/universal) 
    6465dnl 
    …… 
    8081dnl =========================================================================== 
    8182 
    82 dnl abi.m4,v 1.24 2006/12/31 16:54:59 patrickh Exp 
     83dnl abi.m4,v 1.26 2007/11/28 21:08:23 patrickh Exp 
    8384 
    8485dnl --------------------------------------------------------------------------- 
    …… 
    153154   dnl     DARWIN_PPC       - On Darwin, use PowerPC binaries 
    154155   dnl     DARWIN_i386      - On Darwin, use i386 binaries 
     156   dnl     DARWIN_x86_64    - On Darwin, use AMD64/EM64T binaries 
    155157   dnl     DARWIN_UNIVERSAL - On Darwin, use Mach-O universal binaries 
    156158   dnl ----------------------------------------------------------------------- 
    157159   AC_ARG_WITH(abi, 
    158                [  --with-abi=<N32_M3|N32_M4|64_M3|64_M4|ELF_i386|ELF_x86_64|WIN32_i386|COFF_ALPHA|ELF_ALPHA|HP|HP64|DARWIN_PPC|DARWIN_i386|DARWIN_UNIVERSAL> 
     160               [  --with-abi=<N32_M3|N32_M4|64_M3|64_M4|ELF_i386|ELF_x86_64|WIN32_i386|COFF_ALPHA|ELF_ALPHA|HP|HP64|DARWIN_PPC|DARWIN_i386|DARWIN_x86_64|DARWIN_UNIVERSAL> 
    159161                          Define the Application Binary 
    160162                          Interface to use], 
    …… 
    219221      xDARWIN_i386) 
    220222         DPP_ABI_CFG([Mach-O], [i386], , [-arch i386], [$osx_sdk_flags]) 
     223         ;; 
     224      xDARWIN_x86_64) 
     225         DPP_ABI_CFG([Mach-O], [x86_64], , [-arch x86_64], [$osx_sdk_flags]) 
    221226         ;; 
    222227      xDARWIN_UNIVERSAL) 

  • juggler/branches/2.2/Doozer++/config/general.m4

    r20300 r20955  
    2222dnl ----------------------------------------------------------------- 
    2323dnl File:          general.m4,v 
    24 dnl Date modified: 2007/05/30 22:37:11 
    25 dnl Version:       1.95 
     24dnl Date modified: 2007/11/28 21:06:04 
     25dnl Version:       1.96 
    2626dnl ----------------------------------------------------------------- 
    2727dnl ************** <auto-copyright.pl END do not edit this line> ************** 
    …… 
    4747dnl =========================================================================== 
    4848 
    49 dnl general.m4,v 1.95 2007/05/30 22:37:11 patrickh Exp 
     49dnl general.m4,v 1.96 2007/11/28 21:06:04 patrickh Exp 
    5050 
    5151dnl Set the version of Doozer++. 
    52 define(DPP_DPPVERSION, 2.1.11) 
     52define(DPP_DPPVERSION, 2.1.12) 
    5353 
    5454dnl --------------------------------------------------------------------------- 

  • juggler/branches/2.2/Doozer++/examples/common.defs.mk.in

    r20300 r20955  
    2222# ----------------------------------------------------------------- 
    2323# File:          common.defs.mk.in,v 
    24 # Date modified: 2006/12/31 16:55:00 
    25 # Version:       1.41 
     24# Date modified: 2007/11/28 21:08:23 
     25# Version:       1.43 
    2626# ----------------------------------------------------------------- 
    2727# *************** <auto-copyright.pl END do not edit this line> *************** 
    2828 
    2929# ============================================================================= 
    30 # common.defs.mk.in,v 1.41 2006/12/31 16:55:00 patrickh Exp 
     30# common.defs.mk.in,v 1.43 2007/11/28 21:08:23 patrickh Exp 
    3131# 
    3232# This file <common.defs.mk> provides variable assignments based on the 
    …… 
    408408   LDOPTS+=     -mips4 
    409409endif 
     410 
     411# Using GCC. 
     412else 
     413 
     414ifeq ($(ABI), ELF) 
     415   ifeq ($(ISA), i386) 
     416      CFLAGS+=          -m32 
     417      CXXFLAGS+=        -m32 
     418      LDOPTS+=          -m32 
     419   endif 
     420   ifeq ($(ISA), x86_64) 
     421      CFLAGS+=          -m64 
     422      CXXFLAGS+=        -m64 
     423      LDOPTS+=          -m64 
     424   endif 
     425endif 
     426ifeq ($(ABI), Mach-O) 
     427   ifeq ($(ISA), powerpc) 
     428      CFLAGS+=          -arch ppc $(PLATFORM_SDK) 
     429      CXXFLAGS+=        -arch ppc $(PLATFORM_SDK) 
     430      LDOPTS+=          -arch ppc $(PLATFORM_SDK) 
     431   endif 
     432   ifeq ($(ISA), i386) 
     433      CFLAGS+=          -arch i386 $(PLATFORM_SDK) 
     434      CXXFLAGS+=        -arch i386 $(PLATFORM_SDK) 
     435      LDOPTS+=          -arch i386 $(PLATFORM_SDK) 
     436   endif 
     437   ifeq ($(ISA), x86_64) 
     438      CFLAGS+=          -arch x86_64 $(PLATFORM_SDK) 
     439      CXXFLAGS+=        -arch x86_64 $(PLATFORM_SDK) 
     440      LDOPTS+=          -arch x86_64 $(PLATFORM_SDK) 
     441   endif 
     442   ifeq ($(ISA), universal) 
     443      CFLAGS+=          $(foreach arch,$(UNIVERSAL_ARCH_LIST),-arch $(arch)) \ 
     444                        $(PLATFORM_SDK) 
     445      CXXFLAGS+=        $(foreach arch,$(UNIVERSAL_ARCH_LIST),-arch $(arch)) \ 
     446                        $(PLATFORM_SDK) 
     447      LDOPTS+=          $(foreach arch,$(UNIVERSAL_ARCH_LIST),-arch $(arch)) \ 
     448                        $(PLATFORM_SDK) 
     449   endif 
     450endif 
     451 
    410452endif 
    411453