Ignore:
Timestamp:
Jan 25, 2013, 2:38:46 PM (8 years ago)
Author:
sam
Message:

build: revert the weak symbol work; it confuses Visual Studio too much.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/platform/sdl/sdlapp.cpp

    r2274 r2276  
    1212#   include "config.h"
    1313#endif
    14 
    15 /* This instructs our headers to let SDL override the "main"
    16  * symbol using its macros. */
    17 #define LOL_DONT_DIVERT_MAIN 1
    1814
    1915#if defined USE_SDL
     
    4036HWND g_hwnd = NULL;
    4137extern IDirect3DDevice9 *g_d3ddevice;
    42 #endif
    43 
    44 #if defined main
    45 #   if defined _MSC_VER
    46 int lol_sdl_main();
    47 int lol_sdl_main(int argc, char **argv);
    48 int lol_sdl_main(int argc, char **argv, char **envp);
    49 #       define WRAPPER lol_sdl_main_msvc
    50 #   else
    51 int lol_sdl_main() __attribute__((weak));
    52 int lol_sdl_main(int argc, char **argv) __attribute__((weak));
    53 int lol_sdl_main(int argc, char **argv, char **envp) __attribute__((weak));
    54 #       define WRAPPER lol_sdl_main
    55 #   endif
    56 
    57 /* One of these wrappers will be overridden by the user's version */
    58 
    59 int WRAPPER() { return 0; }
    60 int WRAPPER(int argc, char **argv) { return 0; }
    61 int WRAPPER(int argc, char **argv, char **envp) { return 0; }
    62 
    63 int main(int argc, char *argv[])
    64 {
    65     int ret = 0;
    66     ret += lol_sdl_main();
    67     ret += lol_sdl_main(argc, argv);
    68     ret += lol_sdl_main(argc, argv, NULL);
    69     return ret;
    70 }
    7138#endif
    7239
Note: See TracChangeset for help on using the changeset viewer.