lauchmelder/SDLU
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fixed Macros, Fixed Post-Build action

Browse source
This commit is contained in:
Robert 2020-05-19 01:33:42 +02:00
parent ef0a3e4c9a
commit 25eaa06826
3 changed files with 12 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
SDLU/Util.hpp
View file

@ -9,12 +9,8 @@
#define IS_NULLPTR( x ) (x == nullptr)
// TODO: Find fix for this, the original doesnt compile under gcc
#define RETURN_IF_NULLPTR( x ) { if(IS_NULLPTR(x)) return; }
#define RETURN_IF_NOT_NULLPTR( x ) { if(!IS_NULLPTR(x)) return; }
#define RETURN_IF_NULLPTR_ARG( x, v ) { if(IS_NULLPTR(x)) return v; }
#define RETURN_IF_NOT_NULLPTR_ARG( x, v ) { if(!IS_NULLPTR(x)) return v; }
#define RETURN_IF_NULLPTR( x, ... ) { if(IS_NULLPTR(x)) return __VA_ARGS__; }
#define RETURN_IF_NOT_NULLPTR( x, ... ) { if(!IS_NULLPTR(x)) return __VA_ARGS__; }
typedef uint8_t Uint8;
typedef int8_t Int8;

12
SDLU/graphics/RenderWindow.cpp
View file

@ -63,13 +63,13 @@ namespace sdlu
bool RenderWindow::IsOpen()
{
RETURN_IF_NULLPTR_ARG(m_pWindow, false);
RETURN_IF_NULLPTR(m_pWindow, false);
return (!SDL_GetWindowID(m_pWindow) ? false : true);
}
bool RenderWindow::PollEvent(SDL_Event* event)
{
RETURN_IF_NULLPTR_ARG(m_pWindow, false);
RETURN_IF_NULLPTR(m_pWindow, false);
// Handle events before the user in case a derived
// class decides to block the event.
while (SDL_PollEvent(event))
@ -93,7 +93,7 @@ namespace sdlu
Vector2i RenderWindow::GetPosition()
{
RETURN_IF_NULLPTR_ARG(m_pWindow, Vector2i());
RETURN_IF_NULLPTR(m_pWindow, Vector2i());
int x = 0, y = 0;
SDL_GetWindowPosition(m_pWindow, &x, &y);
@ -116,7 +116,7 @@ namespace sdlu
Vector2u RenderWindow::GetSize()
{
RETURN_IF_NULLPTR_ARG(m_pWindow, Vector2u());
RETURN_IF_NULLPTR(m_pWindow, Vector2u());
int x = 0, y = 0;
SDL_GetWindowSize(m_pWindow, &x, &y);
@ -139,7 +139,7 @@ namespace sdlu
std::string RenderWindow::GetTitle()
{
RETURN_IF_NULLPTR_ARG(m_pWindow, "");
RETURN_IF_NULLPTR(m_pWindow, "");
return SDL_GetWindowTitle(m_pWindow);
}
@ -182,7 +182,7 @@ namespace sdlu
if (diff < 1000 / m_oFramerate)
{
SDL_Delay(1000 / m_oFramerate - diff);
SDL_Delay(static_cast<Uint32>(1000 / m_oFramerate - diff));
}
}

15
SDLU_Example/CMakeLists.txt
View file

@ -15,14 +15,7 @@ target_link_libraries(${PNAME}
SDL2main
)
if(WIN32)
add_custom_command(TARGET ${PNAME}
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE_DIR:SDL2>/SDL2d.dll $<TARGET_FILE_DIR:sdlu_example>
)
else()
add_custom_command(TARGET ${PNAME}
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE_DIR:SDL2>/libSDL2-2.0.so $<TARGET_FILE_DIR:sdlu_example>
)
endif()
add_custom_command(TARGET ${PNAME}
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:SDL2> $<TARGET_FILE_DIR:sdlu_example>
)