herbglitch/archeus
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merging herglitch/main

Browse source
This commit is contained in:
herbglitch 2024-02-08 16:53:31 -07:00
parent 61b7e89d63
commit b0a3ba8407
8 changed files with 36 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/engine/engine.c
View file

@ -14,14 +14,11 @@
#include "arc/input/none/mouse.h"
#include "arc/input/none/keyboard.h"
#ifdef ARC_SDL
#include "arc/graphics/sdl/window.h"
#include "arc/graphics/sdl/renderer.h"
#include "arc/input/sdl/mouse.h"
#include "arc/input/sdl/keyboard.h"
#include <SDL.h>
#include <SDL2/SDL_ttf.h>
#include <SDL2/SDL_mixer.h>
#ifdef ARC_SDL
#elif ARC_OPENGL
#include "arc/graphics/opengl/window.h"
#include "arc/graphics/opengl/renderer.h"

5
src/input/sdl/keyboard.c
View file

@ -1,5 +1,4 @@
#include "SDL_keycode.h"
#ifdef ARC_SDL
#ifdef ARC_SDL2_INPUT
#include "arc/input/sdl/keyboard.h"
#include "arc/input/keyboard.h"
#include "arc/math/point.h"
@ -99,4 +98,4 @@ ARC_KeyboardState ARC_Keyboard_GetState(ARC_Keyboard *keyboard, enum ARC_Keyboar
}
#endif // ARC_SDL
#endif // ARC_SDL2_INPUT

4
src/input/sdl/mouse.c
View file

@ -1,4 +1,4 @@
#ifdef ARC_SDL
#ifdef ARC_SDL2_INPUT
#include "arc/input/sdl/mouse.h"
#include "arc/input/mouse.h"
#include "arc/math/point.h"
@ -105,4 +105,4 @@ int32_t *ARC_Mouse_GetScrollY(ARC_Mouse *mouse){
return mouse->scrollY;
}
#endif // ARC_SDL
#endif // ARC_SDL2_INPUT