diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/compile_flags.txt | 2 | ||||
| -rw-r--r-- | src/input/rodeo_input.c | 2 | ||||
| -rw-r--r-- | src/rodeo.c | 35 | ||||
| -rw-r--r-- | src/rodeo_internal_types.h | 4 | ||||
| -rw-r--r-- | src/rodeo_math.c | 2 |
5 files changed, 28 insertions, 17 deletions
diff --git a/src/compile_flags.txt b/src/compile_flags.txt index df3f821..09b2ca8 100644 --- a/src/compile_flags.txt +++ b/src/compile_flags.txt @@ -1,11 +1,13 @@ -I./ -I../include -I../external/SDL/include +-I../external/SDL_image -I../external/SDL_mixer/include -I../external/bgfx/include -I../external/bx/include -I../external/cglm/include -I../external/STC/include +-DSDL_VIDEO_DRIVER_X11=ON -Wall -Wextra -Wpedantic diff --git a/src/input/rodeo_input.c b/src/input/rodeo_input.c index 3d46546..158fa79 100644 --- a/src/input/rodeo_input.c +++ b/src/input/rodeo_input.c @@ -6,7 +6,7 @@ #include "rodeo/log.h" // -- external -- -#include "SDL2/SDL.h" +#include "SDL.h" static irodeo_input_state_t istate = {0}; diff --git a/src/rodeo.c b/src/rodeo.c index c6ee71b..1ab12c0 100644 --- a/src/rodeo.c +++ b/src/rodeo.c @@ -12,10 +12,11 @@ #if __EMSCRIPTEN__ #include <emscripten/emscripten.h> #endif -#include "SDL2/SDL.h" -#include "SDL2/SDL_image.h" -#include "SDL2/SDL_mixer.h" -#include "SDL2/SDL_syswm.h" +#include "SDL.h" +#include "SDL_image.h" +#include "SDL_mixer.h" +#include "SDL_syswm.h" +#include "SDL.h" #include "bgfx/c99/bgfx.h" /*#define CGLM_FORCE_LEFT_HANDED*/ #define CGLM_FORCE_DEPTH_ZERO_TO_ONE @@ -25,6 +26,7 @@ // -- system -- #include <time.h> +#include <inttypes.h> static irodeo_state_t state = {0}; @@ -46,19 +48,26 @@ rodeo_window_init( "Initializing SDL..." ); - if(SDL_Init(SDL_INIT_VIDEO | SDL_INIT_GAMECONTROLLER | SDL_INIT_AUDIO) < 0) { + uint32_t init_flags_sdl = 0; + init_flags_sdl = init_flags_sdl | SDL_INIT_VIDEO; + init_flags_sdl = init_flags_sdl | SDL_INIT_AUDIO; + init_flags_sdl = init_flags_sdl | SDL_INIT_GAMECONTROLLER; + + if(SDL_Init(init_flags_sdl) < 0) + { + rodeo_log( + rodeo_logLevel_error, + "Failed to initialize SDL. SDL_Error: %s", + SDL_GetError() + ); + exit(EXIT_FAILURE); + } rodeo_log( - rodeo_logLevel_error, - "Failed to initialize SDL. SDL_Error: %s", - SDL_GetError() + rodeo_logLevel_info, + "Success initializing SDL" ); - exit(EXIT_FAILURE); } - rodeo_log( - rodeo_logLevel_info, - "Success initializing SDL" - ); rodeo_log( rodeo_logLevel_info, diff --git a/src/rodeo_internal_types.h b/src/rodeo_internal_types.h index 149db6b..531d450 100644 --- a/src/rodeo_internal_types.h +++ b/src/rodeo_internal_types.h @@ -9,8 +9,8 @@ #if __EMSCRIPTEN__ #include <emscripten/emscripten.h> #endif -#include "SDL2/SDL.h" -#include "SDL2/SDL_syswm.h" +#include "SDL.h" +#include "SDL_syswm.h" #include "bgfx/c99/bgfx.h" #include "stc/crandom.h" diff --git a/src/rodeo_math.c b/src/rodeo_math.c index a6f5042..06b6240 100644 --- a/src/rodeo_math.c +++ b/src/rodeo_math.c @@ -10,7 +10,7 @@ #include <math.h> // -- external -- -#include "SDL2/SDL.h" +#include "SDL.h" #include "stc/crandom.h" #define CGLM_FORCE_DEPTH_ZERO_TO_ONE #include "cglm/cglm.h" |