fix xcode gyp build

neonkore · Jun 28, 2020 · 1e45eb1 · 1e45eb1
1 parent 956512e
commit 1e45eb1
Show file tree

Hide file tree

Showing 8 changed files with 139 additions and 21 deletions.
diff --git a/build_android.sh b/build_android.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+# change to real android NDK path
 export NDK_ROOT=/d/android-ndk-r10b
 
 export PROJECT_ROOT=`pwd`

diff --git a/demos/Info.plist b/demos/Info.plist
@@ -26,8 +26,6 @@
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2019 zhang  jipeng. All rights reserved.</string>
-	<key>NSMainStoryboardFile</key>
-	<string>Main</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 	<key>NSSupportsAutomaticTermination</key>

diff --git a/demos/demos.gypi b/demos/demos.gypi
@@ -42,14 +42,16 @@
           ],
         }],
         ['OS=="macosx" or OS=="ios"', {
+          'mac_bundle': 1,
           'sources': [
             'platform_apple.m',
-            'Info.plist',
-            'Main.storyboard',
           ],
           'defines':[
             'UNIX',
           ],
+          'xcode_settings': {
+              'INFOPLIST_FILE': 'demos/Info.plist',
+          },
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
@@ -100,14 +102,16 @@
           ],
         }],
         ['OS=="macosx" or OS=="ios"', {
+          'mac_bundle': 1,
           'sources': [
             'platform_apple.m',
-            'Info.plist',
-            'Main.storyboard',
           ],
           'defines':[
             'UNIX',
           ],
+          'xcode_settings': {
+              'INFOPLIST_FILE': 'demos/Info.plist',
+          },
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
@@ -158,14 +162,16 @@
           ],
         }],
         ['OS=="macosx" or OS=="ios"', {
+          'mac_bundle': 1,
           'sources': [
             'platform_apple.m',
-            'Info.plist',
-            'Main.storyboard',
           ],
           'defines':[
             'UNIX',
           ],
+          'xcode_settings': {
+              'INFOPLIST_FILE': 'demos/Info.plist',
+          },
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
@@ -216,14 +222,16 @@
           ],
         }],
         ['OS=="macosx" or OS=="ios"', {
+          'mac_bundle': 1,
           'sources': [
             'platform_apple.m',
-            'Info.plist',
-            'Main.storyboard',
           ],
           'defines':[
             'UNIX',
           ],
+          'xcode_settings': {
+              'INFOPLIST_FILE': 'demos/Info.plist',
+          },
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',

diff --git a/demos/platform_apple.m b/demos/platform_apple.m
@@ -1,5 +1,3 @@
-//  platform_apple
-//
 //  Created by zhangjipeng on 2019/10/25.
 //  Copyright © 2019 zhang  jipeng. All rights reserved.
 
@@ -11,13 +9,19 @@ @interface AppDelegate : NSObject <NSApplicationDelegate>
 @end
 
 @interface AppDelegate ()
-
+@property NSWindow* mainWindow;
 @end
 
 @implementation AppDelegate
 
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
     // Insert code here to initialize your application
+    NSRect rc = NSMakeRect(0, 0, 640, 480);
+    NSWindowStyleMask style = NSWindowStyleMaskClosable | NSWindowStyleMaskTitled | NSWindowStyleMaskResizable;
+    _mainWindow = [[NSWindow alloc] initWithContentRect:rc styleMask:style backing:NSBackingStoreBuffered defer:NO];
+    [_mainWindow setTitle:@"Picasso demos"];
+    [_mainWindow makeKeyAndOrderFront:_mainWindow];
+    [_mainWindow makeKeyWindow];
 }
 
 
@@ -48,6 +52,9 @@ int main(int argc, const char * argv[])
 {
     @autoreleasepool {
         // Setup code that might create autoreleased objects goes here.
+        AppDelegate * delegate = [[AppDelegate alloc] init];
+        NSApplication * application = [NSApplication sharedApplication];
+        [application setDelegate:delegate];
     }
     return NSApplicationMain(argc, argv);
 }
diff --git a/test/Info.plist b/test/Info.plist
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.developer-tools</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2019 zhang  jipeng. All rights reserved.</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>NSSupportsAutomaticTermination</key>
+	<true/>
+	<key>NSSupportsSuddenTermination</key>
+	<true/>
+</dict>
+</plist>