--- SheepShaver/src/Unix/Makefile.in	2008/11/21 01:09:28	1.44
+++ SheepShaver/src/Unix/Makefile.in	2009/08/18 03:27:50	1.47
@@ -1,4 +1,4 @@
-# Linux makefile for SheepShaver
+# Unix makefile for SheepShaver
 
 ## System specific configuration
 @SET_MAKE@
@@ -119,25 +119,28 @@ $(GUI_APP_EXE): $(OBJ_DIR) $(GUI_OBJS)
 	$(CXX) -o $@ $(LDFLAGS) $(GUI_OBJS) $(GUI_LIBS)
 
 $(APP)_app: $(APP) ../MacOSX/Info.plist ../MacOSX/$(APP).icns
+	rm -rf $(APP_APP)/Contents
 	mkdir -p $(APP_APP)/Contents
-	cp -f ../MacOSX/Info.plist $(APP_APP)/Contents/
+	./cpr.sh ../MacOSX/Info.plist $(APP_APP)/Contents/
 	echo -n 'APPL????' > $(APP_APP)/Contents/PkgInfo
 	mkdir -p $(APP_APP)/Contents/MacOS
-	cp -f $(APP) $(APP_APP)/Contents/MacOS/
+	./cpr.sh $(APP) $(APP_APP)/Contents/MacOS/
 	strip -x $(APP_APP)/Contents/MacOS/$(APP)
 	mkdir -p $(APP_APP)/Contents/Resources
-	cp -R ../MacOSX/PrefsEditor/standalone_nib/English.lproj $(APP_APP)/Contents/Resources
-	cp -f ../MacOSX/SheepShaver.icns $(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
+	rm -rf $(GUI_APP_APP)/Contents
 	mkdir -p $(GUI_APP_APP)/Contents
 	sed -e "s/$(APP)/$(GUI_APP)/" < ../MacOSX/Info.plist > $(GUI_APP_APP)/Contents/Info.plist
 	echo -n 'APPL????' > $(GUI_APP_APP)/Contents/PkgInfo
 	mkdir -p $(GUI_APP_APP)/Contents/MacOS
-	cp -f $(GUI_APP) $(GUI_APP_APP)/Contents/MacOS/
+	./cpr.sh $(GUI_APP) $(GUI_APP_APP)/Contents/MacOS/
 	strip -x $(GUI_APP_APP)/Contents/MacOS/$(GUI_APP)
 	mkdir -p $(GUI_APP_APP)/Contents/Resources
-	cp -f ../MacOSX/$(APP).icns $(GUI_APP_APP)/Contents/Resources/$(GUI_APP).icns
+	./cpr.sh ../MacOSX/$(APP).icns $(GUI_APP_APP)/Contents/Resources/$(GUI_APP).icns
 
 modules:
 	cd Linux/NetDriver; make
@@ -177,6 +180,8 @@ distclean: clean
 depend dep:
 	makedepend $(CPPFLAGS) -Y. $(SRCS) 2>/dev/null
 
+$(OBJ_DIR)/SDLMain.o : SDLMain.m
+	$(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) -c $< -o $@
 $(OBJ_DIR)/%.o : ../slirp/%.c
 	$(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(SLIRP_CFLAGS) -c $< -o $@
 $(OBJ_DIR)/%.o : %.c