Fix DiskType missing symbol

This commit is contained in:
Dave Vasilevsky 2015-07-05 08:42:40 -04:00
parent db375713bb
commit a89bb77bde
2 changed files with 3 additions and 1 deletions

View File

@ -188,6 +188,8 @@ $(OBJ_DIR)/%.o : ../slirp/%.c
$(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(SLIRP_CFLAGS) -c $< -o $@ $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(SLIRP_CFLAGS) -c $< -o $@
$(OBJ_DIR)/%.o : %.c $(OBJ_DIR)/%.o : %.c
$(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) -c $< -o $@ $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) -c $< -o $@
$(OBJ_DIR)/DiskType.o : DiskType.m
$(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) -c $< -o $@
$(OBJ_DIR)/%.o : %.cpp $(OBJ_DIR)/%.o : %.cpp
$(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -c $< -o $@ $(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -c $< -o $@
$(OBJ_DIR)/%.o : %.mm $(OBJ_DIR)/%.o : %.mm

View File

@ -625,7 +625,7 @@ darwin*)
if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
EXTFSSRC=../MacOSX/extfs_macosx.cpp EXTFSSRC=../MacOSX/extfs_macosx.cpp
if [[ "x$ac_cv_framework_AppKit" = "xyes" -a "x$WANT_GTK" = "xno" ]]; then 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" CPPFLAGS="$CPPFLAGS -I../MacOSX/Launcher"
fi fi
fi fi