MacOSX: Use the prefs editor from the Launcher project.

This commit is contained in:
asvitkine 2009-08-18 03:27:50 +00:00
parent 3e7168c78d
commit bc7b9a6c4a
2 changed files with 5 additions and 4 deletions

View File

@ -1,4 +1,4 @@
# Linux makefile for SheepShaver
# Unix makefile for SheepShaver
## System specific configuration
@SET_MAKE@
@ -127,7 +127,8 @@ $(APP)_app: $(APP) ../MacOSX/Info.plist ../MacOSX/$(APP).icns
./cpr.sh $(APP) $(APP_APP)/Contents/MacOS/
strip -x $(APP_APP)/Contents/MacOS/$(APP)
mkdir -p $(APP_APP)/Contents/Resources
./cpr.sh ../MacOSX/PrefsEditor/standalone_nib/English.lproj $(APP_APP)/Contents/Resources
mkdir -p $(APP_APP)/Contents/Resources/English.lproj
./cpr.sh ../MacOSX/Launcher/English.lproj/VMSettingsWindow.nib $(APP_APP)/Contents/Resources/English.lproj
./cpr.sh ../MacOSX/SheepShaver.icns $(APP_APP)/Contents/Resources/
$(GUI_APP)_app: $(GUI_APP) ../MacOSX/Info.plist ../MacOSX/$(APP).icns

View File

@ -605,8 +605,8 @@ 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/PrefsEditor/PrefsEditor.mm"
CPPFLAGS="$CPPFLAGS -I../MacOSX/PrefsEditor"
PREFSSRC="../MacOSX/prefs_macosx.mm ../MacOSX/Launcher/VMSettingsController.mm"
CPPFLAGS="$CPPFLAGS -I../MacOSX/Launcher"
fi
fi
if [[ "x$WANT_ESD" = "xno" -a "x$ac_cv_framework_CoreAudio" = "xyes" -a "x$WANT_SDL_AUDIO" = "xno" ]]; then