From 7f5666c5852e6936fb239c75b0f6f4d6f251bba3 Mon Sep 17 00:00:00 2001 From: Justin Scofield <47263509+scawful@users.noreply.github.com> Date: Sat, 30 Jul 2022 13:04:27 -0400 Subject: [PATCH] Remove hard SDL_main references for CMake solution --- src/CMakeLists.txt | 1 + src/app/core/controller.h | 1 - src/yaze.h | 2 -- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c1a01ea0..1b1f2b72 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -72,6 +72,7 @@ target_link_libraries( yaze SDL2::SDL2main ) +add_definitions(-DSDL_MAIN_HANDLED) endif() target_link_libraries( diff --git a/src/app/core/controller.h b/src/app/core/controller.h index a3823e11..7c66b04f 100644 --- a/src/app/core/controller.h +++ b/src/app/core/controller.h @@ -1,6 +1,5 @@ #ifndef YAZE_APP_CORE_CONTROLLER_H #define YAZE_APP_CORE_CONTROLLER_H -#define SDL_MAIN_HANDLED #include #include diff --git a/src/yaze.h b/src/yaze.h index 7ce31203..cb0c5166 100644 --- a/src/yaze.h +++ b/src/yaze.h @@ -1,8 +1,6 @@ #ifndef YAZE_H #define YAZE_H -#define main SDL_main - #include "absl/debugging/failure_signal_handler.h" #include "absl/debugging/symbolize.h" #include "app/core/controller.h"