From a89bb77bde40ab206b7ab85b58e651886b0a514c Mon Sep 17 00:00:00 2001 From: Dave Vasilevsky Date: Sun, 5 Jul 2015 08:42:40 -0400 Subject: [PATCH] Fix DiskType missing symbol --- SheepShaver/src/Unix/Makefile.in | 2 ++ SheepShaver/src/Unix/configure.ac | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/SheepShaver/src/Unix/Makefile.in b/SheepShaver/src/Unix/Makefile.in index ad3c46bd..b2c3b892 100644 --- a/SheepShaver/src/Unix/Makefile.in +++ b/SheepShaver/src/Unix/Makefile.in @@ -188,6 +188,8 @@ $(OBJ_DIR)/%.o : ../slirp/%.c $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(SLIRP_CFLAGS) -c $< -o $@ $(OBJ_DIR)/%.o : %.c $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) -c $< -o $@ +$(OBJ_DIR)/DiskType.o : DiskType.m + $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) -c $< -o $@ $(OBJ_DIR)/%.o : %.cpp $(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -c $< -o $@ $(OBJ_DIR)/%.o : %.mm diff --git a/SheepShaver/src/Unix/configure.ac b/SheepShaver/src/Unix/configure.ac index 48847948..0e279a30 100644 --- a/SheepShaver/src/Unix/configure.ac +++ b/SheepShaver/src/Unix/configure.ac @@ -625,7 +625,7 @@ darwin*) if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then EXTFSSRC=../MacOSX/extfs_macosx.cpp if [[ "x$ac_cv_framework_AppKit" = "xyes" -a "x$WANT_GTK" = "xno" ]]; then - PREFSSRC="../MacOSX/prefs_macosx.mm ../MacOSX/Launcher/VMSettingsController.mm" + PREFSSRC="../MacOSX/prefs_macosx.mm ../MacOSX/Launcher/VMSettingsController.mm ../MacOSX/Launcher/DiskType.m" CPPFLAGS="$CPPFLAGS -I../MacOSX/Launcher" fi fi