File tree 6 files changed +214
-132
lines changed
6 files changed +214
-132
lines changed Original file line number Diff line number Diff line change @@ -81,11 +81,28 @@ jobs:
81
81
echo "::error Unknown architecture/build-type triplet mapping"
82
82
}
83
83
84
+ - name : Get vcpkg commit hash
85
+ shell : pwsh
86
+ run : |
87
+ if ($Env:vcpkgRelease) {
88
+ echo "Using vcpkg commit from repo variable..."
89
+ $VCPKG_COMMIT_ID = $Env:vcpkgRelease
90
+ }
91
+ else {
92
+ echo "Fetching latest vcpkg commit hash..."
93
+ $commit = (git ls-remote https://github.com/microsoft/vcpkg.git HEAD | Select-String -Pattern '([a-f0-9]{40})').Matches.Value
94
+ $VCPKG_COMMIT_ID = $commit
95
+ }
96
+ Write-Host "VCPKG_COMMIT_ID=$VCPKG_COMMIT_ID"
97
+ echo "VCPKG_COMMIT_ID=$VCPKG_COMMIT_ID" >> $env:GITHUB_ENV
98
+ env :
99
+ vcpkgRelease : ' ${{ vars.VCPKG_COMMIT_ID }}'
100
+
84
101
- uses : lukka/run-vcpkg@7d259227a1fb6471a0253dd5ab7419835228f7d7 # v11
85
102
with :
86
103
runVcpkgInstall : true
87
104
vcpkgJsonGlob : ' **/build/vcpkg.json'
88
- vcpkgGitCommitId : ' ${{ vars .VCPKG_COMMIT_ID }}'
105
+ vcpkgGitCommitId : ' ${{ env .VCPKG_COMMIT_ID }}'
89
106
90
107
- name : ' Configure CMake'
91
108
working-directory : ${{ github.workspace }}
Original file line number Diff line number Diff line change @@ -121,11 +121,28 @@ jobs:
121
121
echo "::error Unknown architecture/build-type triplet mapping"
122
122
}
123
123
124
+ - name : Get vcpkg commit hash
125
+ shell : pwsh
126
+ run : |
127
+ if ($Env:vcpkgRelease) {
128
+ echo "Using vcpkg commit from repo variable..."
129
+ $VCPKG_COMMIT_ID = $Env:vcpkgRelease
130
+ }
131
+ else {
132
+ echo "Fetching latest vcpkg commit hash..."
133
+ $commit = (git ls-remote https://github.com/microsoft/vcpkg.git HEAD | Select-String -Pattern '([a-f0-9]{40})').Matches.Value
134
+ $VCPKG_COMMIT_ID = $commit
135
+ }
136
+ Write-Host "VCPKG_COMMIT_ID=$VCPKG_COMMIT_ID"
137
+ echo "VCPKG_COMMIT_ID=$VCPKG_COMMIT_ID" >> $env:GITHUB_ENV
138
+ env :
139
+ vcpkgRelease : ' ${{ vars.VCPKG_COMMIT_ID }}'
140
+
124
141
- uses : lukka/run-vcpkg@7d259227a1fb6471a0253dd5ab7419835228f7d7 # v11
125
142
with :
126
143
runVcpkgInstall : true
127
144
vcpkgJsonGlob : ' **/build/vcpkg.json'
128
- vcpkgGitCommitId : ' ${{ vars .VCPKG_COMMIT_ID }}'
145
+ vcpkgGitCommitId : ' ${{ env .VCPKG_COMMIT_ID }}'
129
146
130
147
- name : ' Configure CMake'
131
148
working-directory : ${{ github.workspace }}
Original file line number Diff line number Diff line change @@ -93,11 +93,28 @@ jobs:
93
93
echo "::error Unknown architecture/build-type triplet mapping"
94
94
}
95
95
96
+ - name : Get vcpkg commit hash
97
+ shell : pwsh
98
+ run : |
99
+ if ($Env:vcpkgRelease) {
100
+ echo "Using vcpkg commit from repo variable..."
101
+ $VCPKG_COMMIT_ID = $Env:vcpkgRelease
102
+ }
103
+ else {
104
+ echo "Fetching latest vcpkg commit hash..."
105
+ $commit = (git ls-remote https://github.com/microsoft/vcpkg.git HEAD | Select-String -Pattern '([a-f0-9]{40})').Matches.Value
106
+ $VCPKG_COMMIT_ID = $commit
107
+ }
108
+ Write-Host "VCPKG_COMMIT_ID=$VCPKG_COMMIT_ID"
109
+ echo "VCPKG_COMMIT_ID=$VCPKG_COMMIT_ID" >> $env:GITHUB_ENV
110
+ env :
111
+ vcpkgRelease : ' ${{ vars.VCPKG_COMMIT_ID }}'
112
+
96
113
- uses : lukka/run-vcpkg@7d259227a1fb6471a0253dd5ab7419835228f7d7 # v11
97
114
with :
98
115
runVcpkgInstall : true
99
116
vcpkgJsonGlob : ' **/build/vcpkg.json'
100
- vcpkgGitCommitId : ' ${{ vars .VCPKG_COMMIT_ID }}'
117
+ vcpkgGitCommitId : ' ${{ env .VCPKG_COMMIT_ID }}'
101
118
102
119
- name : ' Configure CMake'
103
120
working-directory : ${{ github.workspace }}
Original file line number Diff line number Diff line change @@ -37,11 +37,28 @@ jobs:
37
37
38
38
- uses : seanmiddleditch/gha-setup-ninja@96bed6edff20d1dd61ecff9b75cc519d516e6401 # v5
39
39
40
+ - name : Get vcpkg commit hash
41
+ shell : pwsh
42
+ run : |
43
+ if ($Env:vcpkgRelease) {
44
+ echo "Using vcpkg commit from repo variable..."
45
+ $VCPKG_COMMIT_ID = $Env:vcpkgRelease
46
+ }
47
+ else {
48
+ echo "Fetching latest vcpkg commit hash..."
49
+ $commit = (git ls-remote https://github.com/microsoft/vcpkg.git HEAD | Select-String -Pattern '([a-f0-9]{40})').Matches.Value
50
+ $VCPKG_COMMIT_ID = $commit
51
+ }
52
+ Write-Host "VCPKG_COMMIT_ID=$VCPKG_COMMIT_ID"
53
+ echo "VCPKG_COMMIT_ID=$VCPKG_COMMIT_ID" >> $env:GITHUB_ENV
54
+ env :
55
+ vcpkgRelease : ' ${{ vars.VCPKG_COMMIT_ID }}'
56
+
40
57
- uses : lukka/run-vcpkg@7d259227a1fb6471a0253dd5ab7419835228f7d7 # v11
41
58
with :
42
59
runVcpkgInstall : true
43
60
vcpkgJsonGlob : ' **/build/vcpkg.json'
44
- vcpkgGitCommitId : ' ${{ vars .VCPKG_COMMIT_ID }}'
61
+ vcpkgGitCommitId : ' ${{ env .VCPKG_COMMIT_ID }}'
45
62
46
63
- name : ' Configure CMake'
47
64
working-directory : ${{ github.workspace }}
Original file line number Diff line number Diff line change @@ -17,6 +17,8 @@ project (DirectXTex
17
17
18
18
option (BUILD_TOOLS "Build tex command-line tools" ON )
19
19
20
+ option (BUILD_SHARED_LIBS "Build DirectXTex as a shared library" OFF )
21
+
20
22
option (BUILD_SAMPLE "Build DDSView sample (requires fxc.exe)" ON )
21
23
22
24
# Includes the functions for Direct3D 11 resources and DirectCompute compression
@@ -220,7 +222,12 @@ if(BUILD_DX11 AND WIN32 AND (NOT (XBOX_CONSOLE_TARGET STREQUAL "durango")))
220
222
endif ()
221
223
endif ()
222
224
223
- add_library (${PROJECT_NAME} STATIC ${LIBRARY_SOURCES} ${LIBRARY_HEADERS} )
225
+ add_library (${PROJECT_NAME} ${LIBRARY_SOURCES} ${LIBRARY_HEADERS} )
226
+
227
+ if (WIN32 AND BUILD_SHARED_LIBS )
228
+ target_compile_definitions (${PROJECT_NAME} PRIVATE DIRECTX_TEX_EXPORT)
229
+ target_compile_definitions (${PROJECT_NAME} INTERFACE DIRECTX_TEX_IMPORT)
230
+ endif ()
224
231
225
232
if (BUILD_DX11 AND WIN32 )
226
233
target_include_directories (${PROJECT_NAME} PRIVATE ${COMPILED_SHADERS} )
You can’t perform that action at this time.
0 commit comments