Browse Source

Disable -p flag on Mac for now since App Translocation interferes with it during normal launch.

tags/v1.1.0
Andrew Belt 5 years ago
parent
commit
139f9a0da3
2 changed files with 12 additions and 2 deletions
  1. +2
    -2
      Makefile
  2. +10
    -0
      src/main.cpp

+ 2
- 2
Makefile View File

@@ -126,8 +126,8 @@ ifdef ARCH_MAC
# Clean up and sign bundle
xattr -cr dist/$(TARGET).app
codesign --sign "Developer ID Application: Andrew Belt (VRF26934X5)" --verbose dist/$(TARGET).app
codesign --verify --verbose dist/$(TARGET).app
spctl --assess --verbose dist/$(TARGET).app
codesign --verify --deep --strict --verbose=2 dist/$(TARGET).app
spctl -a -t exec -vv dist/$(TARGET).app
# Make ZIP
cd dist && zip -q -9 -r Rack-$(VERSION)-$(ARCH).zip $(TARGET).app
endif


+ 10
- 0
src/main.cpp View File

@@ -72,10 +72,14 @@ int main(int argc, char *argv[]) {
case 'h': {
settings::headless = true;
} break;
// Due to Mac app translocation and Apple adding a -psn... flag when launched, disable screenshots on Mac for now.
#if !defined ARCH_MAC
case 'p': {
screenshot = true;
// If parsing number failed, use default value
sscanf(optarg, "%f", &screenshotZoom);
} break;
#endif
case 's': {
asset::systemDir = optarg;
} break;
@@ -107,6 +111,12 @@ int main(int argc, char *argv[]) {
// Log environment
INFO("%s v%s", app::APP_NAME.c_str(), app::APP_VERSION.c_str());
INFO("%s", system::getOperatingSystemInfo().c_str());
std::string argsList;
for (int i = 0; i < argc; i++) {
argsList += argv[i];
argsList += " ";
}
INFO("Args: %s", argsList.c_str());
if (settings::devMode)
INFO("Development mode");
INFO("System directory: %s", asset::systemDir.c_str());


Loading…
Cancel
Save