ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove unneeded glue logic. -lSDLmain fixed it :)

This commit is contained in:
Themaister 2011-02-04 16:44:00 -06:00
parent 5e241d79c8
commit 31db2a30bb
3 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -12,7 +12,6 @@ DEFINES = -DHAVE_CONFIG_H
ifneq ($(findstring Darwin,$(shell uname -a)),) ifneq ($(findstring Darwin,$(shell uname -a)),)
OSX := 1 OSX := 1
LIBS += -framework AppKit -lSDLmain LIBS += -framework AppKit -lSDLmain
OBJ += osx-glue.o
else else
OSX := 0 OSX := 0
endif endif

12
osx-glue.m
View File

@ -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
View File

@ -37,9 +37,6 @@
#ifdef __APPLE__ #ifdef __APPLE__
#include "SDL.h" #include "SDL.h"
void NSApplicationLoad(void);
void init_ns_pool(void);
void deinit_ns_pool(void);
#endif #endif
struct global g_extern = { struct global g_extern = {
@ -952,11 +949,6 @@ static void do_state_checks(void)
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
#ifdef __APPLE__ // Very unix-y indeed...
NSApplicationLoad();
init_ns_pool();
#endif
parse_input(argc, argv); parse_input(argc, argv);
parse_config(); parse_config();
init_dlsym(); init_dlsym();
@ -1027,10 +1019,6 @@ int main(int argc, char *argv[])
uninit_drivers(); uninit_drivers();
uninit_dlsym(); uninit_dlsym();
#ifdef __APPLE__
deinit_ns_pool();
#endif
return 0; return 0;
error: error:
@ -1039,9 +1027,6 @@ error:
uninit_drivers(); uninit_drivers();
uninit_dlsym(); uninit_dlsym();
#ifdef __APPLE__
deinit_ns_pool();
#endif
return 1; return 1;
} }