From: Wonsik, Jung Date: Mon, 6 Jun 2016 03:24:48 +0000 (+0900) Subject: [SDL] apply new symbol for dynamic APIs X-Git-Tag: submit/tizen/20160810.100257~10 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Fsample;p=platform%2Fupstream%2FSDL.git [SDL] apply new symbol for dynamic APIs For SDL_main, apply new symbol for dynamic APIs Change-Id: Idfab815d8868f00cf0fae5fa7607dfbf16a25e26 --- diff --git a/include/SDL_main.h b/include/SDL_main.h index 5036af5..91c5b7f 100644 --- a/include/SDL_main.h +++ b/include/SDL_main.h @@ -156,6 +156,12 @@ extern DECLSPEC int SDLCALL SDL_WinRTRunApp(int (*mainFunction)(int, char **), v #endif /* __WINRT__ */ +#ifdef __TIZEN__ + +extern DECLSPEC int SDLCALL SDL_tizen_app_init(int argc, char *argv[]); + +#endif /* __TIZEN__ */ + #ifdef __cplusplus } diff --git a/src/core/tizen/SDL_tizen.h b/src/core/tizen/SDL_tizen.h index 674749a..908b310 100644 --- a/src/core/tizen/SDL_tizen.h +++ b/src/core/tizen/SDL_tizen.h @@ -26,7 +26,6 @@ #define _SDL_tizen_h #if __TIZEN__ -int SDL_tizen_app_init(int argc, char *argv[]); void SDL_tizen_app_exit(void); #endif diff --git a/src/dynapi/SDL_dynapi_overrides.h b/src/dynapi/SDL_dynapi_overrides.h index c9ebfff..9fadf11 100644 --- a/src/dynapi/SDL_dynapi_overrides.h +++ b/src/dynapi/SDL_dynapi_overrides.h @@ -597,3 +597,4 @@ #define SDL_JoystickCurrentPowerLevel SDL_JoystickCurrentPowerLevel_REAL #define SDL_GameControllerFromInstanceID SDL_GameControllerFromInstanceID_REAL #define SDL_JoystickFromInstanceID SDL_JoystickFromInstanceID_REAL +#define SDL_tizen_app_init SDL_tizen_app_init_REAL diff --git a/src/dynapi/SDL_dynapi_procs.h b/src/dynapi/SDL_dynapi_procs.h index 3f11a25..1efd814 100644 --- a/src/dynapi/SDL_dynapi_procs.h +++ b/src/dynapi/SDL_dynapi_procs.h @@ -631,3 +631,6 @@ SDL_DYNAPI_PROC(int,SDL_GetDisplayDPI,(int a, float *b, float *c, float *d),(a,b SDL_DYNAPI_PROC(SDL_JoystickPowerLevel,SDL_JoystickCurrentPowerLevel,(SDL_Joystick *a),(a),return) SDL_DYNAPI_PROC(SDL_GameController*,SDL_GameControllerFromInstanceID,(SDL_JoystickID a),(a),return) SDL_DYNAPI_PROC(SDL_Joystick*,SDL_JoystickFromInstanceID,(SDL_JoystickID a),(a),return) +#ifdef __TIZEN__ +SDL_DYNAPI_PROC(int,SDL_tizen_app_init,(int a, char *b[]),(a,b),return) +#endif diff --git a/src/main/tizen/SDL_tizen_main.c b/src/main/tizen/SDL_tizen_main.c index 32b514d..8c8157b 100644 --- a/src/main/tizen/SDL_tizen_main.c +++ b/src/main/tizen/SDL_tizen_main.c @@ -4,15 +4,16 @@ #include "SDL_config.h" #ifdef __TIZEN__ - -#include "SDL_main.h" #include #include -#include "../../core/tizen/SDL_tizen.h" +#include "SDL.h" +#include "SDL_main.h" +//#include "../../core/tizen/SDL_tizen.h" #ifdef main #undef main #endif + int main(int argc, char *argv[]) { printf("Start MAIN!!!!!!\n");