diff --git a/Names.cpp b/Names.cpp deleted file mode 100644 index c9f26e8e..00000000 --- a/Names.cpp +++ /dev/null @@ -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" - -//--------------------------------------------------------------------------- diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 05a9ad98..a86fa82c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -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' diff --git a/gl/buffer.cpp b/gl/buffer.cpp index a3b9ab48..98bea5b0 100644 --- a/gl/buffer.cpp +++ b/gl/buffer.cpp @@ -1,3 +1,4 @@ +#include "stdafx.h" #include "buffer.h" GLenum gl::buffer::glenum_target(gl::buffer::targets target) diff --git a/gl/cubemap.cpp b/gl/cubemap.cpp index 3bc686d2..89ef9d1b 100644 --- a/gl/cubemap.cpp +++ b/gl/cubemap.cpp @@ -1,3 +1,4 @@ +#include "stdafx.h" #include "cubemap.h" gl::cubemap::cubemap() diff --git a/gl/fence.cpp b/gl/fence.cpp index 1b403f3b..92f31663 100644 --- a/gl/fence.cpp +++ b/gl/fence.cpp @@ -1,3 +1,4 @@ +#include "stdafx.h" #include "fence.h" gl::fence::fence() diff --git a/gl/pbo.cpp b/gl/pbo.cpp index 56c77766..6923e09d 100644 --- a/gl/pbo.cpp +++ b/gl/pbo.cpp @@ -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) diff --git a/imgui/imgui.cpp b/imgui/imgui.cpp index 72ea25e7..40993837 100644 --- a/imgui/imgui.cpp +++ b/imgui/imgui.cpp @@ -970,6 +970,8 @@ CODE */ +#include "stdafx.h" + #if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS) #define _CRT_SECURE_NO_WARNINGS #endif diff --git a/imgui/imgui_demo.cpp b/imgui/imgui_demo.cpp index df875b23..97a14e82 100644 --- a/imgui/imgui_demo.cpp +++ b/imgui/imgui_demo.cpp @@ -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 diff --git a/imgui/imgui_draw.cpp b/imgui/imgui_draw.cpp index 8d0c31de..525e73bd 100644 --- a/imgui/imgui_draw.cpp +++ b/imgui/imgui_draw.cpp @@ -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 diff --git a/imgui/imgui_impl_opengl2.cpp b/imgui/imgui_impl_opengl2.cpp index e076e621..febab3d8 100644 --- a/imgui/imgui_impl_opengl2.cpp +++ b/imgui/imgui_impl_opengl2.cpp @@ -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 diff --git a/imgui/imgui_widgets.cpp b/imgui/imgui_widgets.cpp index 698809b0..a2acccd6 100644 --- a/imgui/imgui_widgets.cpp +++ b/imgui/imgui_widgets.cpp @@ -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 diff --git a/network/backend/asio.cpp b/network/backend/asio.cpp index 715ff0b2..a8f3d674 100644 --- a/network/backend/asio.cpp +++ b/network/backend/asio.cpp @@ -1,3 +1,4 @@ +#include "stdafx.h" #include "network/backend/asio.h" #include "sn_utils.h" #include "Logs.h" diff --git a/network/manager.cpp b/network/manager.cpp index bb4d1a77..dfc63aa6 100644 --- a/network/manager.cpp +++ b/network/manager.cpp @@ -1,3 +1,4 @@ +#include "stdafx.h" #include "network/manager.h" #include "simulation.h" diff --git a/network/message.cpp b/network/message.cpp index de922f3f..03de9fae 100644 --- a/network/message.cpp +++ b/network/message.cpp @@ -1,3 +1,4 @@ +#include "stdafx.h" #include "network/message.h" #include "sn_utils.h" diff --git a/network/network.cpp b/network/network.cpp index 5e2248b4..cf4aca3c 100644 --- a/network/network.cpp +++ b/network/network.cpp @@ -1,3 +1,4 @@ +#include "stdafx.h" #include "network/network.h" #include "network/message.h" #include "Logs.h" diff --git a/stdafx.h b/stdafx.h index 4b5955a3..ed71f3c6 100644 --- a/stdafx.h +++ b/stdafx.h @@ -19,12 +19,6 @@ #define _CRTDBG_MAP_ALLOC #include #include -#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 diff --git a/widgets/cameraview.cpp b/widgets/cameraview.cpp index 95f7f9c8..ae6e660b 100644 --- a/widgets/cameraview.cpp +++ b/widgets/cameraview.cpp @@ -1,3 +1,4 @@ +#include "stdafx.h" #include "widgets/cameraview.h" #include "stb/stb_image.h" #include "Globals.h"