diff --git a/common/video/opengl/wgl_context.hpp b/common/video/opengl/wgl_context.hpp index 7ad1ce92..1abe87d7 100644 --- a/common/video/opengl/wgl_context.hpp +++ b/common/video/opengl/wgl_context.hpp @@ -4,8 +4,8 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ -#ifndef __WGL_CONTEXT_HPP -#define __WGL_CONTEXT_HPP +#pragma once +#include #include "opengl_context.hpp" @@ -30,5 +30,3 @@ class WGLContext : public OpenGLContext int version_major; int version_minor; }; - -#endif diff --git a/qt/CMakeLists.txt b/qt/CMakeLists.txt index 00b11440..3072e58e 100644 --- a/qt/CMakeLists.txt +++ b/qt/CMakeLists.txt @@ -155,7 +155,7 @@ else() endif() find_package(SDL3 QUIET) -if (SDL3_FOUND AND (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows")) +if (SDL3_FOUND) message("Using system SDL3.") list(APPEND LIBS SDL3::SDL3) list(APPEND INCLUDES ${SDL3_INCLUDE_DIRS}) @@ -183,9 +183,6 @@ endif() list(APPEND DEFINES SDL_MAIN_HANDLED) -list(APPEND PLATFORM_SOURCES ../external/fmt/src/format.cc) -list(APPEND INCLUDES ../external/fmt/include) - list(APPEND QT_GUI_SOURCES src/main.cpp src/EmuApplication.cpp