--- BasiliskII/src/MacOSX/Makefile.in	2007/06/15 17:11:46	1.25
+++ BasiliskII/src/MacOSX/Makefile.in	2009/11/07 07:19:25	1.30
@@ -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
@@ -14,9 +14,27 @@ DEFS = @DEFS@ @DEFINES@ -D_REENTRANT -DA
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 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)
@@ -80,7 +98,7 @@ SRCS = ../main.cpp main_macosx.mm ../pre
     ../emul_op.cpp ../macos_util.cpp ../xpram.cpp xpram_unix.cpp ../timer.cpp \
     timer_unix.cpp ../adb.cpp ../serial.cpp serial_unix.cpp ../ether.cpp ether_unix.cpp \
     ../sony.cpp ../disk.cpp ../cdrom.cpp ../scsi.cpp ../video.cpp video_macosx.mm \
-    vm_alloc.cpp sigsegv.cpp ../audio.cpp ../extfs.cpp extfs_macosx.mm \
+    vm_alloc.cpp sigsegv.cpp ../audio.cpp ../extfs.cpp extfs_macosx.cpp \
     ../user_strings.cpp user_strings_unix.cpp clip_macosx.cpp misc_macosx.mm \
     ../dummy/scsi_dummy.cpp \
     audio_macosx.cpp AudioBackEnd.cpp AudioDevice.cpp MacOSX_sound_if.cpp \
@@ -97,6 +115,8 @@ APP_APP = $(APP).app
 TARGET_ARCHES = @TARGET_ARCHES@
 PROGS = $(foreach arch, $(TARGET_ARCHES), $(APP).$(arch))
 
+BLESS = $(OBJ_DIR)/lowmem
+
 ## Rules
 .PHONY: modules install installdirs uninstall mostlyclean clean distclean depend dep
 .SUFFIXES:
@@ -140,7 +160,12 @@ $(foreach arch,$(TARGET_ARCHES),$(eval $
 
 links: $(UNIXSRCS)
 
-$(OBJ_DIR)/$(APP): $(OBJ_DIR) $(GEN_DIR) $(OBJS)
+$(BLESS): $(OBJ_DIR) $(OBJ_DIR)/lowmem.o
+	$(HOST_CC) -o $@ $(OBJ_DIR)/lowmem.o
+$(OBJ_DIR)/lowmem.o: ../Unix/Darwin/lowmem.c
+	$(HOST_CC) -o $@ -c $<
+
+$(OBJ_DIR)/$(APP): $(OBJ_DIR) $(GEN_DIR) $(OBJS) $(BLESS)
 	$(CXX) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
 	$(BLESS) $@
 
@@ -150,7 +175,7 @@ $(APP)_app: $(APP) $(DOCS) Info.plist $(
 	echo -n 'APPL????' > $(APP_APP)/Contents/PkgInfo
 	mkdir -p $(APP_APP)/Contents/MacOS
 	cp -f $(APP) $(APP_APP)/Contents/MacOS/
-	strip $(APP_APP)/Contents/MacOS/$(APP)
+	strip -x $(APP_APP)/Contents/MacOS/$(APP)
 	mkdir -p $(APP_APP)/Contents/Resources
 	cp -Rp English.lproj $(APP_APP)/Contents/Resources/
 	cp -f $(APP).icns $(APP_APP)/Contents/Resources/
@@ -158,15 +183,16 @@ $(APP)_app: $(APP) $(DOCS) Info.plist $(
 	find $(APP_APP) -type d -name CVS | xargs rm -rf
 
 mostlyclean:
-	rm -rf $(APP_APP)
-	rm -f $(PROGS) $(OBJ_DIR)/* $(OBJ_DIR).*/* core* *.core *~ *.bak
+	rm -f $(PROGS) $(OBJ_DIR)/* core* *.core *~ *.bak
+ 	rm -f $(foreach arch, $(TARGET_ARCHES), $(GEN_DIR).$(arch)/*)
+ 	rm -f $(foreach arch, $(TARGET_ARCHES), $(OBJ_DIR).$(arch)/*)
 
 clean: mostlyclean
 	rm -f $(UNIXSRCS)
-	rm -f $(GEN_DIR).*/*
 
 distclean: clean
-	rm -rf $(OBJ_DIR)
+	rm -rf $(foreach arch, $(TARGET_ARCHES), $(GEN_DIR).$(arch))
+ 	rm -rf $(foreach arch, $(TARGET_ARCHES), $(OBJ_DIR).$(arch))
 	rm -rf autom4te.cache
 	rm -f Makefile
 	rm -f config.cache config.log config.status config.h
@@ -193,11 +219,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