16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-18 00:49:19 +02:00

remove DBG_NEW new preprocessor kludges, ensure stdafx.h is included everywhere, add debug build to Azure CI

This commit is contained in:
milek7
2019-08-30 23:35:58 +02:00
parent 30df10a58e
commit 5c84f8b156
17 changed files with 34 additions and 27 deletions

View File

@@ -1,13 +0,0 @@
/*
This Source Code Form is subject to the
terms of the Mozilla Public License, v.
2.0. If a copy of the MPL was not
distributed with this file, You can
obtain one at
http://mozilla.org/MPL/2.0/.
*/
#include"stdafx.h"
#include "Names.h"
//---------------------------------------------------------------------------

View File

@@ -75,6 +75,22 @@ jobs:
artifactName: binaries_win64
displayName: 'Publish symbols'
- job: windows_x64_dbg
pool:
vmImage: 'vs2017-win2016'
displayName: 'Windows VS2017 Debug'
steps:
- script: |
cd ref
git clone "https://github.com/chriskohlhoff/asio" --depth 1 --branch asio-1-12-2 -q
displayName: 'Download extra dependencies'
- script: |
mkdir build
cd build
cmake .. -A x64
cmake --build . --config Debug
displayName: 'Build'
- job: windows_x32
pool:
vmImage: 'vs2017-win2016'

View File

@@ -1,3 +1,4 @@
#include "stdafx.h"
#include "buffer.h"
GLenum gl::buffer::glenum_target(gl::buffer::targets target)

View File

@@ -1,3 +1,4 @@
#include "stdafx.h"
#include "cubemap.h"
gl::cubemap::cubemap()

View File

@@ -1,3 +1,4 @@
#include "stdafx.h"
#include "fence.h"
gl::fence::fence()

View File

@@ -1,3 +1,4 @@
#include "stdafx.h"
#include "pbo.h"
void gl::pbo::request_read(int x, int y, int lx, int ly, int pixsize, GLenum format, GLenum type)

View File

@@ -970,6 +970,8 @@ CODE
*/
#include "stdafx.h"
#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS)
#define _CRT_SECURE_NO_WARNINGS
#endif

View File

@@ -53,6 +53,8 @@ Index of this file:
*/
#include "stdafx.h"
#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS)
#define _CRT_SECURE_NO_WARNINGS
#endif

View File

@@ -22,6 +22,8 @@ Index of this file:
*/
#include "stdafx.h"
#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS)
#define _CRT_SECURE_NO_WARNINGS
#endif

View File

@@ -26,6 +26,7 @@
// 2016-09-10: OpenGL: Uploading font texture as RGBA32 to increase compatibility with users shaders (not ideal).
// 2016-09-05: OpenGL: Fixed save and restore of current scissor rectangle.
#include "stdafx.h"
#include "imgui.h"
#include "imgui_impl_opengl2.h"
#if defined(_MSC_VER) && _MSC_VER <= 1500 // MSVC 2008 or earlier

View File

@@ -27,6 +27,8 @@ Index of this file:
*/
#include "stdafx.h"
#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS)
#define _CRT_SECURE_NO_WARNINGS
#endif

View File

@@ -1,3 +1,4 @@
#include "stdafx.h"
#include "network/backend/asio.h"
#include "sn_utils.h"
#include "Logs.h"

View File

@@ -1,3 +1,4 @@
#include "stdafx.h"
#include "network/manager.h"
#include "simulation.h"

View File

@@ -1,3 +1,4 @@
#include "stdafx.h"
#include "network/message.h"
#include "sn_utils.h"

View File

@@ -1,3 +1,4 @@
#include "stdafx.h"
#include "network/network.h"
#include "network/message.h"
#include "Logs.h"

View File

@@ -19,12 +19,6 @@
#define _CRTDBG_MAP_ALLOC
#include <stdlib.h>
#include <crtdbg.h>
#ifdef _DEBUG
#ifndef DBG_NEW
#define DBG_NEW new ( _NORMAL_BLOCK , __FILE__ , __LINE__ )
#define new DBG_NEW
#endif
#endif // _DEBUG
#endif
// operating system
#ifdef _WIN32
@@ -109,13 +103,5 @@ int const null_handle = 0;
#define STRINGIZE(x) STRINGIZE_DETAIL(x)
#define glDebug(x) if (GLAD_GL_GREMEDY_string_marker) glStringMarkerGREMEDY(0, __FILE__ ":" STRINGIZE(__LINE__) ": " x);
#ifdef DBG_NEW
#pragma push_macro("new")
#undef new
#include "imgui/imgui.h"
#pragma pop_macro("new")
#else
#include "imgui/imgui.h"
#endif
#endif

View File

@@ -1,3 +1,4 @@
#include "stdafx.h"
#include "widgets/cameraview.h"
#include "stb/stb_image.h"
#include "Globals.h"