Skip to content

Commit f2df810

Browse files
authored
Fixed MinGW with shared libs (#203)
1 parent 387f9d1 commit f2df810

File tree

3 files changed

+22
-2
lines changed

3 files changed

+22
-2
lines changed

.github/workflows/vcpkg.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,25 +29,40 @@ jobs:
2929
os: [windows-2019, windows-2022]
3030
build_type: [x64-Debug-VCPKG]
3131
arch: [amd64]
32+
shared: [OFF]
3233
include:
3334
- os: windows-2022
3435
build_type: x64-Debug-Clang-VCPKG
3536
arch: amd64
37+
shared: OFF
3638
- os: windows-2022
3739
build_type: x86-Debug-VCPKG
3840
arch: amd64_x86
41+
shared: OFF
3942
- os: windows-2022
4043
build_type: arm64-Debug-VCPKG
4144
arch: amd64_arm64
45+
shared: OFF
4246
- os: windows-2022
4347
build_type: arm64ec-Debug-VCPKG
4448
arch: amd64_arm64
49+
shared: OFF
4550
- os: windows-2022
4651
build_type: x64-Debug-MinGW
4752
arch: amd64
53+
shared: OFF
4854
- os: windows-2022
4955
build_type: x64-Release-MinGW
5056
arch: amd64
57+
shared: OFF
58+
- os: windows-2022
59+
build_type: x64-Debug-MinGW
60+
arch: amd64
61+
shared: ON
62+
- os: windows-2022
63+
build_type: x64-Release-MinGW
64+
arch: amd64
65+
shared: ON
5166

5267
steps:
5368
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -120,6 +135,7 @@ jobs:
120135
working-directory: ${{ github.workspace }}
121136
run: >
122137
cmake --preset=${{ matrix.build_type }} -DBUILD_TESTING=OFF
138+
-DBUILD_SHARED_LIBS=${{ matrix.shared }}
123139
-DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake" -DVCPKG_MANIFEST_DIR="${{ github.workspace }}/build"
124140
-DVCPKG_TARGET_TRIPLET="${env:VCPKG_DEFAULT_TRIPLET}"
125141

CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,10 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang|IntelLLVM")
263263
elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
264264
foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
265265
target_compile_options(${t} PRIVATE "-Wno-ignored-attributes" "-Walloc-size-larger-than=4GB")
266+
267+
if(BUILD_SHARED_LIBS)
268+
target_compile_options(${t} PRIVATE "-Wno-attributes")
269+
endif()
266270
endforeach()
267271
elseif(CMAKE_CXX_COMPILER_ID MATCHES "Intel")
268272
set_target_properties(${PROJECT_NAME} PROPERTIES CXX_STANDARD 14)

DirectXMesh/DirectXMesh.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ namespace DirectX
139139
DIRECTX_MESH_API void __cdecl Release() noexcept;
140140

141141
#if defined(__d3d11_h__) || defined(__d3d11_x_h__)
142-
DIRECTX_MESH_API const D3D11_INPUT_ELEMENT_DESC* GetElement(_In_z_ const char* semanticName, _In_ unsigned int semanticIndex) const
142+
DIRECTX_MESH_API inline const D3D11_INPUT_ELEMENT_DESC* GetElement(_In_z_ const char* semanticName, _In_ unsigned int semanticIndex) const
143143
{
144144
return GetElement11(semanticName, semanticIndex);
145145
}
@@ -195,7 +195,7 @@ namespace DirectX
195195
DIRECTX_MESH_API void __cdecl Release() noexcept;
196196

197197
#if defined(__d3d11_h__) || defined(__d3d11_x_h__)
198-
DIRECTX_MESH_API const D3D11_INPUT_ELEMENT_DESC* __cdecl GetElement(_In_z_ const char* semanticName, _In_ unsigned int semanticIndex) const
198+
DIRECTX_MESH_API inline const D3D11_INPUT_ELEMENT_DESC* __cdecl GetElement(_In_z_ const char* semanticName, _In_ unsigned int semanticIndex) const
199199
{
200200
return GetElement11(semanticName, semanticIndex);
201201
}

0 commit comments

Comments
 (0)