Rev 1 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 1 | Rev 8 | ||
|---|---|---|---|
| Line 1... | Line 1... | ||
| 1 | /* | 1 | /* | 
| 2 |   Simple DirectMedia Layer | 2 |   Simple DirectMedia Layer | 
| 3 |   Copyright (C) 1997- | 3 |   Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org> | 
| 4 | 4 | ||
| 5 |   This software is provided 'as-is', without any express or implied | 5 |   This software is provided 'as-is', without any express or implied | 
| 6 |   warranty.  In no event will the authors be held liable for any damages | 6 |   warranty.  In no event will the authors be held liable for any damages | 
| 7 |   arising from the use of this software. | 7 |   arising from the use of this software. | 
| 8 | 8 | ||
| Line 61... | Line 61... | ||
| 61 | 61 | ||
| 62 | #elif defined(__ANDROID__) | 62 | #elif defined(__ANDROID__) | 
| 63 | /* On Android SDL provides a Java class in SDLActivity.java that is the | 63 | /* On Android SDL provides a Java class in SDLActivity.java that is the | 
| 64 |    main activity entry point. | 64 |    main activity entry point. | 
| 65 | 65 | ||
| 66 |    See README-android.md for more details on extending that class. | 66 |    See docs/README-android.md for more details on extending that class. | 
| 67 |  */ | 67 |  */ | 
| 68 | #define SDL_MAIN_NEEDED | 68 | #define SDL_MAIN_NEEDED | 
| - | 69 | ||
| - | 70 | /* We need to export SDL_main so it can be launched from Java */ | |
| - | 71 | #define SDLMAIN_DECLSPEC    DECLSPEC | |
| 69 | 72 | ||
| 70 | #elif defined(__NACL__) | 73 | #elif defined(__NACL__) | 
| 71 | /* On NACL we use ppapi_simple to set up the application helper code, | 74 | /* On NACL we use ppapi_simple to set up the application helper code, | 
| 72 |    then wait for the first PSE_INSTANCE_DIDCHANGEVIEW event before | 75 |    then wait for the first PSE_INSTANCE_DIDCHANGEVIEW event before | 
| 73 |    starting the user main function. | 76 |    starting the user main function. | 
| Line 82... | Line 85... | ||
| 82 | #ifdef __cplusplus | 85 | #ifdef __cplusplus | 
| 83 | #define C_LINKAGE   "C" | 86 | #define C_LINKAGE   "C" | 
| 84 | #else | 87 | #else | 
| 85 | #define C_LINKAGE | 88 | #define C_LINKAGE | 
| 86 | #endif /* __cplusplus */ | 89 | #endif /* __cplusplus */ | 
| - | 90 | ||
| - | 91 | #ifndef SDLMAIN_DECLSPEC | |
| - | 92 | #define SDLMAIN_DECLSPEC | |
| - | 93 | #endif | |
| 87 | 94 | ||
| 88 | /** | 95 | /** | 
| 89 |  *  \file SDL_main.h | 96 |  *  \file SDL_main.h | 
| 90 |  * | 97 |  * | 
| 91 |  *  The application's main() function must be called with C linkage, | 98 |  *  The application's main() function must be called with C linkage, | 
| Line 105... | Line 112... | ||
| 105 | #endif | 112 | #endif | 
| 106 | 113 | ||
| 107 | /** | 114 | /** | 
| 108 |  *  The prototype for the application's main() function | 115 |  *  The prototype for the application's main() function | 
| 109 |  */ | 116 |  */ | 
| 110 | extern C_LINKAGE | 117 | extern C_LINKAGE SDLMAIN_DECLSPEC int SDL_main(int argc, char *argv[]); | 
| 111 | 118 | ||
| 112 | 119 | ||
| 113 | #include "begin_code.h" | 120 | #include "begin_code.h" | 
| 114 | #ifdef __cplusplus | 121 | #ifdef __cplusplus | 
| 115 | extern "C" { | 122 | extern "C" { |