diff options
| author | Shauren <shauren.trinity@gmail.com> | 2024-09-03 12:06:16 +0200 |
|---|---|---|
| committer | Ovahlord <dreadkiller@gmx.de> | 2024-09-03 19:56:38 +0200 |
| commit | fdd44f70dd0abe5a4b1052a97a004a10de336824 (patch) | |
| tree | a0a6afd34449f683848b10f2a97336a4c0134138 /cmake/compiler | |
| parent | 2592a08df667c6988a79dbc39be11346755b8d11 (diff) | |
Core/Misc: CompilerDefs/GitRevision improvements
* Removed INTEL as a separate platform (it does not belong there)
* Removed BORLAND from known compilers list (it was never supported)
* Simplified TRINITY_PLATFORM_WINDOWS detection (_WIN32 is always defined)
* Rename revision_data.h macros that begin with a underscore
* Added processor architecture to --version string
* Added Linux distribution name to .server debug
* Fixed some revision_data.h macros missing/wrong values when regenerated during compilation
* Removed manual adding of _WIN64 macro from cmake (it is predefined internally by compiler)
(cherry picked from commit e8740fb2e125b308493aeab49ddd7b0cc6a53c97)
# Conflicts:
# revision_data.h.in.cmake
Diffstat (limited to 'cmake/compiler')
| -rw-r--r-- | cmake/compiler/msvc/settings.cmake | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/cmake/compiler/msvc/settings.cmake b/cmake/compiler/msvc/settings.cmake index 50dac95f123..54bc6fa63ce 100644 --- a/cmake/compiler/msvc/settings.cmake +++ b/cmake/compiler/msvc/settings.cmake @@ -28,17 +28,7 @@ target_compile_options(trinity-compile-option-interface INTERFACE /permissive-) -if(PLATFORM EQUAL 64) - # This definition is necessary to work around a bug with Intellisense described - # here: http://tinyurl.com/2cb428. Syntax highlighting is important for proper - # debugger functionality. - target_compile_definitions(trinity-compile-option-interface - INTERFACE - _WIN64) - - message(STATUS "MSVC: 64-bit platform, enforced -D_WIN64 parameter") - -else() +if(PLATFORM EQUAL 32) # mark 32 bit executables large address aware so they can use > 2GB address space set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE") message(STATUS "MSVC: Enabled large address awareness") |