mirror of
https://github.com/ZDoom/qzdoom.git
synced 2024-11-10 06:42:12 +00:00
- removed duplicate #define warning in fmodsound.cpp.
- commented out output of Cr0NpxState for floating point state because this variable was renamed in most recent Windows headers. - added CMAKE option to generate assembly output for release builds. - added my CMake-based project directory to .gitignore.
This commit is contained in:
parent
0c1d92834a
commit
7cb70f60b3
4 changed files with 18 additions and 5 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -26,3 +26,4 @@
|
|||
/tools/lemon/build
|
||||
/tools/re2c/build
|
||||
/wadsrc/*.pk3
|
||||
/build_vc2013
|
||||
|
|
|
@ -91,9 +91,14 @@ if( MSVC )
|
|||
# Disable run-time type information
|
||||
set( ALL_C_FLAGS "/GF /Gy /GR-" )
|
||||
|
||||
# Avoid CRT DLL dependancies in release builds
|
||||
set( REL_C_FLAGS "/MT /Oy" )
|
||||
|
||||
# Avoid CRT DLL dependancies in release builds, optionally generate assembly output for checking crash locations.
|
||||
option( ZDOOM_GENERATE_ASM "Generate assembly output." OFF )
|
||||
if( ZDOOM_GENERATE_ASM )
|
||||
set( REL_C_FLAGS "/MT /Oy /FAcs" )
|
||||
else( ZDOOM_GENERATE_ASM )
|
||||
set( REL_C_FLAGS "/MT /Oy" )
|
||||
endif( ZDOOM_GENERATE_ASM )
|
||||
|
||||
# Debug allocations in debug builds
|
||||
set( DEB_C_FLAGS "/D _CRTDBG_MAP_ALLOC /MTd" )
|
||||
|
||||
|
|
|
@ -629,7 +629,9 @@ bool FMODSoundRenderer::IsValid()
|
|||
//
|
||||
//==========================================================================
|
||||
|
||||
#ifndef FACILITY_VISUALCPP
|
||||
#define FACILITY_VISUALCPP ((LONG)0x6d)
|
||||
#endif
|
||||
#define VcppException(sev,err) ((sev) | (FACILITY_VISUALCPP<<16) | err)
|
||||
|
||||
static int CheckException(DWORD code)
|
||||
|
|
|
@ -842,10 +842,15 @@ HANDLE WriteTextReport ()
|
|||
Writef (file,
|
||||
"\r\nFPU State:\r\n ControlWord=%04x StatusWord=%04x TagWord=%04x\r\n"
|
||||
" ErrorOffset=%08x\r\n ErrorSelector=%08x\r\n DataOffset=%08x\r\n DataSelector=%08x\r\n"
|
||||
" Cr0NpxState=%08x\r\n\r\n",
|
||||
// Cr0NpxState was renamed in recent Windows headers so better skip it here. Its meaning is unknown anyway.
|
||||
//" Cr0NpxState=%08x\r\n"
|
||||
"\r\n"
|
||||
,
|
||||
(WORD)ctxt->FloatSave.ControlWord, (WORD)ctxt->FloatSave.StatusWord, (WORD)ctxt->FloatSave.TagWord,
|
||||
ctxt->FloatSave.ErrorOffset, ctxt->FloatSave.ErrorSelector, ctxt->FloatSave.DataOffset,
|
||||
ctxt->FloatSave.DataSelector, ctxt->FloatSave.Cr0NpxState);
|
||||
ctxt->FloatSave.DataSelector
|
||||
//, ctxt->FloatSave.Cr0NpxState
|
||||
);
|
||||
|
||||
for (i = 0; i < 8; ++i)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue