New script to generate symlinks, remove any symlink generation from Makefile,

Makefile now generates 8 wrappers for cpuemu.cpp to slightly improve compile
time, added the 8 wrappers to the Project Builder file, updated doco

BasiliskII/src/MacOSX/0_HOW_TO_BUILD.txt

@@ -8,27 +8,23 @@
 
 2) If grabbing this source from a tarball, put this MacOSX directory in
    BasiliskII-1.0/src. Source is currently only compatible with 1.0 snapshot.
+   Open a Terminal, and cd to BasiliskII-1.0/src/MacOSX
 
-3) Open a Terminal, and cd to BasiliskII-1.0/src/MacOSX
+3) sh 0prepare_links
 
-   If the source was grabbed from CVS, run the following commands:
+   This creates some symlinks to files in the Unix and /usr/libexec directories
 
-   ln -s /usr/libexec/config.guess .
+4) autoconf
-   ln -s /usr/libexec/config.sub   .
-   ln -s ../Unix/acconfig.h .
-   ln -s ../Unix/install-sh .
-
-4) type autoconf
 
    Ignore the warning. autoconf should generate ./configure
 
-5) type ./configure
+5) ./configure
 
    This should generate a Makefile and some header files
 
-6) type make
+6) make
 
-   This should generate some symlinks, the uae_cpu emulator core's source,
+   This should generate the uae_cpu emulator core's source,
    and then the application.
 
 * It is also possible to use the OS X integrated development environment
@@ -37,8 +33,8 @@
 
 6) make ide
 
-   This should generate some symlinks and the uae_cpu emulator core's source,
+   This should generate the uae_cpu emulator core's source,
-   and then open the IDE with the file BasiliskII.pbproj
+   and then open the IDE with the file in BasiliskII.pbproj
 
 7) From the Build menu, choose 'Build' or 'Build & Run'
 

BasiliskII/src/MacOSX/0prepare_links

@@ -0,0 +1,6 @@
+ln -s /usr/libexec/config.guess .
+ln -s /usr/libexec/config.sub   .
+ln -s ../Unix/user_strings_unix.h .
+ln -s ../Unix/acconfig.h .
+ln -s ../Unix/install-sh .
+ln -s ../../README README.txt

BasiliskII/src/MacOSX/BasiliskII.pbproj/project.pbxproj

@@ -868,7 +868,14 @@
 		00F248BDFF9FB58D95877872 = {
 			children = (
 				00F248BEFF9FB58D95877872,
-				00F248BFFF9FB58D95877872,
+				F644DFFC02435DC30108A02E,
+				F644DFFD02435DC30108A02E,
+				F644DFFE02435DC30108A02E,
+				F644DFFF02435DC30108A02E,
+				F644E00002435DC30108A02E,
+				F644E00102435DC30108A02E,
+				F644E00202435DC30108A02E,
+				F644E00302435DC30108A02E,
 				00F248C0FF9FB58D95877872,
 				00F248C1FF9FB58D95877872,
 			);
@@ -881,11 +888,6 @@
 			path = cpudefs.cpp;
 			refType = 2;
 		};
-		00F248BFFF9FB58D95877872 = {
-			isa = PBXFileReference;
-			path = cpuemu.cpp;
-			refType = 2;
-		};
 		00F248C0FF9FB58D95877872 = {
 			isa = PBXFileReference;
 			path = cpustbl.cpp;
@@ -910,14 +912,6 @@
 				);
 			};
 		};
-		00F248C4FF9FB58D95877872 = {
-			fileRef = 00F248BFFF9FB58D95877872;
-			isa = PBXBuildFile;
-			settings = {
-				ATTRIBUTES = (
-				);
-			};
-		};
 		00F248C5FF9FB58D95877872 = {
 			fileRef = 00F248C0FF9FB58D95877872;
 			isa = PBXBuildFile;
@@ -1754,7 +1748,14 @@
 				00EC2986FFEE9C5495877872,
 				0107BC6A000E46CF95877872,
 				00F248C3FF9FB58D95877872,
-				00F248C4FF9FB58D95877872,
+				F644E00402435DC30108A02E,
+				F644E00502435DC30108A02E,
+				F644E00602435DC30108A02E,
+				F644E00702435DC30108A02E,
+				F644E00802435DC30108A02E,
+				F644E00902435DC30108A02E,
+				F644E00A02435DC30108A02E,
+				F644E00B02435DC30108A02E,
 				00F248C5FF9FB58D95877872,
 				F59F4592020CDBFD01A80001,
 				F5B887510207D11E01A80001,
@@ -1998,6 +1999,94 @@
 			settings = {
 			};
 		};
+		F644DFFC02435DC30108A02E = {
+			isa = PBXFileReference;
+			path = cpuemu1.cpp;
+			refType = 2;
+		};
+		F644DFFD02435DC30108A02E = {
+			isa = PBXFileReference;
+			path = cpuemu2.cpp;
+			refType = 2;
+		};
+		F644DFFE02435DC30108A02E = {
+			isa = PBXFileReference;
+			path = cpuemu3.cpp;
+			refType = 2;
+		};
+		F644DFFF02435DC30108A02E = {
+			isa = PBXFileReference;
+			path = cpuemu4.cpp;
+			refType = 2;
+		};
+		F644E00002435DC30108A02E = {
+			isa = PBXFileReference;
+			path = cpuemu5.cpp;
+			refType = 2;
+		};
+		F644E00102435DC30108A02E = {
+			isa = PBXFileReference;
+			path = cpuemu6.cpp;
+			refType = 2;
+		};
+		F644E00202435DC30108A02E = {
+			isa = PBXFileReference;
+			path = cpuemu7.cpp;
+			refType = 2;
+		};
+		F644E00302435DC30108A02E = {
+			isa = PBXFileReference;
+			path = cpuemu8.cpp;
+			refType = 2;
+		};
+		F644E00402435DC30108A02E = {
+			fileRef = F644DFFC02435DC30108A02E;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F644E00502435DC30108A02E = {
+			fileRef = F644DFFD02435DC30108A02E;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F644E00602435DC30108A02E = {
+			fileRef = F644DFFE02435DC30108A02E;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F644E00702435DC30108A02E = {
+			fileRef = F644DFFF02435DC30108A02E;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F644E00802435DC30108A02E = {
+			fileRef = F644E00002435DC30108A02E;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F644E00902435DC30108A02E = {
+			fileRef = F644E00102435DC30108A02E;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F644E00A02435DC30108A02E = {
+			fileRef = F644E00202435DC30108A02E;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F644E00B02435DC30108A02E = {
+			fileRef = F644E00302435DC30108A02E;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
 		F66A596A021B9B1701877872 = {
 			isa = PBXFileReference;
 			path = extfs_macosx.h;

BasiliskII/src/MacOSX/Makefile.in

@@ -16,8 +16,18 @@ LIBS = @LIBS@
 
 ## Files
 OBJ_DIR = build
-GENSRCS = user_strings_unix.h cpudefs.cpp cpuemu.cpp cpustbl.cpp cputbl.h \
+GENSRCS = cpudefs.cpp cpuemu.cpp cpustbl.cpp cputbl.h
-	  README.txt
+
+# Wrappers which split the very large cpuemu.cpp into smaller compile units
+GENEMUS = cpuemu1.cpp cpuemu2.cpp cpuemu3.cpp cpuemu4.cpp \
+	  cpuemu5.cpp cpuemu6.cpp cpuemu7.cpp cpuemu8.cpp
+
+# Symlinks to files in other directories
+GENLINK = README.txt acconfig.h install-sh \
+	  config.guess config.sub user_strings_unix.h
+
+GEN  = $(GENEMUS) $(GENSRCS) $(GENLINK)
+
 SRCS =  BasiliskII.icns Controller.h Controller.mm Credits.html \
 	Emulator.h Emulator.mm EmulatorView.h EmulatorView.mm English.lproj \
 	NNThread.h NNThread.m PrefsEditor.h PrefsEditor.mm \
@@ -35,7 +45,7 @@ APP = $(OBJ_DIR)/BasiliskII.app
 
 all: $(APP)
 
-ide: $(OBJ_DIR) $(GENSRCS) $(SRCS)
+ide: $(OBJ_DIR) $(GEN) $(SRCS)
 	open BasiliskII.pbproj
 
 test: $(APP)
@@ -49,12 +59,6 @@ $(APP): $(OBJ_DIR) $(GENSRCS) $(SRCS)
 	pbxbuild -buildstyle Deployment
 #	pbxbuild
 
-README.txt : ../../README
-	ln -s $< $@
-
-user_strings_unix.h : ../Unix/user_strings_unix.h
-	ln -s $< $@
-
 BasiliskII.icns :
 	touch $@
 
@@ -62,7 +66,7 @@ mostlyclean:
 	rm -fr English.lproj/*~* $(OBJ_DIR)/* core* *.core *~ *.bak
 
 clean: mostlyclean
-	rm -f $(GENSRCS)
+	rm -f $(GEN)
 	rm -f cpudefs.cpp cputmp*.s cpufast*.s cpustbl.cpp
 
 distclean: clean
@@ -103,39 +107,47 @@ cpuemu.cpp cpustbl.cpp cputbl.h: $(OBJ_DIR)/gencpu
 	$<
 
 
-$(OBJ_DIR)/cpuemu1.o: cpuemu.cpp
-	$(CXX) $(CPPFLAGS) $(DEFS) -DPART_1 $(CXXFLAGS) -c $< -o $@
-$(OBJ_DIR)/cpuemu2.o: cpuemu.cpp
-	$(CXX) $(CPPFLAGS) $(DEFS) -DPART_2 $(CXXFLAGS) -c $< -o $@
-$(OBJ_DIR)/cpuemu3.o: cpuemu.cpp
-	$(CXX) $(CPPFLAGS) $(DEFS) -DPART_3 $(CXXFLAGS) -c $< -o $@
-$(OBJ_DIR)/cpuemu4.o: cpuemu.cpp
-	$(CXX) $(CPPFLAGS) $(DEFS) -DPART_4 $(CXXFLAGS) -c $< -o $@
-$(OBJ_DIR)/cpuemu5.o: cpuemu.cpp
-	$(CXX) $(CPPFLAGS) $(DEFS) -DPART_5 $(CXXFLAGS) -c $< -o $@
-$(OBJ_DIR)/cpuemu6.o: cpuemu.cpp
-	$(CXX) $(CPPFLAGS) $(DEFS) -DPART_6 $(CXXFLAGS) -c $< -o $@
-$(OBJ_DIR)/cpuemu7.o: cpuemu.cpp
-	$(CXX) $(CPPFLAGS) $(DEFS) -DPART_7 $(CXXFLAGS) -c $< -o $@
-$(OBJ_DIR)/cpuemu8.o: cpuemu.cpp
-	$(CXX) $(CPPFLAGS) $(DEFS) -DPART_8 $(CXXFLAGS) -c $< -o $@
-
 cpuemu1.cpp: cpuemu.cpp
-	$(CXX) -E -DPART_1 $< >$@
+	echo '#define PART_1' > $@
+	echo '#include "$<"' >> $@
 cpuemu2.cpp: cpuemu.cpp
-	$(CXX) -E -DPART_2 $< >$@
+	echo '#define PART_2' > $@
+	echo '#include "$<"' >> $@
 cpuemu3.cpp: cpuemu.cpp
-	$(CXX) -E -DPART_3 $< >$@
+	echo '#define PART_3' > $@
+	echo '#include "$<"' >> $@
 cpuemu4.cpp: cpuemu.cpp
-	$(CXX) -E -DPART_4 $< >$@
+	echo '#define PART_4' > $@
+	echo '#include "$<"' >> $@
 cpuemu5.cpp: cpuemu.cpp
-	$(CXX) -E -DPART_5 $< >$@
+	echo '#define PART_5' > $@
+	echo '#include "$<"' >> $@
 cpuemu6.cpp: cpuemu.cpp
-	$(CXX) -E -DPART_6 $< >$@
+	echo '#define PART_6' > $@
+	echo '#include "$<"' >> $@
 cpuemu7.cpp: cpuemu.cpp
-	$(CXX) -E -DPART_7 $< >$@
+	echo '#define PART_7' > $@
+	echo '#include "$<"' >> $@
 cpuemu8.cpp: cpuemu.cpp
-	$(CXX) -E -DPART_8 $< >$@
+	echo '#define PART_8' > $@
+	echo '#include "$<"' >> $@
+
+#cpuemu1.cpp: cpuemu.cpp
+#	$(CXX) $(CPPFLAGS) $(DEFS) -DPART_1 -E $< > $@
+#cpuemu2.cpp: cpuemu.cpp
+#	$(CXX) $(CPPFLAGS) $(DEFS) -DPART_2 -E $< > $@
+#cpuemu3.cpp: cpuemu.cpp
+#	$(CXX) $(CPPFLAGS) $(DEFS) -DPART_3 -E $< > $@
+#cpuemu4.cpp: cpuemu.cpp
+#	$(CXX) $(CPPFLAGS) $(DEFS) -DPART_4 -E $< > $@
+#cpuemu5.cpp: cpuemu.cpp
+#	$(CXX) $(CPPFLAGS) $(DEFS) -DPART_5 -E $< > $@
+#cpuemu6.cpp: cpuemu.cpp
+#	$(CXX) $(CPPFLAGS) $(DEFS) -DPART_6 -E $< > $@
+#cpuemu7.cpp: cpuemu.cpp
+#	$(CXX) $(CPPFLAGS) $(DEFS) -DPART_7 -E $< > $@
+#cpuemu8.cpp: cpuemu.cpp
+#	$(CXX) $(CPPFLAGS) $(DEFS) -DPART_8 -E $< > $@
 
 
 cpufast.s: cpuemu.cpp $(OBJ_DIR)/cpuopti