ps
/
4coder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix build errors

This commit is contained in:
Allen Webster 2017-06-29 21:21:06 -04:00
parent 8fc0420306
commit 6c0ebe83b1
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osx_objective_c_to_cpp_links.h
View File

@ -41,9 +41,6 @@ typedef struct OSX_Vars{
// In C++ layer. // In C++ layer.
extern OSX_Vars osx; extern OSX_Vars osx;
void
osx_post_to_clipboard(char *str);
internal void* internal void*
osx_allocate(umem size); osx_allocate(umem size);
@ -65,6 +62,10 @@ osx_step();
internal void internal void
osx_init(); osx_init();
// In Objective-C layer.
void
osx_post_to_clipboard(char *str);
#endif #endif
// BOTTOM // BOTTOM

2
platform_mac/mac_4ed.cpp
View File

@ -12,8 +12,6 @@
#include "4tech_defines.h" #include "4tech_defines.h"
#include "4coder_API/version.h" #include "4coder_API/version.h"
#define WINDOW_TITLE "4coder" VERSION
#include "osx_objective_c_to_cpp_links.h" #include "osx_objective_c_to_cpp_links.h"
OSX_Vars osx; OSX_Vars osx;

10
platform_mac/mac_4ed.m
View File

@ -10,18 +10,22 @@
// TOP // TOP
#include "4tech_defines.h" #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 internal
#undef global #undef global
#include "osx_objective_c_to_cpp_links.h"
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#import <CoreVideo/CVDisplayLink.h> #import <CoreVideo/CVDisplayLink.h>
#import <IOKit/hid/IOHIDLib.h> #import <IOKit/hid/IOHIDLib.h>
#import <OpenGL/OpenGL.h> #import <OpenGL/OpenGL.h>
#import <OpenGL/gl.h> #import <OpenGL/gl.h>
static void void
osx_post_to_clipboard(char *str){ osx_post_to_clipboard(char *str){
NSPasteboard *board = [NSPasteboard generalPasteboard]; NSPasteboard *board = [NSPasteboard generalPasteboard];
NSString *utf8_type = @"public.utf8-plain-text"; NSString *utf8_type = @"public.utf8-plain-text";
@ -299,7 +303,7 @@ main(int argc, char **argv){
[[window contentView] addSubview:view]; [[window contentView] addSubview:view];
[window setMinSize:NSMakeSize(100, 100)]; [window setMinSize:NSMakeSize(100, 100)];
[window setTitle:@WINDOW_TITLE]; [window setTitle:@WINDOW_NAME];
[window makeKeyAndOrderFront:nil]; [window makeKeyAndOrderFront:nil];
[NSApp run]; [NSApp run];