Skip to content

Commit

Permalink
Merge pull request #233 from bwrsandman/preprocessor
Browse files Browse the repository at this point in the history
bx: Add /Zc:preprocessor
exdal authored Jun 16, 2024
2 parents 19cb98d + c0ce138 commit c2b7416
Showing 5 changed files with 4 additions and 8 deletions.
4 changes: 0 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -22,10 +22,6 @@ if(APPLE AND NOT XCODE)
set(CMAKE_CXX_FLAGS "-ObjC++")
endif()

if(MSVC AND (MSVC_VERSION GREATER_EQUAL 1914))
add_compile_options("/Zc:__cplusplus")
endif()

include(CMakeDependentOption)

option(BX_AMALGAMATED "Amalgamated bx build for faster compilation" OFF)
2 changes: 1 addition & 1 deletion bgfx
Submodule bgfx updated 410 files
2 changes: 1 addition & 1 deletion bimg
2 changes: 1 addition & 1 deletion bx
2 changes: 1 addition & 1 deletion cmake/bx/bx.cmake
Original file line number Diff line number Diff line change
@@ -92,7 +92,7 @@ target_compile_definitions(bx PUBLIC "__STDC_CONSTANT_MACROS")

target_compile_features(bx PUBLIC cxx_std_14)
# (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
if(WIN32)

0 comments on commit c2b7416

Please sign in to comment.