--- SheepShaver/src/Unix/Makefile.in	2006/05/01 22:33:34	1.38
+++ SheepShaver/src/Unix/Makefile.in	2008/11/21 01:09:28	1.44
@@ -73,10 +73,10 @@ GUI_APP = SheepShaverGUI
 GUI_APP_EXE = $(GUI_APP)$(EXEEXT)
 GUI_APP_APP = $(GUI_APP).app
 PROGS += $(GUI_APP_EXE)
-endif
-
+else
 CXXFLAGS += $(GUI_CFLAGS)
 LIBS += $(GUI_LIBS)
+endif
 
 ## Rules
 .PHONY: modules install uninstall clean distclean depend dep
@@ -124,8 +124,9 @@ $(APP)_app: $(APP) ../MacOSX/Info.plist
 	echo -n 'APPL????' > $(APP_APP)/Contents/PkgInfo
 	mkdir -p $(APP_APP)/Contents/MacOS
 	cp -f $(APP) $(APP_APP)/Contents/MacOS/
-	strip $(APP_APP)/Contents/MacOS/$(APP)
+	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/
 
 $(GUI_APP)_app: $(GUI_APP) ../MacOSX/Info.plist ../MacOSX/$(APP).icns
@@ -134,7 +135,7 @@ $(GUI_APP)_app: $(GUI_APP) ../MacOSX/Inf
 	echo -n 'APPL????' > $(GUI_APP_APP)/Contents/PkgInfo
 	mkdir -p $(GUI_APP_APP)/Contents/MacOS
 	cp -f $(GUI_APP) $(GUI_APP_APP)/Contents/MacOS/
-	strip $(GUI_APP_APP)/Contents/MacOS/$(GUI_APP)
+	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
 
@@ -163,9 +164,9 @@ uninstall:
 	rmdir $(DESTDIR)$(datadir)/$(APP)
 
 clean:
-	rm -f $(APP_EXE) $(OBJ_DIR)/* core* *.core *~ *.bak ppc-execute-impl.cpp
+	rm -f $(PROGS) $(OBJ_DIR)/* core* *.core *~ *.bak ppc-execute-impl.cpp
 	rm -f dyngen basic-dyngen-ops.hpp ppc-dyngen-ops.hpp ppc_asm.out.s
-	rm -rf $(APP_APP)
+	rm -rf $(APP_APP) $(GUI_APP_APP)
 
 distclean: clean
 	rm -rf $(OBJ_DIR)
@@ -220,7 +221,7 @@ $(OBJ_DIR)/ppc-dyngen-ops.o: $(kpxsrcdir
 ppc-dyngen-ops.hpp: $(OBJ_DIR)/ppc-dyngen-ops.o $(DYNGEN)
 	./$(DYNGEN) -o $@ $<
 
-$(OBJ_DIR)/sheepshaver_glue.o $(OBJ_DIR)/ppc-cpu.o $(OBJ_DIR)/ppc-decode.o $(OBJ_DIR)/ppc-translate.o: basic-dyngen-ops.hpp ppc-dyngen-ops.hpp
+$(OBJ_DIR)/sheepshaver_glue.o $(OBJ_DIR)/ppc-cpu.o $(OBJ_DIR)/ppc-decode.o $(OBJ_DIR)/ppc-translate.o $(OBJ_DIR)/ppc-jit.o: basic-dyngen-ops.hpp ppc-dyngen-ops.hpp
 endif
 
 $(OBJ_DIR)/ppc-execute.o: ppc-execute-impl.cpp
@@ -228,9 +229,9 @@ ppc-execute-impl.cpp: $(kpxsrcdir)/cpu/p
 	$(CPP) $(CPPFLAGS) -DGENEXEC $< | $(PERL) $(GENEXECPL) > $@
 
 # PowerPC CPU tester
-TESTSRCS_ = mathlib/ieeefp.cpp mathlib/mathlib.cpp cpu/ppc/ppc-cpu.cpp cpu/ppc/ppc-decode.cpp cpu/ppc/ppc-execute.cpp cpu/ppc/ppc-translate.cpp test/test-powerpc.cpp $(MONSRCS) vm_alloc.cpp
+TESTSRCS_ = mathlib/ieeefp.cpp mathlib/mathlib.cpp cpu/ppc/ppc-cpu.cpp cpu/ppc/ppc-decode.cpp cpu/ppc/ppc-execute.cpp cpu/ppc/ppc-translate.cpp test/test-powerpc.cpp $(MONSRCS) vm_alloc.cpp utils/utils-cpuinfo.cpp
 ifeq ($(USE_DYNGEN),yes)
-TESTSRCS_ += cpu/jit/jit-cache.cpp cpu/jit/basic-dyngen.cpp cpu/ppc/ppc-dyngen.cpp
+TESTSRCS_ += cpu/jit/jit-cache.cpp cpu/jit/basic-dyngen.cpp cpu/ppc/ppc-dyngen.cpp cpu/ppc/ppc-jit.cpp
 endif
 TESTSRCS  = $(TESTSRCS_:%.cpp=$(kpxsrcdir)/%.cpp)