blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-30 18:30:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

NOMINMAX should be defined for the entire project

Browse source
This commit is contained in:
Dan Paulat 2023-11-19 20:56:03 -06:00
parent ff7f70a5b7
commit dd1490a143
7 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scwx-qt/scwx-qt.cmake
View file

@ -462,6 +462,12 @@ target_compile_options(supercell-wx PRIVATE
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wpedantic -Werror> $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wpedantic -Werror>
) )
if (MSVC)
# Don't include Windows macros
target_compile_options(scwx-qt PRIVATE /D "NOMINMAX")
target_compile_options(supercell-wx PRIVATE /D "NOMINMAX")
endif()
# Address Sanitizer options # Address Sanitizer options
if (SCWX_ADDRESS_SANITIZER) if (SCWX_ADDRESS_SANITIZER)
target_compile_options(scwx-qt PRIVATE target_compile_options(scwx-qt PRIVATE

1
scwx-qt/source/scwx/qt/main/main.cpp
View file

@ -1,4 +1,3 @@
#define NOMINMAX
#define _SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING #define _SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING
#include <scwx/qt/config/radar_site.hpp> #include <scwx/qt/config/radar_site.hpp>

2
scwx-qt/source/scwx/qt/main/main_window.cpp
View file

@ -1,5 +1,3 @@
#define NOMINMAX
#include "main_window.hpp" #include "main_window.hpp"
#include "./ui_main_window.h" #include "./ui_main_window.h"

2
scwx-qt/source/scwx/qt/manager/placefile_manager.cpp
View file

@ -1,5 +1,3 @@
#define NOMINMAX
#include <scwx/qt/manager/placefile_manager.hpp> #include <scwx/qt/manager/placefile_manager.hpp>
#include <scwx/qt/manager/font_manager.hpp> #include <scwx/qt/manager/font_manager.hpp>
#include <scwx/qt/manager/resource_manager.hpp> #include <scwx/qt/manager/resource_manager.hpp>

2
scwx-qt/source/scwx/qt/manager/timeline_manager.cpp
View file

@ -1,5 +1,3 @@
#define NOMINMAX
#include <scwx/qt/manager/timeline_manager.hpp> #include <scwx/qt/manager/timeline_manager.hpp>
#include <scwx/qt/manager/radar_product_manager.hpp> #include <scwx/qt/manager/radar_product_manager.hpp>
#include <scwx/qt/settings/general_settings.hpp> #include <scwx/qt/settings/general_settings.hpp>

2
scwx-qt/source/scwx/qt/model/alert_model.cpp
View file

@ -1,5 +1,3 @@
#define NOMINMAX
#include <scwx/qt/model/alert_model.hpp> #include <scwx/qt/model/alert_model.hpp>
#include <scwx/qt/config/county_database.hpp> #include <scwx/qt/config/county_database.hpp>
#include <scwx/qt/manager/text_event_manager.hpp> #include <scwx/qt/manager/text_event_manager.hpp>

5
wxdata/wxdata.cmake
View file

@ -248,6 +248,11 @@ target_compile_options(wxdata PRIVATE
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wpedantic -Werror> $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wpedantic -Werror>
) )
if (MSVC)
# Don't include Windows macros
target_compile_options(wxdata PRIVATE /D "NOMINMAX")
endif()
if (MSVC) if (MSVC)
# Produce PDB file for debug # Produce PDB file for debug
target_compile_options(wxdata PRIVATE "$<$<CONFIG:Release>:/Zi>") target_compile_options(wxdata PRIVATE "$<$<CONFIG:Release>:/Zi>")