mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-07-23 16:49:18 +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:
13
Names.cpp
13
Names.cpp
@@ -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"
|
|
||||||
|
|
||||||
//---------------------------------------------------------------------------
|
|
||||||
@@ -75,6 +75,22 @@ jobs:
|
|||||||
artifactName: binaries_win64
|
artifactName: binaries_win64
|
||||||
displayName: 'Publish symbols'
|
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
|
- job: windows_x32
|
||||||
pool:
|
pool:
|
||||||
vmImage: 'vs2017-win2016'
|
vmImage: 'vs2017-win2016'
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
#include "stdafx.h"
|
||||||
#include "buffer.h"
|
#include "buffer.h"
|
||||||
|
|
||||||
GLenum gl::buffer::glenum_target(gl::buffer::targets target)
|
GLenum gl::buffer::glenum_target(gl::buffer::targets target)
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
#include "stdafx.h"
|
||||||
#include "cubemap.h"
|
#include "cubemap.h"
|
||||||
|
|
||||||
gl::cubemap::cubemap()
|
gl::cubemap::cubemap()
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
#include "stdafx.h"
|
||||||
#include "fence.h"
|
#include "fence.h"
|
||||||
|
|
||||||
gl::fence::fence()
|
gl::fence::fence()
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
#include "stdafx.h"
|
||||||
#include "pbo.h"
|
#include "pbo.h"
|
||||||
|
|
||||||
void gl::pbo::request_read(int x, int y, int lx, int ly, int pixsize, GLenum format, GLenum type)
|
void gl::pbo::request_read(int x, int y, int lx, int ly, int pixsize, GLenum format, GLenum type)
|
||||||
|
|||||||
@@ -970,6 +970,8 @@ CODE
|
|||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "stdafx.h"
|
||||||
|
|
||||||
#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS)
|
#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS)
|
||||||
#define _CRT_SECURE_NO_WARNINGS
|
#define _CRT_SECURE_NO_WARNINGS
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -53,6 +53,8 @@ Index of this file:
|
|||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "stdafx.h"
|
||||||
|
|
||||||
#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS)
|
#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS)
|
||||||
#define _CRT_SECURE_NO_WARNINGS
|
#define _CRT_SECURE_NO_WARNINGS
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -22,6 +22,8 @@ Index of this file:
|
|||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "stdafx.h"
|
||||||
|
|
||||||
#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS)
|
#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS)
|
||||||
#define _CRT_SECURE_NO_WARNINGS
|
#define _CRT_SECURE_NO_WARNINGS
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -26,6 +26,7 @@
|
|||||||
// 2016-09-10: OpenGL: Uploading font texture as RGBA32 to increase compatibility with users shaders (not ideal).
|
// 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.
|
// 2016-09-05: OpenGL: Fixed save and restore of current scissor rectangle.
|
||||||
|
|
||||||
|
#include "stdafx.h"
|
||||||
#include "imgui.h"
|
#include "imgui.h"
|
||||||
#include "imgui_impl_opengl2.h"
|
#include "imgui_impl_opengl2.h"
|
||||||
#if defined(_MSC_VER) && _MSC_VER <= 1500 // MSVC 2008 or earlier
|
#if defined(_MSC_VER) && _MSC_VER <= 1500 // MSVC 2008 or earlier
|
||||||
|
|||||||
@@ -27,6 +27,8 @@ Index of this file:
|
|||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "stdafx.h"
|
||||||
|
|
||||||
#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS)
|
#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS)
|
||||||
#define _CRT_SECURE_NO_WARNINGS
|
#define _CRT_SECURE_NO_WARNINGS
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
#include "stdafx.h"
|
||||||
#include "network/backend/asio.h"
|
#include "network/backend/asio.h"
|
||||||
#include "sn_utils.h"
|
#include "sn_utils.h"
|
||||||
#include "Logs.h"
|
#include "Logs.h"
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
#include "stdafx.h"
|
||||||
#include "network/manager.h"
|
#include "network/manager.h"
|
||||||
#include "simulation.h"
|
#include "simulation.h"
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
#include "stdafx.h"
|
||||||
#include "network/message.h"
|
#include "network/message.h"
|
||||||
#include "sn_utils.h"
|
#include "sn_utils.h"
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
#include "stdafx.h"
|
||||||
#include "network/network.h"
|
#include "network/network.h"
|
||||||
#include "network/message.h"
|
#include "network/message.h"
|
||||||
#include "Logs.h"
|
#include "Logs.h"
|
||||||
|
|||||||
14
stdafx.h
14
stdafx.h
@@ -19,12 +19,6 @@
|
|||||||
#define _CRTDBG_MAP_ALLOC
|
#define _CRTDBG_MAP_ALLOC
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <crtdbg.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
|
#endif
|
||||||
// operating system
|
// operating system
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
@@ -109,13 +103,5 @@ int const null_handle = 0;
|
|||||||
#define STRINGIZE(x) STRINGIZE_DETAIL(x)
|
#define STRINGIZE(x) STRINGIZE_DETAIL(x)
|
||||||
#define glDebug(x) if (GLAD_GL_GREMEDY_string_marker) glStringMarkerGREMEDY(0, __FILE__ ":" STRINGIZE(__LINE__) ": " 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"
|
#include "imgui/imgui.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
#include "stdafx.h"
|
||||||
#include "widgets/cameraview.h"
|
#include "widgets/cameraview.h"
|
||||||
#include "stb/stb_image.h"
|
#include "stb/stb_image.h"
|
||||||
#include "Globals.h"
|
#include "Globals.h"
|
||||||
|
|||||||
Reference in New Issue
Block a user