darlinghq/darling-cocotron
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-cocotron.git synced 2024-11-23 20:19:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Integrate NSPlatform to Foundation, build NSOpenGLContext

Browse Source
This commit is contained in:
Sergey Bugaev 2017-07-22 11:07:04 +03:00
parent eedc7cb844
commit ba44d61601
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AppKit/CMakeLists.txt
View File

@ -266,7 +266,7 @@ set(AppKit_sources
NSOpenGL/NSOpenGLPixelBuffer.m
NSOpenGL/NSOpenGLPixelFormat.m
NSOpenGL/NSOpenGLDrawable.m
# NSOpenGL/NSOpenGLContext.m needs NSThread-Private.h
NSOpenGL/NSOpenGLContext.m
NSPopUpButtonCell.m
NSPredicateEditor.m

1
AppKit/NSOpenGL/NSOpenGLContext.m
View File

@ -12,7 +12,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
#import <AppKit/NSView.h>
#import <AppKit/NSWindow-Private.h>
#import <OpenGL/OpenGL.h>
#import <Foundation/NSThread-Private.h>
@interface NSOpenGLContext(private)
-(void)_clearCurrentContext;

15
Foundation/platform_posix/NSPlatform_posix.m
View File

@ -8,8 +8,9 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
#if defined(LINUX) || defined(__APPLE__)
#import <objc/runtime.h>
#import <Foundation/Foundation.h>
#ifndef DARLING
#import <Foundation/NSSelectInputSourceSet.h>
#import <Foundation/NSPlatform_posix.h>
#import <Foundation/NSFileHandle_posix.h>
#import <Foundation/NSFileManager_posix.h>
#import <Foundation/NSLock_posix.h>
@ -21,6 +22,9 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
#import <Foundation/NSTask_posix.h>
#import <Foundation/NSSocketPort_posix.h>
#import <Foundation/NSPipe_posix.h>
#endif
#import <Foundation/NSPlatform_posix.h>
#import <Foundation/NSRaiseException.h>
#include <pwd.h>
@ -48,6 +52,7 @@ BOOL NSCurrentLocaleIsMetric(){
@implementation NSPlatform_posix
#ifndef DARLING
-(Class)taskClass {
return [NSTask_posix class];
}
@ -83,6 +88,7 @@ BOOL NSCurrentLocaleIsMetric(){
-(Class)conditionClass {
return [NSCondition_posix class];
}
#endif
static struct passwd *pwent = NULL;
@ -118,6 +124,7 @@ static struct passwd *pwent = NULL;
}
-(NSArray *)arguments {
#ifndef DARLING
extern int NSProcessInfoArgc;
extern const char *const *NSProcessInfoArgv;
NSMutableArray *result=[NSMutableArray array];
@ -127,6 +134,12 @@ static struct passwd *pwent = NULL;
[result addObject:[NSString stringWithCString:NSProcessInfoArgv[i]]];
return result;
#else
// this is only called from Cocotron's NSProcessInfo,
// whereas ours takes argc/argv directly from libsystem's
// _NSGetArgc and _NSGetArgv (just like on the real macOS)
return nil;
#endif
}
-(NSDictionary *)environment {