Smoke test on macos now compiles

This commit is contained in:
2019-07-11 21:58:59 -07:00
parent 9ee509b101
commit 570c5ab6bf
4 changed files with 39 additions and 6 deletions

View File

@@ -20,7 +20,7 @@ void KRContext::destroyDeviceContexts()
gRenderContext = nil; gRenderContext = nil;
} }
void KRContext::createDeviceContexts() void createGLDeviceContexts()
{ {
if(gRenderContext == nil) { if(gRenderContext == nil) {
@@ -63,20 +63,20 @@ void KRContext::createDeviceContexts()
void KRContext::activateStreamerContext() void KRContext::activateStreamerContext()
{ {
createDeviceContexts(); createGLDeviceContexts();
[gStreamerContext makeCurrentContext]; [gStreamerContext makeCurrentContext];
} }
void KRContext::activateRenderContext() void KRContext::activateRenderContext()
{ {
createDeviceContexts(); createGLDeviceContexts();
[gRenderContext update]; [gRenderContext update];
[gRenderContext makeCurrentContext]; [gRenderContext makeCurrentContext];
} }
void KRContext::attachToView(void *view) void KRContext::attachToView(void *view)
{ {
createDeviceContexts(); createGLDeviceContexts();
NSView *v = (NSView *)view; NSView *v = (NSView *)view;
[gRenderContext setView: v]; [gRenderContext setView: v];
[gRenderContext update]; [gRenderContext update];

View File

@@ -4,10 +4,10 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)
if (WIN32) if (WIN32)
add_executable(kraken_cube WIN32 main.cpp) add_executable(kraken_cube WIN32 main_win.cpp)
add_compile_definitions(UNICODE) add_compile_definitions(UNICODE)
else(WIN32) else(WIN32)
add_executable(kraken_cube main.cpp) add_executable(kraken_cube main_macos.mm)
set(CMAKE_CXX_COMPILER "clang++") set(CMAKE_CXX_COMPILER "clang++")
endif(WIN32) endif(WIN32)

View File

@@ -0,0 +1,33 @@
#import "Cocoa/Cocoa.h"
#include "kraken.h"
using namespace kraken;
int main(int argc, const char * argv[])
{
@autoreleasepool {
[NSApplication sharedApplication];
//
// Create a window:
//
// Style flags:
NSUInteger windowStyle = NSTitledWindowMask | NSClosableWindowMask | NSResizableWindowMask;
NSRect windowRect = NSMakeRect(0, 0, 640, 480);
NSWindow * window = [[NSWindow alloc] initWithContentRect:windowRect
styleMask:windowStyle
backing:NSBackingStoreBuffered
defer:NO];
[window autorelease];
// Window controller:
NSWindowController * windowController = [[NSWindowController alloc] initWithWindow:window];
[windowController autorelease];
[window orderFrontRegardless];
[NSApp run];
}
return 0;
}