--- BasiliskII/src/MacOSX/Makefile.in 2004/01/27 01:15:17 1.12 +++ BasiliskII/src/MacOSX/Makefile.in 2004/01/29 12:24:43 1.15 @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 1.12 2004/01/27 01:15:17 nigel Exp $ +# $Id: Makefile.in,v 1.15 2004/01/29 12:24:43 nigel Exp $ # MacOS X makefile for Basilisk II. Slightly based on the Unix one ## System specific configuration @@ -14,6 +14,10 @@ CPPFLAGS = @CPPFLAGS@ -I../include -I. @ DEFS = @DEFS@ @DEFINES@ -D_REENTRANT LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ +BLESS = @BLESS@ +IDE = @IDE@ +PROJECT = @PROJECT@ +IDEARGS = @IDEARGS@ ## Files OBJ_DIR = build @@ -35,7 +39,7 @@ SRCS = BasiliskII.icns Controller.h Con NNThread.h NNThread.m PrefsEditor.h PrefsEditor.mm \ ToDo.html Versions.html \ audio_macosx.mm extfs_macosx.mm macos_util_macosx.h main_macosx.h \ - main_macosx.mm misc_macosx.h misc_macosx.mm prefs_macosx.cpp \ + main_macosx.mm misc_macosx.h misc_macosx.mm nowrite.icns prefs_macosx.cpp \ sysdeps.h video_macosx.mm video_macosx.h APP = $(OBJ_DIR)/BasiliskII.app @@ -48,10 +52,7 @@ APP = $(OBJ_DIR)/BasiliskII.app all: $(APP) ide: $(OBJ_DIR) $(GEN) $(SRCS) - open BasiliskII.xcode - -oldide: $(OBJ_DIR) $(GEN) $(SRCS) - open BasiliskII.pbproj + open $(PROJECT) test: $(APP) open $(APP) @@ -61,12 +62,16 @@ $(OBJ_DIR):: $(APP): $(OBJ_DIR) $(GEN) $(SRCS) - pbxbuild -buildstyle Deployment || rm -fr $(APP) -# pbxbuild || rm -fr $(APP) + $(IDE) -buildstyle Deployment $(IDEARGS) \ + && $(BLESS) $(APP)/Contents/MacOS/BasiliskII \ + || rm -fr $(APP) BasiliskII.icns : touch $@ +nowrite.icns : + ln -sf /System/Library/CoreServices/Finder.app/Contents/Resources/nowrite.icns . + mostlyclean: rm -fr English.lproj/*~* $(OBJ_DIR)/* core* *.core *~ *.bak