Skip to content
Permalink
Browse files

- set Visual C++ compiler to use /permissive- mode and fixed the one …

…error this generated.

This also means that Visual Studio 2015 is no longer supported as it has no proper standard conforming compile mode.
  • Loading branch information...
coelckers committed Jun 20, 2019
1 parent 3d3f364 commit 3030a6d389296f5a3b8a810c0c9fd907c4762201
Showing with 4 additions and 5 deletions.
  1. +0 −1 .appveyor.yml
  2. +2 −2 CMakeLists.txt
  3. +1 −1 src/win32/i_crash.cpp
  4. +1 −1 src/win32/i_main.cpp
@@ -8,7 +8,6 @@ clone_depth: 10

image:
- Visual Studio 2019
- Visual Studio 2015

environment:
matrix:
@@ -182,9 +182,9 @@ if( MSVC )
# Function-level linking
# Disable run-time type information
if ( HAVE_VULKAN )
set( ALL_C_FLAGS "/GF /Gy /GR- /DHAVE_VULKAN" )
set( ALL_C_FLAGS "/GF /Gy /GR- /permissive- /DHAVE_VULKAN" )
else()
set( ALL_C_FLAGS "/GF /Gy /GR-" )
set( ALL_C_FLAGS "/GF /Gy /GR- /permissive-" )
endif()

# Use SSE 2 as minimum always as the true color drawers needs it for __vectorcall
@@ -511,7 +511,7 @@ HANDLE WriteLogFile(HWND edit)
//
//==========================================================================

void CreateCrashLog (char *custominfo, DWORD customsize, HWND richlog)
void CreateCrashLog (const char *custominfo, DWORD customsize, HWND richlog)
{
// Do not collect information more than once.
if (NumFiles != 0)
@@ -98,7 +98,7 @@
// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------

LRESULT CALLBACK WndProc (HWND, UINT, WPARAM, LPARAM);
void CreateCrashLog (char *custominfo, DWORD customsize, HWND richedit);
void CreateCrashLog (const char *custominfo, DWORD customsize, HWND richedit);
void DisplayCrashLog ();
extern uint8_t *ST_Util_BitsForBitmap (BITMAPINFO *bitmap_info);
void I_FlushBufferedConsoleStuff();

0 comments on commit 3030a6d

Please sign in to comment.
You can’t perform that action at this time.