mirror of
https://github.com/CTCaer/RetroArch.git
synced 2024-12-15 14:59:37 +00:00
Remove unneeded glue logic. -lSDLmain fixed it :)
This commit is contained in:
parent
5e241d79c8
commit
31db2a30bb
1
Makefile
1
Makefile
@ -12,7 +12,6 @@ DEFINES = -DHAVE_CONFIG_H
|
||||
ifneq ($(findstring Darwin,$(shell uname -a)),)
|
||||
OSX := 1
|
||||
LIBS += -framework AppKit -lSDLmain
|
||||
OBJ += osx-glue.o
|
||||
else
|
||||
OSX := 0
|
||||
endif
|
||||
|
12
osx-glue.m
12
osx-glue.m
@ -1,12 +0,0 @@
|
||||
#import <Foundation/Foundation.h>
|
||||
static NSAutoreleasePool * pool;
|
||||
void init_ns_pool()
|
||||
{
|
||||
pool = [[NSAutoreleasePool alloc] init];
|
||||
}
|
||||
|
||||
void deinit_ns_pool()
|
||||
{
|
||||
[pool release];
|
||||
}
|
||||
|
15
ssnes.c
15
ssnes.c
@ -37,9 +37,6 @@
|
||||
|
||||
#ifdef __APPLE__
|
||||
#include "SDL.h"
|
||||
void NSApplicationLoad(void);
|
||||
void init_ns_pool(void);
|
||||
void deinit_ns_pool(void);
|
||||
#endif
|
||||
|
||||
struct global g_extern = {
|
||||
@ -952,11 +949,6 @@ static void do_state_checks(void)
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
#ifdef __APPLE__ // Very unix-y indeed...
|
||||
NSApplicationLoad();
|
||||
init_ns_pool();
|
||||
#endif
|
||||
|
||||
parse_input(argc, argv);
|
||||
parse_config();
|
||||
init_dlsym();
|
||||
@ -1027,10 +1019,6 @@ int main(int argc, char *argv[])
|
||||
uninit_drivers();
|
||||
uninit_dlsym();
|
||||
|
||||
#ifdef __APPLE__
|
||||
deinit_ns_pool();
|
||||
#endif
|
||||
|
||||
return 0;
|
||||
|
||||
error:
|
||||
@ -1039,9 +1027,6 @@ error:
|
||||
uninit_drivers();
|
||||
uninit_dlsym();
|
||||
|
||||
#ifdef __APPLE__
|
||||
deinit_ns_pool();
|
||||
#endif
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user