File tree Expand file tree Collapse file tree 3 files changed +22
-2
lines changed Expand file tree Collapse file tree 3 files changed +22
-2
lines changed Original file line number Diff line number Diff line change @@ -29,25 +29,40 @@ jobs:
29
29
os : [windows-2019, windows-2022]
30
30
build_type : [x64-Debug-VCPKG]
31
31
arch : [amd64]
32
+ shared : [OFF]
32
33
include :
33
34
- os : windows-2022
34
35
build_type : x64-Debug-Clang-VCPKG
35
36
arch : amd64
37
+ shared : OFF
36
38
- os : windows-2022
37
39
build_type : x86-Debug-VCPKG
38
40
arch : amd64_x86
41
+ shared : OFF
39
42
- os : windows-2022
40
43
build_type : arm64-Debug-VCPKG
41
44
arch : amd64_arm64
45
+ shared : OFF
42
46
- os : windows-2022
43
47
build_type : arm64ec-Debug-VCPKG
44
48
arch : amd64_arm64
49
+ shared : OFF
45
50
- os : windows-2022
46
51
build_type : x64-Debug-MinGW
47
52
arch : amd64
53
+ shared : OFF
48
54
- os : windows-2022
49
55
build_type : x64-Release-MinGW
50
56
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
51
66
52
67
steps :
53
68
- uses : actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -120,6 +135,7 @@ jobs:
120
135
working-directory : ${{ github.workspace }}
121
136
run : >
122
137
cmake --preset=${{ matrix.build_type }} -DBUILD_TESTING=OFF
138
+ -DBUILD_SHARED_LIBS=${{ matrix.shared }}
123
139
-DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake" -DVCPKG_MANIFEST_DIR="${{ github.workspace }}/build"
124
140
-DVCPKG_TARGET_TRIPLET="${env:VCPKG_DEFAULT_TRIPLET}"
125
141
Original file line number Diff line number Diff line change @@ -263,6 +263,10 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang|IntelLLVM")
263
263
elseif (CMAKE_CXX_COMPILER_ID MATCHES "GNU" )
264
264
foreach (t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME} )
265
265
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 ()
266
270
endforeach ()
267
271
elseif (CMAKE_CXX_COMPILER_ID MATCHES "Intel" )
268
272
set_target_properties (${PROJECT_NAME} PROPERTIES CXX_STANDARD 14 )
Original file line number Diff line number Diff line change @@ -139,7 +139,7 @@ namespace DirectX
139
139
DIRECTX_MESH_API void __cdecl Release () noexcept ;
140
140
141
141
#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
143
143
{
144
144
return GetElement11 (semanticName, semanticIndex);
145
145
}
@@ -195,7 +195,7 @@ namespace DirectX
195
195
DIRECTX_MESH_API void __cdecl Release () noexcept ;
196
196
197
197
#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
199
199
{
200
200
return GetElement11 (semanticName, semanticIndex);
201
201
}
You can’t perform that action at this time.
0 commit comments