Skip to content

Rename dbghelp.h to dbghelp.hpp #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pps83 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Rename dbghelp.h to dbghelp.hpp #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ set(VLD_HEADERS
callstack.h
criticalsection.h
crtmfcpatch.h
dbghelp.h
dbghelp.hpp
loaderlock.h
map.h
ntapi.h
Expand Down Expand Up @@ -96,21 +96,21 @@ target_compile_definitions(vld PRIVATE
if(MSVC)
# VLD core uses static runtime (different from tests which use DLL runtime)
set_property(TARGET vld PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")

# Precompiled header
target_precompile_headers(vld PRIVATE stdafx.h)

# Compiler options - disable inlining in Release/RelWithDebInfo to avoid issues with
# __forceinline functions that have their body in .cpp files (bug in source)
target_compile_options(vld PRIVATE
$<$<OR:$<CONFIG:Release>,$<CONFIG:RelWithDebInfo>>:/Ob0> # Disable inlining
)

# Disable C4244 warning for x86 builds (fmt library triggers this with 64-bit to 32-bit conversions)
if(VLD_PLATFORM STREQUAL "Win32")
target_compile_options(vld PRIVATE /wd4244)
endif()

# Linker settings
if(VLD_PLATFORM STREQUAL "ARM64" OR VLD_PLATFORM STREQUAL "x64")
# ARM64 and x64 require base address >= 4GB for ASLR optimization
Expand All @@ -125,7 +125,7 @@ if(MSVC)
/BASE:0x03200000
)
endif()

# Additional Windows libraries
target_link_libraries(vld PRIVATE
kernel32
Expand Down
0 src/dbghelp.h → src/dbghelp.hpp
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/stdafx.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
#define __out_xcount(x) // Workaround for the specstrings.h bug in the Platform SDK.
#endif
#define DBGHELP_TRANSLATE_TCHAR
#include "dbghelp.h" // Provides portable executable (PE) image access functions.
#include "dbghelp.hpp" // Provides portable executable (PE) image access functions.