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

Guard pragma warning statements with ifdef msvc

Browse source
This commit is contained in:
Dan Paulat 2023-04-16 01:02:56 -05:00
parent ec45e0bce0
commit 509fc76653
12 changed files with 100 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

10
scwx-qt/source/scwx/qt/gl/draw/draw_item.cpp
View file

@ -2,12 +2,18 @@
#include <string>
#pragma warning(push, 0)
#if defined(_MSC_VER)
# pragma warning(push, 0)
#endif
#include <glm/glm.hpp>
#include <glm/gtc/matrix_transform.hpp>
#include <glm/gtc/type_ptr.hpp>
#include <mbgl/util/constants.hpp>
#pragma warning(pop)
#if defined(_MSC_VER)
# pragma warning(pop)
#endif
namespace scwx
{

10
scwx-qt/source/scwx/qt/gl/text_shader.cpp
View file

@ -2,9 +2,15 @@
#include <scwx/qt/gl/shader_program.hpp>
#include <scwx/util/logger.hpp>
#pragma warning(push, 0)
#if defined(_MSC_VER)
# pragma warning(push, 0)
#endif
#include <glm/gtc/type_ptr.hpp>
#pragma warning(pop)
#if defined(_MSC_VER)
# pragma warning(pop)
#endif
namespace scwx
{

10
scwx-qt/source/scwx/qt/map/color_table_layer.cpp
View file

@ -2,10 +2,16 @@
#include <scwx/qt/gl/shader_program.hpp>
#include <scwx/util/logger.hpp>
#pragma warning(push, 0)
#if defined(_MSC_VER)
# pragma warning(push, 0)
#endif
#include <glm/glm.hpp>
#include <glm/gtc/type_ptr.hpp>
#pragma warning(pop)
#if defined(_MSC_VER)
# pragma warning(pop)
#endif
namespace scwx
{

10
scwx-qt/source/scwx/qt/map/overlay_layer.cpp
View file

@ -8,7 +8,10 @@
#include <chrono>
#include <execution>
#pragma warning(push, 0)
#if defined(_MSC_VER)
# pragma warning(push, 0)
#endif
#include <boost/date_time.hpp>
#include <boost/date_time/local_time/local_time.hpp>
#include <boost/timer/timer.hpp>
@ -18,7 +21,10 @@
#include <glm/gtc/type_ptr.hpp>
#include <imgui.h>
#include <mbgl/util/constants.hpp>
#pragma warning(pop)
#if defined(_MSC_VER)
# pragma warning(pop)
#endif
namespace scwx
{

10
scwx-qt/source/scwx/qt/map/radar_product_layer.cpp
View file

@ -4,13 +4,19 @@
#include <execution>
#pragma warning(push, 0)
#if defined(_MSC_VER)
# pragma warning(push, 0)
#endif
#include <boost/timer/timer.hpp>
#include <glm/glm.hpp>
#include <glm/gtc/matrix_transform.hpp>
#include <glm/gtc/type_ptr.hpp>
#include <mbgl/util/constants.hpp>
#pragma warning(pop)
#if defined(_MSC_VER)
# pragma warning(pop)
#endif
namespace scwx
{

10
scwx-qt/source/scwx/qt/util/font.cpp
View file

@ -22,7 +22,10 @@
#include FT_SFNT_NAMES_H
#include FT_TRUETYPE_IDS_H
#pragma warning(push, 0)
#if defined(_MSC_VER)
# pragma warning(push, 0)
#endif
// #include <freetype-gl.h> (exclude opengl.h)
#include <platform.h>
#include <vec234.h>
@ -30,7 +33,10 @@
#include <texture-atlas.h>
#include <texture-font.h>
#include <ftgl-utils.h>
#pragma warning(pop)
#if defined(_MSC_VER)
# pragma warning(pop)
#endif
#ifdef WIN32
# include <WinSock2.h>

12
scwx-qt/source/scwx/qt/util/texture_atlas.cpp
View file

@ -5,13 +5,19 @@
#include <shared_mutex>
#include <unordered_map>
#pragma warning(push, 0)
#pragma warning(disable : 4714)
#if defined(_MSC_VER)
# pragma warning(push, 0)
# pragma warning(disable : 4714)
#endif
#include <boost/gil/extension/io/png.hpp>
#include <boost/iostreams/stream.hpp>
#include <stb_rect_pack.h>
#include <QFile>
#pragma warning(pop)
#if defined(_MSC_VER)
# pragma warning(pop)
#endif
namespace scwx
{