diff options
| author | Andre Weissflog <floooh@gmail.com> | 2018-11-07 11:18:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-07 11:18:03 +0100 |
| commit | 460e425f82afdc7ad6cdefe05c473173b488da56 (patch) | |
| tree | a7e416a094baedc86931a16e17dca55be4360fb1 | |
| parent | 96dd7be2a9ce924d709ac48351a5b0afe474fb37 (diff) | |
| parent | 86ad56e99b2e9f4c9217848f4e427630a3aeb211 (diff) | |
Merge pull request #89 from code-disaster/master
sokol_app: fix use of SOKOL_WIN32_FORCE_MAIN
| -rw-r--r-- | sokol_app.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sokol_app.h b/sokol_app.h index 2e25c6cd..f0cec23e 100644 --- a/sokol_app.h +++ b/sokol_app.h @@ -3808,16 +3808,18 @@ _SOKOL_PRIVATE void _sapp_win32_init_dpi(void) { } #if defined(SOKOL_WIN32_FORCE_MAIN) -int main(int argc, const char** argv) { +int main(int argc, char** argv) { #else int WINAPI WinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _In_ LPSTR lpCmdLine, _In_ int nCmdShow) { -#endif _SOKOL_UNUSED(hInstance); _SOKOL_UNUSED(hPrevInstance); _SOKOL_UNUSED(lpCmdLine); _SOKOL_UNUSED(nCmdShow); - sapp_desc desc = sokol_main(__argc, __argv); - _sapp_init_state(&desc, __argc, __argv); + int argc = __argc; + char** argv = __argv; +#endif + sapp_desc desc = sokol_main(argc, argv); + _sapp_init_state(&desc, argc, argv); _sapp_win32_init_keytable(); _sapp_win32_utf8_to_wide(_sapp.window_title, _sapp.window_title_wide, sizeof(_sapp.window_title_wide)); _sapp_win32_init_dpi(); |