Skip to content

Commit

Permalink
Use -D instead of /D for MSVC compiler definitions
Browse files Browse the repository at this point in the history
- No effect with MSVC
- Resource compiler (supercell-wx target) fails with /D
  • Loading branch information
dpaulat committed Nov 20, 2023
1 parent d5222ea commit 9481bc6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions scwx-qt/scwx-qt.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -464,8 +464,8 @@ target_compile_options(supercell-wx PRIVATE

if (MSVC)
# Don't include Windows macros
target_compile_options(scwx-qt PRIVATE /D "NOMINMAX")
target_compile_options(supercell-wx PRIVATE /D "NOMINMAX")
target_compile_options(scwx-qt PRIVATE -DNOMINMAX)
target_compile_options(supercell-wx PRIVATE -DNOMINMAX)

# Enable multi-processor compilation
target_compile_options(scwx-qt PRIVATE "/MP")
Expand Down
2 changes: 1 addition & 1 deletion wxdata/wxdata.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ target_compile_options(wxdata PRIVATE

if (MSVC)
# Don't include Windows macros
target_compile_options(wxdata PRIVATE /D "NOMINMAX")
target_compile_options(wxdata PRIVATE -DNOMINMAX)

# Enable multi-processor compilation
target_compile_options(wxdata PRIVATE "/MP")
Expand Down

0 comments on commit 9481bc6

Please sign in to comment.