diff --git a/BasiliskII/src/MacOSX/Makefile.in b/BasiliskII/src/MacOSX/Makefile.in index 439e656d..27dda144 100644 --- a/BasiliskII/src/MacOSX/Makefile.in +++ b/BasiliskII/src/MacOSX/Makefile.in @@ -3,10 +3,10 @@ ## System specific configuration SHELL = /bin/sh -HOST_CC = gcc -HOST_CXX = g++ -CC = @CC@ -arch $(ARCH) -CXX = @CXX@ -arch $(ARCH) +HOST_CC = @CC@ +HOST_CXX = @CXX@ +CC_PROG = @CC@ +CXX_PROG = @CXX@ CFLAGS = @CFLAGS@ -g CXXFLAGS = @CXXFLAGS@ -g CPPFLAGS = @CPPFLAGS@ -I../include -I. -I../uae_cpu @@ -17,6 +17,25 @@ MONSRCS = @MONSRCS@ BLESS = @BLESS@ LN_S = ln -s +## Compilers selection (XXX hackery for 10.2 cross-compilation...) +SDK_VERSION.ppc = @PPC_SDK_VERSION@ +SDK_VERSION = $(SDK_VERSION.$(ARCH)) +ifeq ($(SDK_VERSION), 10.2.8) +CC_PROG = gcc-3.3 +CXX_PROG = g++-3.3 +SDK_ROOT = /Developer/SDKs/MacOSX10.2.8.sdk +CC_ROOT = -F$(SDK_ROOT)/System/Library/Frameworks +LDFLAGS += -Wl,-syslibroot,$(SDK_ROOT) +endif +ifeq ($(SDK_VERSION), 10.3.9) +CC_ROOT = -isysroot /Developer/SDKs/MacOSX10.3.9.sdk -mmacosx-version-min=10.3 +endif +ifeq ($(SDK_VERSION), 10.4) +CC_ROOT = -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 +endif +CC = $(CC_PROG) $(CC_ROOT) -arch $(ARCH) +CXX = $(CXX_PROG) $(CC_ROOT) -arch $(ARCH) + ## slirp network emulation code WANT_SLIRP = @WANT_SLIRP@ ifeq ($(WANT_SLIRP), yes) @@ -193,11 +212,11 @@ $(OBJ_DIR)/%.ho : %.cpp $(HOST_CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -c $< -o $@ $(OBJ_DIR)/build68k: $(OBJ_DIR)/build68k.ho - $(HOST_CC) $(LDFLAGS) -o $@ $(OBJ_DIR)/build68k.ho + $(HOST_CC) -o $@ $(OBJ_DIR)/build68k.ho $(OBJ_DIR)/gencpu: $(OBJ_DIR)/gencpu.ho $(OBJ_DIR)/readcpu.ho $(OBJ_DIR)/cpudefs.ho - $(HOST_CXX) $(LDFLAGS) -o $@ $(OBJ_DIR)/gencpu.ho $(OBJ_DIR)/readcpu.ho $(OBJ_DIR)/cpudefs.ho + $(HOST_CXX) -o $@ $(OBJ_DIR)/gencpu.ho $(OBJ_DIR)/readcpu.ho $(OBJ_DIR)/cpudefs.ho $(OBJ_DIR)/gencomp: $(OBJ_DIR)/gencomp.ho $(OBJ_DIR)/readcpu.ho $(OBJ_DIR)/cpudefs.ho - $(HOST_CXX) $(LDFLAGS) -o $@ $(OBJ_DIR)/gencomp.ho $(OBJ_DIR)/readcpu.ho $(OBJ_DIR)/cpudefs.ho + $(HOST_CXX) -o $@ $(OBJ_DIR)/gencomp.ho $(OBJ_DIR)/readcpu.ho $(OBJ_DIR)/cpudefs.ho $(GEN_DIR):: @[ -d $(GEN_DIR) ] || mkdir $(GEN_DIR) > /dev/null 2>&1 diff --git a/BasiliskII/src/MacOSX/configure.in b/BasiliskII/src/MacOSX/configure.in index 1d3da5fc..1f4dda6e 100644 --- a/BasiliskII/src/MacOSX/configure.in +++ b/BasiliskII/src/MacOSX/configure.in @@ -37,6 +37,7 @@ AC_ARG_ENABLE(universal, esac done ]) +AC_ARG_WITH(ppc-sdk, [ --with-ppc-sdk=VERSION use specific SDK VERSION for ppc builds [default=earliest]], [PPC_SDK_VERSION=$withval]) dnl Video options. AC_ARG_ENABLE(multiwin, @@ -61,7 +62,7 @@ AC_ARG_ENABLE(addressing, ]) dnl External packages. -AC_ARG_WITH(mon, [ --with-mon use mon as debugger [default=yes]], [WANT_MON=$withval], [WANT_MON=yes]) +AC_ARG_WITH(mon, [ --with-mon use mon as debugger [default=yes]], [WANT_MON=$withval], [WANT_MON=no]) dnl Canonical system information. AC_CANONICAL_HOST @@ -1014,6 +1015,17 @@ if [[ -z "$WANT_UNIVERSAL" ]]; then fi AC_SUBST(TARGET_ARCHES, [$WANT_UNIVERSAL]) +AC_MSG_CHECKING(for PowerPC SDK) +for version in $PPC_SDK_VERSION 10.2.8 10.3.9 10.4; do + sdk=`echo /Developer/SDKs/MacOSX$version*.sdk` + if [[ -d "$sdk" ]]; then + PPC_SDK_VERSION="$version" + break + fi +done +AC_MSG_RESULT($PPC_SDK_VERSION) +AC_SUBST(PPC_SDK_VERSION) + AC_DEFINE(DATADIR, "~", [unix_ether needs this!]) dnl Generate Makefile.