merging herglitch/main
This commit is contained in:
parent
61b7e89d63
commit
b0a3ba8407
8 changed files with 36 additions and 44 deletions
|
|
@ -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
|
||||
|
|
@ -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
|
||||
Loading…
Add table
Add a link
Reference in a new issue