mirror of
https://github.com/CTCaer/RetroArch.git
synced 2024-12-04 00:32:46 +00:00
Create HAVE_MAIN define
This commit is contained in:
parent
7e95712015
commit
5d24c75925
@ -756,7 +756,7 @@ endif
|
||||
|
||||
ifeq ($(HAVE_AVFOUNDATION), 1)
|
||||
ifeq ($(HAVE_COCOA), 1)
|
||||
DEFINES += -DHAVE_AVFOUNDATION
|
||||
DEFINES += -DHAVE_AVFOUNDATION
|
||||
LIBS += -framework AVFoundation
|
||||
LIBS += -framework CoreVideo
|
||||
LIBS += -framework CoreMedia
|
||||
@ -777,6 +777,7 @@ ifeq ($(HAVE_COMPRESSION), 1)
|
||||
endif
|
||||
|
||||
ifeq ($(HAVE_COCOA),1)
|
||||
DEFINES += -DHAVE_MAIN
|
||||
OBJ += input/drivers/cocoa_input.o \
|
||||
input/drivers_keyboard/keyboard_event_apple.o \
|
||||
ui/drivers/ui_cocoa.o \
|
||||
|
@ -2,7 +2,7 @@ TARGET = retroarch.js
|
||||
|
||||
OS = Emscripten
|
||||
OBJ :=
|
||||
DEFINES := -DRARCH_INTERNAL -DHAVE_OVERLAY
|
||||
DEFINES := -DRARCH_INTERNAL -DHAVE_OVERLAY -DHAVE_MAIN
|
||||
DEFINES += -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_EGL -DHAVE_OVERLAY -DHAVE_GLSL -DHAVE_FILTERS_BUILTIN
|
||||
|
||||
HAVE_OPENGL = 1
|
||||
|
@ -300,6 +300,7 @@
|
||||
"-DHAVE_ZLIB",
|
||||
"-DHAVE_RPNG",
|
||||
"-DHAVE_COCOA",
|
||||
"-DHAVE_MAIN",
|
||||
"-DWANT_ZLIB",
|
||||
"-DSINC_LOWER_QUALITY",
|
||||
"-DHAVE_NETPLAY",
|
||||
@ -364,6 +365,7 @@
|
||||
"-DHAVE_ZLIB",
|
||||
"-DHAVE_RPNG",
|
||||
"-DHAVE_COCOA",
|
||||
"-DHAVE_MAIN",
|
||||
"-DWANT_ZLIB",
|
||||
"-DSINC_LOWER_QUALITY",
|
||||
"-DHAVE_NETPLAY",
|
||||
|
@ -349,6 +349,7 @@
|
||||
"-DHAVE_ZLIB",
|
||||
"-DHAVE_RPNG",
|
||||
"-DHAVE_COCOA",
|
||||
"-DHAVE_MAIN",
|
||||
"-DSINC_LOWER_QUALITY",
|
||||
"-DHAVE_NETPLAY",
|
||||
"-DHAVE_NETWORKING",
|
||||
@ -405,6 +406,7 @@
|
||||
"-DHAVE_ZLIB",
|
||||
"-DHAVE_RPNG",
|
||||
"-DHAVE_COCOA",
|
||||
"-DHAVE_MAIN",
|
||||
"-DSINC_LOWER_QUALITY",
|
||||
"-DHAVE_NETPLAY",
|
||||
"-DHAVE_NETWORKING",
|
||||
|
@ -521,6 +521,7 @@
|
||||
"-DHAVE_ZLIB",
|
||||
"-DHAVE_RPNG",
|
||||
"-DHAVE_COCOATOUCH",
|
||||
"-DHAVE_MAIN",
|
||||
"-DSINC_LOWER_QUALITY",
|
||||
"-DRARCH_INTERNAL",
|
||||
"-DHAVE_THREADS",
|
||||
@ -585,6 +586,7 @@
|
||||
"-DHAVE_ZLIB",
|
||||
"-DHAVE_RPNG",
|
||||
"-DHAVE_COCOATOUCH",
|
||||
"-DHAVE_MAIN",
|
||||
"-DSINC_LOWER_QUALITY",
|
||||
"-DRARCH_INTERNAL",
|
||||
"-DHAVE_THREADS",
|
||||
@ -623,6 +625,7 @@
|
||||
"-DHAVE_ZLIB",
|
||||
"-DHAVE_RPNG",
|
||||
"-DHAVE_COCOATOUCH",
|
||||
"-DHAVE_MAIN",
|
||||
"-DSINC_LOWER_QUALITY",
|
||||
"-DHAVE_THREADS",
|
||||
"-DHAVE_FILTERS_BUILTIN",
|
||||
@ -693,6 +696,7 @@
|
||||
"-DHAVE_ZLIB",
|
||||
"-DHAVE_RPNG",
|
||||
"-DHAVE_COCOATOUCH",
|
||||
"-DHAVE_MAIN",
|
||||
"-DSINC_LOWER_QUALITY",
|
||||
);
|
||||
"OTHER_LDFLAGS[arch=*]" = "";
|
||||
@ -752,6 +756,7 @@
|
||||
"-DHAVE_ZLIB",
|
||||
"-DHAVE_RPNG",
|
||||
"-DHAVE_COCOATOUCH",
|
||||
"-DHAVE_MAIN",
|
||||
"-DSINC_LOWER_QUALITY",
|
||||
);
|
||||
"OTHER_LDFLAGS[arch=*]" = "";
|
||||
@ -810,6 +815,7 @@
|
||||
"-DHAVE_ZLIB",
|
||||
"-DHAVE_RPNG",
|
||||
"-DHAVE_COCOATOUCH",
|
||||
"-DHAVE_MAIN",
|
||||
"-DSINC_LOWER_QUALITY",
|
||||
"-DRARCH_INTERNAL",
|
||||
"-DHAVE_THREADS",
|
||||
@ -876,6 +882,7 @@
|
||||
"-DHAVE_ZLIB",
|
||||
"-DHAVE_RPNG",
|
||||
"-DHAVE_COCOATOUCH",
|
||||
"-DHAVE_MAIN",
|
||||
"-DSINC_LOWER_QUALITY",
|
||||
"-DRARCH_INTERNAL",
|
||||
"-DHAVE_THREADS",
|
||||
@ -916,6 +923,7 @@
|
||||
"-DHAVE_ZLIB",
|
||||
"-DHAVE_RPNG",
|
||||
"-DHAVE_COCOATOUCH",
|
||||
"-DHAVE_MAIN",
|
||||
"-DSINC_LOWER_QUALITY",
|
||||
"-DHAVE_THREADS",
|
||||
"-DHAVE_FILTERS_BUILTIN",
|
||||
|
@ -282,10 +282,8 @@ error:
|
||||
**/
|
||||
#if defined(ANDROID)
|
||||
void android_app_entry(void *data)
|
||||
#elif defined(__APPLE__) || defined(HAVE_BB10) || defined(EMSCRIPTEN)
|
||||
int rarch_main(int argc, char *argv[])
|
||||
#else
|
||||
int main(int argc, char *argv[])
|
||||
int rarch_main(int argc, char *argv[])
|
||||
#endif
|
||||
{
|
||||
#ifdef ANDROID
|
||||
@ -354,3 +352,10 @@ int main(int argc, char *argv[])
|
||||
|
||||
returnfunc();
|
||||
}
|
||||
|
||||
#ifndef HAVE_MAIN
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
return rarch_main(argc, argv);
|
||||
}
|
||||
#endif
|
||||
|
@ -61,10 +61,8 @@ void main_exit_save_config(void);
|
||||
**/
|
||||
#if defined(ANDROID)
|
||||
void android_app_entry(void *data);
|
||||
#elif defined(__APPLE__) || defined(HAVE_BB10) || defined(EMSCRIPTEN)
|
||||
int rarch_main(int argc, char *argv[]);
|
||||
#else
|
||||
int main(int argc, char *argv[]);
|
||||
int rarch_main(int argc, char *argv[]);
|
||||
#endif
|
||||
|
||||
/**
|
||||
|
@ -32,6 +32,7 @@
|
||||
<listOptionValue builtIn="false" value="HAVE_DYLIB"/>
|
||||
<listOptionValue builtIn="false" value="HAVE_ALSA"/>
|
||||
<listOptionValue builtIn="false" value="RARCH_INTERNAL"/>
|
||||
<listOptionValue builtIn="false" value="HAVE_MAIN"/>
|
||||
<listOptionValue builtIn="false" value="HAVE_RGUI"/>
|
||||
<listOptionValue builtIn="false" value="HAVE_MENU"/>
|
||||
<listOptionValue builtIn="false" value="RARCH_MOBILE"/>
|
||||
@ -149,6 +150,7 @@
|
||||
<listOptionValue builtIn="false" value="HAVE_DYLIB"/>
|
||||
<listOptionValue builtIn="false" value="HAVE_ALSA"/>
|
||||
<listOptionValue builtIn="false" value="RARCH_INTERNAL"/>
|
||||
<listOptionValue builtIn="false" value="HAVE_MAIN"/>
|
||||
<listOptionValue builtIn="false" value="HAVE_RGUI"/>
|
||||
<listOptionValue builtIn="false" value="HAVE_MENU"/>
|
||||
<listOptionValue builtIn="false" value="RARCH_MOBILE"/>
|
||||
@ -268,6 +270,7 @@
|
||||
<listOptionValue builtIn="false" value="HAVE_DYLIB"/>
|
||||
<listOptionValue builtIn="false" value="HAVE_ALSA"/>
|
||||
<listOptionValue builtIn="false" value="RARCH_INTERNAL"/>
|
||||
<listOptionValue builtIn="false" value="HAVE_MAIN"/>
|
||||
<listOptionValue builtIn="false" value="HAVE_RGUI"/>
|
||||
<listOptionValue builtIn="false" value="HAVE_MENU"/>
|
||||
<listOptionValue builtIn="false" value="RARCH_MOBILE"/>
|
||||
@ -388,6 +391,7 @@
|
||||
<listOptionValue builtIn="false" value="HAVE_DYLIB"/>
|
||||
<listOptionValue builtIn="false" value="HAVE_ALSA"/>
|
||||
<listOptionValue builtIn="false" value="RARCH_INTERNAL"/>
|
||||
<listOptionValue builtIn="false" value="HAVE_MAIN"/>
|
||||
<listOptionValue builtIn="false" value="HAVE_RGUI"/>
|
||||
<listOptionValue builtIn="false" value="HAVE_MENU"/>
|
||||
<listOptionValue builtIn="false" value="RARCH_MOBILE"/>
|
||||
@ -506,6 +510,7 @@
|
||||
<listOptionValue builtIn="false" value="HAVE_DYLIB"/>
|
||||
<listOptionValue builtIn="false" value="HAVE_ALSA"/>
|
||||
<listOptionValue builtIn="false" value="RARCH_INTERNAL"/>
|
||||
<listOptionValue builtIn="false" value="HAVE_MAIN"/>
|
||||
<listOptionValue builtIn="false" value="HAVE_RGUI"/>
|
||||
<listOptionValue builtIn="false" value="HAVE_MENU"/>
|
||||
<listOptionValue builtIn="false" value="RARCH_MOBILE"/>
|
||||
@ -624,6 +629,7 @@
|
||||
<listOptionValue builtIn="false" value="HAVE_DYLIB"/>
|
||||
<listOptionValue builtIn="false" value="HAVE_ALSA"/>
|
||||
<listOptionValue builtIn="false" value="RARCH_INTERNAL"/>
|
||||
<listOptionValue builtIn="false" value="HAVE_MAIN"/>
|
||||
<listOptionValue builtIn="false" value="HAVE_RGUI"/>
|
||||
<listOptionValue builtIn="false" value="HAVE_MENU"/>
|
||||
<listOptionValue builtIn="false" value="RARCH_MOBILE"/>
|
||||
@ -743,6 +749,7 @@
|
||||
<listOptionValue builtIn="false" value="HAVE_DYLIB"/>
|
||||
<listOptionValue builtIn="false" value="HAVE_ALSA"/>
|
||||
<listOptionValue builtIn="false" value="RARCH_INTERNAL"/>
|
||||
<listOptionValue builtIn="false" value="HAVE_MAIN"/>
|
||||
<listOptionValue builtIn="false" value="HAVE_RGUI"/>
|
||||
<listOptionValue builtIn="false" value="HAVE_MENU"/>
|
||||
<listOptionValue builtIn="false" value="RARCH_MOBILE"/>
|
||||
|
Loading…
Reference in New Issue
Block a user