merging herglitch/main
This commit is contained in:
parent
61b7e89d63
commit
b0a3ba8407
8 changed files with 36 additions and 44 deletions
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef ARC_SDL_RENDERER_H_
|
||||
#define ARC_SDL_RENDERER_H_
|
||||
|
||||
#ifdef ARC_SDL
|
||||
#ifdef ARC_SDL2_GRAPHICS
|
||||
#include "arc/graphics/renderer.h"
|
||||
#include "arc/graphics/window.h"
|
||||
#include <SDL.h>
|
||||
|
|
@ -20,6 +20,6 @@ struct ARC_RenderInfo {
|
|||
Uint32 flags;
|
||||
};
|
||||
|
||||
#endif // !ARC_SDL
|
||||
#endif // !ARC_SDL2_GRAPHICS
|
||||
|
||||
#endif // !ARC_SDL_RENDERER_H_
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef ARC_SDL_SPRITE_H_
|
||||
#define ARC_SDL_SPRITE_H_
|
||||
|
||||
#ifdef ARC_SDL
|
||||
#ifdef ARC_SDL2_GRAPHICS
|
||||
#include "arc/graphics/sprite.h"
|
||||
#include <SDL.h>
|
||||
|
||||
|
|
@ -13,6 +13,6 @@ struct ARC_Sprite {
|
|||
uint8_t opacity;
|
||||
};
|
||||
|
||||
#endif // !ARC_SDL
|
||||
#endif // !ARC_SDL2_GRAPHICS
|
||||
|
||||
#endif // !ARC_SDL_SPRITE_H_
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef ARC_SDL_KEYBOARD_H_
|
||||
#define ARC_SDL_KEYBOARD_H_
|
||||
|
||||
#ifdef ARC_SDL
|
||||
#ifdef ARC_SDL2_INPUT
|
||||
#include "arc/input/keyboard.h"
|
||||
#include <SDL.h>
|
||||
|
||||
|
|
@ -16,6 +16,6 @@ struct ARC_KeyboardInfo {
|
|||
SDL_Event *event;
|
||||
};
|
||||
|
||||
#endif // ARC_SDL
|
||||
#endif // ARC_SDL2_INPUT
|
||||
|
||||
#endif // !ARC_SDL_KEYBOARD_H_
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef ARC_SDL_MOUSE_H_
|
||||
#define ARC_SDL_MOUSE_H_
|
||||
|
||||
#ifdef ARC_SDL
|
||||
#ifdef ARC_SDL2_INPUT
|
||||
#include <SDL.h>
|
||||
#include "arc/input/mouse.h"
|
||||
#include "arc/math/point.h"
|
||||
|
|
@ -19,6 +19,6 @@ struct ARC_MouseInfo {
|
|||
SDL_Event *event;
|
||||
};
|
||||
|
||||
#endif // ARC_SDL
|
||||
#endif // ARC_SDL2_INPUT
|
||||
|
||||
#endif // !ARC_SDL_MOUSE_H_
|
||||
Loading…
Add table
Add a link
Reference in a new issue