Skip to content

Commit

Permalink
Windows: add semicolon to static_assert workaround.
Browse files Browse the repository at this point in the history
Signed-off-by: furby™ <[email protected]>
  • Loading branch information
furby-tm committed Oct 30, 2024
1 parent 38c4ff7 commit 98bd2c1
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ let package = Package(
cxxSettings: [
.define("IMGUI_ENABLE_FREETYPE", to: "1"),
.define("_ALLOW_COMPILER_AND_STL_VERSION_MISMATCH", .when(platforms: [.windows])),
.define("static_assert(_conditional, _message)", to: "", .when(platforms: [.windows])),
.define("static_assert(_conditional, _message)", to: ";", .when(platforms: [.windows])),
]
),

Expand All @@ -71,7 +71,7 @@ let package = Package(
.define("_GLFW_WIN32", to: "1", .when(platforms: [.windows])),
.define("GL_SILENCE_DEPRECATION", to: "1"),
.define("_ALLOW_COMPILER_AND_STL_VERSION_MISMATCH", .when(platforms: [.windows])),
.define("static_assert(_conditional, _message)", to: "", .when(platforms: [.windows])),
.define("static_assert(_conditional, _message)", to: ";", .when(platforms: [.windows])),
.unsafeFlags(["-fno-objc-arc"]), // TODO: remove.
],
linkerSettings: [
Expand Down Expand Up @@ -258,7 +258,7 @@ let package = Package(
.headerSearchPath("src"),
.define("FT_USE_AUTOFIT", to: "1"),
.define("_ALLOW_COMPILER_AND_STL_VERSION_MISMATCH", .when(platforms: [.windows])),
.define("static_assert(_conditional, _message)", to: "", .when(platforms: [.windows])),
.define("static_assert(_conditional, _message)", to: ";", .when(platforms: [.windows])),
]
),

Expand All @@ -275,7 +275,7 @@ let package = Package(
publicHeadersPath: ".",
cxxSettings: [
.define("_ALLOW_COMPILER_AND_STL_VERSION_MISMATCH", .when(platforms: [.windows])),
.define("static_assert(_conditional, _message)", to: "", .when(platforms: [.windows])),
.define("static_assert(_conditional, _message)", to: ";", .when(platforms: [.windows])),
]
),

Expand All @@ -296,7 +296,7 @@ let package = Package(
cxxSettings: [
.headerSearchPath("misc/freetype"),
.define("_ALLOW_COMPILER_AND_STL_VERSION_MISMATCH", .when(platforms: [.windows])),
.define("static_assert(_conditional, _message)", to: "", .when(platforms: [.windows])),
.define("static_assert(_conditional, _message)", to: ";", .when(platforms: [.windows])),
]
),

Expand All @@ -309,7 +309,7 @@ let package = Package(
cxxSettings: [
.define("IMGUI_ENABLE_FREETYPE", to: "1"),
.define("_ALLOW_COMPILER_AND_STL_VERSION_MISMATCH", .when(platforms: [.windows])),
.define("static_assert(_conditional, _message)", to: "", .when(platforms: [.windows])),
.define("static_assert(_conditional, _message)", to: ";", .when(platforms: [.windows])),
],
swiftSettings: [
.interoperabilityMode(.Cxx)
Expand All @@ -322,7 +322,7 @@ let package = Package(
cxxSettings: [
.define("IMGUI_ENABLE_FREETYPE", to: "1"),
.define("_ALLOW_COMPILER_AND_STL_VERSION_MISMATCH", .when(platforms: [.windows])),
.define("static_assert(_conditional, _message)", to: "", .when(platforms: [.windows])),
.define("static_assert(_conditional, _message)", to: ";", .when(platforms: [.windows])),
],
swiftSettings: [
.interoperabilityMode(.Cxx)
Expand Down

0 comments on commit 98bd2c1

Please sign in to comment.