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

Fix C++ build linkage

This commit is contained in:
Higor Eurípedes 2014-09-15 13:14:05 -03:00
parent 7767b0283c
commit 83b6aeb6cc
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
frontend/frontend.c
View File

@ -18,8 +18,6 @@
#include "frontend.h" #include "frontend.h"
#include "../general.h" #include "../general.h"
#include "frontend_context.h"
#if defined(HAVE_MENU) #if defined(HAVE_MENU)
#include "menu/menu_input_line_cb.h" #include "menu/menu_input_line_cb.h"
#include "menu/menu_common.h" #include "menu/menu_common.h"
@ -31,7 +29,6 @@
#if defined(ANDROID) #if defined(ANDROID)
#define main_entry android_app_entry
#define returntype void #define returntype void
#define returnfunc() exit(0) #define returnfunc() exit(0)
#define return_negative() return #define return_negative() return
@ -41,12 +38,6 @@
#define args_initial_ptr() data #define args_initial_ptr() data
#else #else
#if defined(__APPLE__) || defined(HAVE_BB10) || defined(EMSCRIPTEN)
#define main_entry rarch_main
#else
#define main_entry main
#endif
#define returntype int #define returntype int
#define returnfunc() return 0 #define returnfunc() return 0
#define return_negative() return 1 #define return_negative() return 1

6
frontend/frontend_context.h
View File

@ -26,11 +26,17 @@
#if defined(ANDROID) #if defined(ANDROID)
#include "platform/platform_android.h" #include "platform/platform_android.h"
#define main_entry android_app_entry
#define args_type() struct android_app* #define args_type() struct android_app*
#define signature() void* data #define signature() void* data
#define signature_expand() data #define signature_expand() data
#define returntype void #define returntype void
#else #else
#if defined(__APPLE__) || defined(HAVE_BB10) || defined(EMSCRIPTEN)
#define main_entry rarch_main
#else
#define main_entry main
#endif
#define args_type() void* #define args_type() void*
#define signature() int argc, char *argv[] #define signature() int argc, char *argv[]
#define signature_expand() argc, argv #define signature_expand() argc, argv

3
tools/retrolaunch/main.c
View File

@ -281,6 +281,9 @@ int detect_file(const char *path, char *game_name, size_t max_len,
} }
#ifndef RARCH_CONSOLE #ifndef RARCH_CONSOLE
#ifndef __APPLE__
#undef main
#endif
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
struct RunInfo info; struct RunInfo info;