fix build errors
parent
8fc0420306
commit
6c0ebe83b1
|
@ -41,9 +41,6 @@ typedef struct OSX_Vars{
|
|||
// In C++ layer.
|
||||
extern OSX_Vars osx;
|
||||
|
||||
void
|
||||
osx_post_to_clipboard(char *str);
|
||||
|
||||
internal void*
|
||||
osx_allocate(umem size);
|
||||
|
||||
|
@ -65,6 +62,10 @@ osx_step();
|
|||
internal void
|
||||
osx_init();
|
||||
|
||||
// In Objective-C layer.
|
||||
void
|
||||
osx_post_to_clipboard(char *str);
|
||||
|
||||
#endif
|
||||
|
||||
// BOTTOM
|
||||
|
|
|
@ -12,8 +12,6 @@
|
|||
#include "4tech_defines.h"
|
||||
#include "4coder_API/version.h"
|
||||
|
||||
#define WINDOW_TITLE "4coder" VERSION
|
||||
|
||||
#include "osx_objective_c_to_cpp_links.h"
|
||||
|
||||
OSX_Vars osx;
|
||||
|
|
|
@ -10,18 +10,22 @@
|
|||
// TOP
|
||||
|
||||
#include "4tech_defines.h"
|
||||
#include "osx_objective_c_to_cpp_links.h"
|
||||
#include "4coder_API/version.h"
|
||||
|
||||
#define WINDOW_NAME "4coder" VERSION
|
||||
|
||||
#undef internal
|
||||
#undef global
|
||||
|
||||
#include "osx_objective_c_to_cpp_links.h"
|
||||
|
||||
#import <Cocoa/Cocoa.h>
|
||||
#import <CoreVideo/CVDisplayLink.h>
|
||||
#import <IOKit/hid/IOHIDLib.h>
|
||||
#import <OpenGL/OpenGL.h>
|
||||
#import <OpenGL/gl.h>
|
||||
|
||||
static void
|
||||
void
|
||||
osx_post_to_clipboard(char *str){
|
||||
NSPasteboard *board = [NSPasteboard generalPasteboard];
|
||||
NSString *utf8_type = @"public.utf8-plain-text";
|
||||
|
@ -299,7 +303,7 @@ main(int argc, char **argv){
|
|||
|
||||
[[window contentView] addSubview:view];
|
||||
[window setMinSize:NSMakeSize(100, 100)];
|
||||
[window setTitle:@WINDOW_TITLE];
|
||||
[window setTitle:@WINDOW_NAME];
|
||||
[window makeKeyAndOrderFront:nil];
|
||||
|
||||
[NSApp run];
|
||||
|
|
Loading…
Reference in New Issue