Copy etherhelpertool into application bundle.

Ignore -psn_ command line argument so OS X application bundle
can be launched.
This commit is contained in:
Dan Sumorok 2013-06-21 18:59:04 -04:00
parent e08090095f
commit 3583b00a77
2 changed files with 5 additions and 0 deletions

View File

@ -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

View File

@ -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) {