diff --git a/BasiliskII/src/Unix/Makefile.in b/BasiliskII/src/Unix/Makefile.in index 21a0e6da..c52eab26 100644 --- a/BasiliskII/src/Unix/Makefile.in +++ b/BasiliskII/src/Unix/Makefile.in @@ -130,6 +130,9 @@ $(APP)_app: $(APP) $(OSX_DOCS) ../../README ../MacOSX/Info.plist ../MacOSX/$(APP ./cpr.sh ../MacOSX/English.lproj $(APP_APP)/Contents/Resources/ cp -f $(OSX_DOCS) $(APP_APP)/Contents/Resources/ cp -f ../../README $(APP_APP)/Contents/Resources/README.txt +ifeq (@MACOSX_ETHERHELPER@,yes) + cp -f etherhelpertool $(APP_APP)/Contents/Resources +endif $(GUI_APP)_app: $(GUI_APP) ../MacOSX/Info.plist ../MacOSX/$(APP).icns rm -rf $(GUI_APP_APP)/Contents diff --git a/BasiliskII/src/Unix/main_unix.cpp b/BasiliskII/src/Unix/main_unix.cpp index 3505335e..19e744b2 100644 --- a/BasiliskII/src/Unix/main_unix.cpp +++ b/BasiliskII/src/Unix/main_unix.cpp @@ -404,6 +404,8 @@ int main(int argc, char **argv) if (i < argc) x_display_name = strdup(argv[i]); #endif + } else if (strncmp(argv[i], "-psn_", 5) == 0) {// OS X process identifier + argv[i++] = NULL; } else if (strcmp(argv[i], "--gui-connection") == 0) { argv[i++] = NULL; if (i < argc) {