From 1a7d3714fbcec80d80f99f9910949f5a484fd0f5 Mon Sep 17 00:00:00 2001
From: nigel <>
Date: Sun, 14 May 2006 11:58:41 +0000
Subject: [PATCH] Compile the CPU emulator in the makefile, so that it picks up
 configure- generated #defines that are needed for running on X86 (vs PPC)
 emulator

---
 .../MacOSX/BasiliskII.xcode/project.pbxproj   | 145 ++----------------
 BasiliskII/src/MacOSX/Makefile.in             |  28 +++-
 2 files changed, 36 insertions(+), 137 deletions(-)

diff --git a/BasiliskII/src/MacOSX/BasiliskII.xcode/project.pbxproj b/BasiliskII/src/MacOSX/BasiliskII.xcode/project.pbxproj
index 8d19465f..2ab5275c 100644
--- a/BasiliskII/src/MacOSX/BasiliskII.xcode/project.pbxproj
+++ b/BasiliskII/src/MacOSX/BasiliskII.xcode/project.pbxproj
@@ -142,6 +142,7 @@
 		};
 		29B97323FDCFA39411CA2CEA = {
 			children = (
+				A60B5F480A174A4900D7F586,
 				A63638A10964120600BE2F74,
 				29B97324FDCFA39411CA2CEA,
 				A685FF0D05C4E89D00DDBA94,
@@ -243,7 +244,7 @@
 				HEADER_SEARCH_PATHS = "../include ../uae_cpu ../Unix ../slirp";
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Applications";
-				LIBRARY_SEARCH_PATHS = ". /Volumes/Users/nigel/Programming/BasiliskII/BasiliskII/src/MacOSX";
+				LIBRARY_SEARCH_PATHS = ".";
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = "";
 				PRODUCT_NAME = BasiliskII;
@@ -342,14 +343,6 @@
 				A68501EF05C4EEF200DDBA94,
 				A68501F305C4EF3300DDBA94,
 				A685020305C4EF6700DDBA94,
-				A685020405C4EF6700DDBA94,
-				A685020505C4EF6700DDBA94,
-				A685020605C4EF6700DDBA94,
-				A685020705C4EF6700DDBA94,
-				A685020805C4EF6700DDBA94,
-				A685020905C4EF6700DDBA94,
-				A685020A05C4EF6700DDBA94,
-				A685020B05C4EF6700DDBA94,
 				A685020C05C4EF6700DDBA94,
 				A685021305C4EFDC00DDBA94,
 				A685021405C4EFDC00DDBA94,
@@ -390,6 +383,7 @@
 				A685FFCE05C4E8CC00DDBA94,
 				A68500CC05C4E8DE00DDBA94,
 				A63638A20964120600BE2F74,
+				A60B5F490A174A4900D7F586,
 			);
 			isa = PBXFrameworksBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -426,6 +420,19 @@
 //A62
 //A63
 //A64
+		A60B5F480A174A4900D7F586 = {
+			isa = PBXFileReference;
+			lastKnownFileType = archive.ar;
+			path = libgenemu.a;
+			refType = 2;
+			sourceTree = SOURCE_ROOT;
+		};
+		A60B5F490A174A4900D7F586 = {
+			fileRef = A60B5F480A174A4900D7F586;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
 		A63638A10964120600BE2F74 = {
 			isa = PBXFileReference;
 			lastKnownFileType = archive.ar;
@@ -1238,14 +1245,6 @@
 		A68501F705C4EF3F00DDBA94 = {
 			children = (
 				A68501F805C4EF6700DDBA94,
-				A68501F905C4EF6700DDBA94,
-				A68501FA05C4EF6700DDBA94,
-				A68501FB05C4EF6700DDBA94,
-				A68501FC05C4EF6700DDBA94,
-				A68501FD05C4EF6700DDBA94,
-				A68501FE05C4EF6700DDBA94,
-				A68501FF05C4EF6700DDBA94,
-				A685020005C4EF6700DDBA94,
 				A685020105C4EF6700DDBA94,
 				A685020205C4EF6700DDBA94,
 			);
@@ -1262,70 +1261,6 @@
 			refType = 2;
 			sourceTree = SOURCE_ROOT;
 		};
-		A68501F905C4EF6700DDBA94 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = cpuemu1.cpp;
-			refType = 2;
-			sourceTree = SOURCE_ROOT;
-		};
-		A68501FA05C4EF6700DDBA94 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = cpuemu2.cpp;
-			refType = 2;
-			sourceTree = SOURCE_ROOT;
-		};
-		A68501FB05C4EF6700DDBA94 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = cpuemu3.cpp;
-			refType = 2;
-			sourceTree = SOURCE_ROOT;
-		};
-		A68501FC05C4EF6700DDBA94 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = cpuemu4.cpp;
-			refType = 2;
-			sourceTree = SOURCE_ROOT;
-		};
-		A68501FD05C4EF6700DDBA94 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = cpuemu5.cpp;
-			refType = 2;
-			sourceTree = SOURCE_ROOT;
-		};
-		A68501FE05C4EF6700DDBA94 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = cpuemu6.cpp;
-			refType = 2;
-			sourceTree = SOURCE_ROOT;
-		};
-		A68501FF05C4EF6700DDBA94 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = cpuemu7.cpp;
-			refType = 2;
-			sourceTree = SOURCE_ROOT;
-		};
-		A685020005C4EF6700DDBA94 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = cpuemu8.cpp;
-			refType = 2;
-			sourceTree = SOURCE_ROOT;
-		};
 		A685020105C4EF6700DDBA94 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
@@ -1348,54 +1283,6 @@
 			settings = {
 			};
 		};
-		A685020405C4EF6700DDBA94 = {
-			fileRef = A68501F905C4EF6700DDBA94;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		A685020505C4EF6700DDBA94 = {
-			fileRef = A68501FA05C4EF6700DDBA94;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		A685020605C4EF6700DDBA94 = {
-			fileRef = A68501FB05C4EF6700DDBA94;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		A685020705C4EF6700DDBA94 = {
-			fileRef = A68501FC05C4EF6700DDBA94;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		A685020805C4EF6700DDBA94 = {
-			fileRef = A68501FD05C4EF6700DDBA94;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		A685020905C4EF6700DDBA94 = {
-			fileRef = A68501FE05C4EF6700DDBA94;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		A685020A05C4EF6700DDBA94 = {
-			fileRef = A68501FF05C4EF6700DDBA94;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		A685020B05C4EF6700DDBA94 = {
-			fileRef = A685020005C4EF6700DDBA94;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		A685020C05C4EF6700DDBA94 = {
 			fileRef = A685020105C4EF6700DDBA94;
 			isa = PBXBuildFile;
diff --git a/BasiliskII/src/MacOSX/Makefile.in b/BasiliskII/src/MacOSX/Makefile.in
index 38afa992..3e11a25a 100644
--- a/BasiliskII/src/MacOSX/Makefile.in
+++ b/BasiliskII/src/MacOSX/Makefile.in
@@ -28,6 +28,13 @@ GENSRCS = cpudefs.cpp cpuemu.cpp cpustbl.cpp cputbl.h
 GENEMUS = cpuemu1.cpp cpuemu2.cpp cpuemu3.cpp cpuemu4.cpp \
 	  cpuemu5.cpp cpuemu6.cpp cpuemu7.cpp cpuemu8.cpp
 
+# We compile the emulator source outside of Project Builder/XCode
+# so that it always picks up appropriate FLAGS from configure.
+# This is necessary because that code doesn't use config.h
+EMU_OBJ = $(patsubst %.cpp, build/%.o, $(GENEMUS))
+EMU_LIB = libgenemu.a
+
+
 # Symlinks to, or copies of, files in other directories
 GENLINK = README.txt INSTALL.txt install-sh \
 	  Darwin config.guess config.sub semaphore.h \
@@ -48,7 +55,7 @@ SLIRP_LIB = libslirp.a
 
 APP = $(OBJ_DIR)/BasiliskII.app
 
-DEPS = $(OBJ_DIR) $(GEN) $(SLIRP_LIB) $(SRCS)
+DEPS = $(OBJ_DIR) $(GEN) $(EMU_LIB) $(SLIRP_LIB) $(SRCS)
 
 ## Rules
 
@@ -82,10 +89,10 @@ nowrite.icns :
 
 mostlyclean:
 	rm -fr English.lproj/*~* $(OBJ_DIR)/* core* *.core *~ *.bak
-	rm -fr autom4te.cache
+	rm -fr autom4te.cache config tests vhook
 
 clean: mostlyclean
-	rm -f $(SLIRP_LIB)
+	rm -f $(SLIRP_LIB) $(EMU_LIB)
 	rm -f $(GEN)
 	rm -f cpudefs.cpp cputmp*.s cpufast*.s cpustbl.cpp
 
@@ -103,13 +110,13 @@ distclean: clean
 
 
 $(OBJ_DIR)/build68k: ../uae_cpu/build68k.c
-	$(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(LDFLAGS) $< -o $@
+	$(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) $< -o $@
 
 $(OBJ_DIR)/cpuopti: ../uae_cpu/cpuopti.c
-	$(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(LDFLAGS) $< -o $@
+	$(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) $< -o $@
 
 $(OBJ_DIR)/gencpu: cpudefs.cpp ../uae_cpu/gencpu.c ../uae_cpu/readcpu.cpp
-	$(CXX) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(CXXFLAGS) $(LDFLAGS) $^ -o $@
+	$(CXX) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(CXXFLAGS) $^ -o $@
 
 
 
@@ -133,12 +140,17 @@ cpufast.s: cpuemu.s $(OBJ_DIR)/cpuopti
 cpuemu.s: cpuemu.cpp
 	$(CXX) $(CPPFLAGS) $(DEFS) -S $(CXXFLAGS) $< -o $@
 
+$(EMU_OBJ) : build/%.o : %.cpp
+	$(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -c $< -o $@
+
+$(EMU_LIB) : $(EMU_OBJ)
+	libtool -static -o $@ $^
 
 $(SLIRP_OBJ) : build/%.o : ../slirp/%.c
-	$(CC) -I../slirp $(CPPFLAGS) $(DEFS) $(CFLAGS) $(LDFLAGS) -c $< -o $@
+	$(CC) -I../slirp $(CPPFLAGS) $(DEFS) $(CFLAGS) -c $< -o $@
 
 $(SLIRP_LIB) : $(SLIRP_OBJ)
-	libtool -static -o libslirp.a build/*.o
+	libtool -static -o $@ $^
 
 #-------------------------------------------------------------------------
 # DO NOT DELETE THIS LINE -- make depend depends on it.