Merge pull request #233 from bwrsandman/preprocessor

bx: Add /Zc:preprocessor
This commit is contained in:
exdal
2024-06-16 13:51:25 +03:00
committed by GitHub
5 changed files with 4 additions and 8 deletions

View File

@@ -22,10 +22,6 @@ if(APPLE AND NOT XCODE)
set(CMAKE_CXX_FLAGS "-ObjC++") set(CMAKE_CXX_FLAGS "-ObjC++")
endif() endif()
if(MSVC AND (MSVC_VERSION GREATER_EQUAL 1914))
add_compile_options("/Zc:__cplusplus")
endif()
include(CMakeDependentOption) include(CMakeDependentOption)
option(BX_AMALGAMATED "Amalgamated bx build for faster compilation" OFF) option(BX_AMALGAMATED "Amalgamated bx build for faster compilation" OFF)

2
bgfx

Submodule bgfx updated: 00fa5ad179...d1feabe319

2
bimg

Submodule bimg updated: 98a40e8533...59f188a6ad

2
bx

Submodule bx updated: d171a0f264...24527eabfd

View File

@@ -92,7 +92,7 @@ target_compile_definitions(bx PUBLIC "__STDC_CONSTANT_MACROS")
target_compile_features(bx PUBLIC cxx_std_14) target_compile_features(bx PUBLIC cxx_std_14)
# (note: see bx\scripts\toolchain.lua for equivalent compiler flag) # (note: see bx\scripts\toolchain.lua for equivalent compiler flag)
target_compile_options(bx PUBLIC $<$<CXX_COMPILER_ID:MSVC>:/Zc:__cplusplus>) target_compile_options(bx PUBLIC $<$<CXX_COMPILER_ID:MSVC>:/Zc:__cplusplus /Zc:preprocessor>)
# Link against psapi on Windows # Link against psapi on Windows
if(WIN32) if(WIN32)