casa-mp-base

--- include/makeinclude/platform_macosx_common.GNU.orig

+++ include/makeinclude/platform_macosx_common.GNU

@@ -47,7 +47,6 @@ endif

 LDFLAGS         += -flat_namespace

-ifeq ($(universal),1)

-  CFLAGS += -arch i386 -arch ppc

-  LDFLAGS += -arch i386 -arch ppc

-endif

+CFLAGS += @@CFLAGS@@

+LDFLAGS += @@LDFLAGS@@

+FLAGS_C_CC += @@CXXFLAGS@@

--- include/makeinclude/platform_macosx_lion.GNU.orig

+++ include/makeinclude/platform_macosx_lion.GNU

@@ -1,27 +1,6 @@

 INSLIB?=$(ACE_ROOT)/lib

-ifeq ($(buildbits),32)

-  FLAGS_C_CC += -m32

-  LDFLAGS    += -m32

-endif

-ifeq ($(buildbits),64)

-  FLAGS_C_CC += -m64

-  LDFLAGS    += -m64

-endif

-ifeq ($(buildbits),universal)

-  FLAGS_C_CC += -arch i386 -arch x86_64

-  LDFLAGS    += -arch i386 -arch x86_64

-endif

-

-ifeq (,$(buildbits))

-  FLAGS_C_CC += -m64

-  LDFLAGS    += -m64

-endif

-

-CC:=clang

-CXX:=clang++

-

 PLATFORM_NDDS_FLAGS=-ppPath cpp-4.2 -I.

 include $(ACE_ROOT)/include/makeinclude/platform_macosx_common.GNU

--- include/makeinclude/platform_macosx_snowleopard.GNU.orig

+++ include/makeinclude/platform_macosx_snowleopard.GNU

@@ -1,17 +1,4 @@

-ifeq ($(buildbits),32)

-  FLAGS_C_CC += -m32

-  LDFLAGS    += -m32

-endif

-ifeq ($(buildbits),64)

-  FLAGS_C_CC += -m64

-  LDFLAGS    += -m64

-endif

-ifeq ($(buildbits),universal)

-  FLAGS_C_CC += -arch i386 -arch x86_64

-  LDFLAGS    += -arch i386 -arch x86_64

-endif

-

 PLATFORM_NDDS_FLAGS="-ppPath cpp-4.2 -I."

 include $(ACE_ROOT)/include/makeinclude/platform_macosx_common.GNU