From ecf2403c46bbf2510e9d98b00bccd0385acf73a8 Mon Sep 17 00:00:00 2001 From: nigel <> Date: Mon, 31 Jul 2006 08:47:52 +0000 Subject: [PATCH] ether_unix.cpp somehow pulls something in that needs mem_banks. If it isn't compiled in this directory, the wrong config.h is used. --- BasiliskII/src/MacOSX/1_prepare_files.sh | 1 + BasiliskII/src/MacOSX/BasiliskII.xcode/project.pbxproj | 3 +-- BasiliskII/src/MacOSX/Makefile.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/BasiliskII/src/MacOSX/1_prepare_files.sh b/BasiliskII/src/MacOSX/1_prepare_files.sh index eeb26f95..5114a639 100644 --- a/BasiliskII/src/MacOSX/1_prepare_files.sh +++ b/BasiliskII/src/MacOSX/1_prepare_files.sh @@ -6,6 +6,7 @@ ln -sf ../Unix/config.guess . ln -sf ../Unix/config.sub . +cp -pf ../Unix/ether_unix.cpp . ln -sf ../Unix/semaphore.h . cp -pf ../Unix/sys_unix.cpp . cp -pf ../Unix/timer_unix.cpp . diff --git a/BasiliskII/src/MacOSX/BasiliskII.xcode/project.pbxproj b/BasiliskII/src/MacOSX/BasiliskII.xcode/project.pbxproj index a1721264..7daab139 100644 --- a/BasiliskII/src/MacOSX/BasiliskII.xcode/project.pbxproj +++ b/BasiliskII/src/MacOSX/BasiliskII.xcode/project.pbxproj @@ -1741,8 +1741,7 @@ fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; - name = ether_unix.cpp; - path = ../Unix/ether_unix.cpp; + path = ether_unix.cpp; refType = 2; sourceTree = SOURCE_ROOT; }; diff --git a/BasiliskII/src/MacOSX/Makefile.in b/BasiliskII/src/MacOSX/Makefile.in index aa7a7c15..7ef8b89f 100644 --- a/BasiliskII/src/MacOSX/Makefile.in +++ b/BasiliskII/src/MacOSX/Makefile.in @@ -37,7 +37,7 @@ 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 \ + Darwin config.guess config.sub ether_unix.cpp semaphore.h \ sys_unix.cpp timer_unix.cpp user_strings_unix.h GEN = $(GENEMUS) $(GENSRCS)