Skip to content

Commit

Permalink
Fix compile error without GL_MULTISAMPLE_ARB
Browse files Browse the repository at this point in the history
  • Loading branch information
jhasse committed Oct 3, 2024
1 parent 964ca2a commit 3921e0b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,7 @@ void setAntiAliasing(bool enabled) {
}
antiAliasingEnabled = enabled;
#else
debug("WARNING: anti aliasing not available!\n");
internal::warn("Anti-Aliasing not available!");
#endif
}

Expand Down
10 changes: 5 additions & 5 deletions src/sdl/controller/SdlController.cpp
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// Copyright 2017-2022 Jan Niklas Hasse <jhasse@bixense.com>
// Copyright 2017-2024 Jan Niklas Hasse <jhasse@bixense.com>
// For conditions of distribution and use, see copyright notice in LICENSE.txt

#include "SdlController.hpp"

#include "../../jngl/debug.hpp"
#include "../../log.hpp"
#include "../../window.hpp"

#include <cmath>
Expand All @@ -14,10 +14,10 @@ SdlController::SdlController(SDL_Joystick* const handle, const int index)
: handle(handle), haptic(SDL_HapticOpenFromJoystick(handle)) {
if (haptic) {
if (SDL_HapticRumbleInit(haptic) < 0) {
debugLn(SDL_GetError());
internal::error(SDL_GetError());
}
} else {
debugLn(SDL_GetError());
internal::error(SDL_GetError());
}
switch (SDL_JoystickNumButtons(handle)) {
case 11:
Expand All @@ -36,7 +36,7 @@ SdlController::SdlController(SDL_Joystick* const handle, const int index)
this->handle = nullptr;
SDL_JoystickClose(handle);
} else {
debugLn("WARNING: SDL_GameControllerOpen failed, falling back to joystick.");
internal::warn("SDL_GameControllerOpen failed, falling back to joystick.");
}
}
}
Expand Down

0 comments on commit 3921e0b

Please sign in to comment.