Skip to content

Commit

Permalink
Merge pull request #47 from xhochy/fix-runtime-version
Browse files Browse the repository at this point in the history 
Fix runtime version for CL 19.41
  • Loading branch information
@isuruf
isuruf authored Oct 2, 2024
2 parents adee539 + 51460b5 commit b0c13c2
Show file tree
Hide file tree
Showing 16 changed files with 26 additions and 26 deletions.
12 changes: 6 additions & 6 deletions .azure-pipelines/azure-pipelines-win.yml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...SION19.41.34120MSVC_HEADERS_VERSION14.41.34120TOOLCHAIN_COMBINED14.41.17.11VCVER14.3.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ FINAL_CXXFLAGS:
MSVC_HEADERS_VERSION:
- 14.41.34120
RUNTIME_VERSION:
- 14.41.34120
- 14.40.33810
TOOLCHAIN_COMBINED:
- 14.41.17.11
VCVER:
Expand Down
2 changes: 1 addition & 1 deletion ...SION19.41.34120MSVC_HEADERS_VERSION14.41.34120TOOLCHAIN_COMBINED14.41.17.11VCVER14.3.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ FINAL_CXXFLAGS:
MSVC_HEADERS_VERSION:
- 14.41.34120
RUNTIME_VERSION:
- 14.41.34120
- 14.40.33810
TOOLCHAIN_COMBINED:
- 14.41.17.11
VCVER:
Expand Down
2 changes: 1 addition & 1 deletion ...SION19.41.34120MSVC_HEADERS_VERSION14.41.34120TOOLCHAIN_COMBINED14.41.17.11VCVER14.3.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ FINAL_CXXFLAGS:
MSVC_HEADERS_VERSION:
- 14.41.34120
RUNTIME_VERSION:
- 14.41.34120
- 14.40.33810
TOOLCHAIN_COMBINED:
- 14.41.17.11
VCVER:
Expand Down
2 changes: 1 addition & 1 deletion ...SION19.41.34120MSVC_HEADERS_VERSION14.41.34120TOOLCHAIN_COMBINED14.41.17.11VCVER14.3.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ MACOSX_SDK_VERSION:
MSVC_HEADERS_VERSION:
- 14.41.34120
RUNTIME_VERSION:
- 14.41.34120
- 14.40.33810
TOOLCHAIN_COMBINED:
- 14.41.17.11
VCVER:
Expand Down
2 changes: 1 addition & 1 deletion ...SION19.41.34120MSVC_HEADERS_VERSION14.41.34120TOOLCHAIN_COMBINED14.41.17.11VCVER14.3.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ MACOSX_SDK_VERSION:
MSVC_HEADERS_VERSION:
- 14.41.34120
RUNTIME_VERSION:
- 14.41.34120
- 14.40.33810
TOOLCHAIN_COMBINED:
- 14.41.17.11
VCVER:
Expand Down
2 changes: 1 addition & 1 deletion ...SION19.41.34120MSVC_HEADERS_VERSION14.41.34120TOOLCHAIN_COMBINED14.41.17.11VCVER14.3.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ MACOSX_SDK_VERSION:
MSVC_HEADERS_VERSION:
- 14.41.34120
RUNTIME_VERSION:
- 14.41.34120
- 14.40.33810
TOOLCHAIN_COMBINED:
- 14.41.17.11
VCVER:
Expand Down
2 changes: 1 addition & 1 deletion ...SION19.41.34120MSVC_HEADERS_VERSION14.41.34120TOOLCHAIN_COMBINED14.41.17.11VCVER14.3.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ MACOSX_SDK_VERSION:
MSVC_HEADERS_VERSION:
- 14.41.34120
RUNTIME_VERSION:
- 14.41.34120
- 14.40.33810
TOOLCHAIN_COMBINED:
- 14.41.17.11
VCVER:
Expand Down
2 changes: 1 addition & 1 deletion ...SION19.41.34120MSVC_HEADERS_VERSION14.41.34120TOOLCHAIN_COMBINED14.41.17.11VCVER14.3.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ MACOSX_SDK_VERSION:
MSVC_HEADERS_VERSION:
- 14.41.34120
RUNTIME_VERSION:
- 14.41.34120
- 14.40.33810
TOOLCHAIN_COMBINED:
- 14.41.17.11
VCVER:
Expand Down
2 changes: 1 addition & 1 deletion ...SION19.41.34120MSVC_HEADERS_VERSION14.41.34120TOOLCHAIN_COMBINED14.41.17.11VCVER14.3.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ MACOSX_SDK_VERSION:
MSVC_HEADERS_VERSION:
- 14.41.34120
RUNTIME_VERSION:
- 14.41.34120
- 14.40.33810
TOOLCHAIN_COMBINED:
- 14.41.17.11
VCVER:
Expand Down
2 changes: 1 addition & 1 deletion ...ERSION14.41.34120VCVER14.3VSYEAR2022.yaml → ...ERSION14.40.33810VCVER14.3VSYEAR2022.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ FINAL_CXXFLAGS:
- -fvisibility-inlines-hidden -std=c++17 -fmessage-length=0 -march=nocona -mtune=haswell
-ftree-vectorize -fstack-protector-strong -O2 -ffunction-sections -pipe
RUNTIME_VERSION:
- 14.41.34120
- 14.40.33810
VCVER:
- '14.3'
VSYEAR:
Expand Down
2 changes: 1 addition & 1 deletion ...ERSION14.41.34120VCVER14.3VSYEAR2022.yaml → ...ERSION14.40.33810VCVER14.3VSYEAR2022.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ FINAL_CXXFLAGS:
- -fvisibility-inlines-hidden -std=c++17 -fmessage-length=0 -march=nocona -mtune=haswell
-ftree-vectorize -fstack-protector-strong -O2 -ffunction-sections -pipe
RUNTIME_VERSION:
- 14.41.34120
- 14.40.33810
VCVER:
- '14.3'
VSYEAR:
Expand Down
2 changes: 1 addition & 1 deletion ...ERSION14.41.34120VCVER14.3VSYEAR2022.yaml → ...ERSION14.40.33810VCVER14.3VSYEAR2022.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ FINAL_CXXFLAGS:
- -fvisibility-inlines-hidden -std=c++17 -fmessage-length=0 -march=nocona -mtune=haswell
-ftree-vectorize -fstack-protector-strong -O2 -ffunction-sections -pipe
RUNTIME_VERSION:
- 14.41.34120
- 14.40.33810
VCVER:
- '14.3'
VSYEAR:
Expand Down
12 changes: 6 additions & 6 deletions README.md
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion recipe/conda_build_config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ VSVER:
- 17
- 16
RUNTIME_VERSION:
- 14.41.34120
- 14.40.33810
- 14.29.30139
CL_VERSION:
- 19.41.34120
Expand Down
2 changes: 1 addition & 1 deletion recipe/meta.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{% set cl_minor = CL_VERSION.split(".")[1] %}
{% set vc_major = VCVER.split(".")[0] %}

{% set build_number = 14 %}
{% set build_number = 15 %}

# separate builds number for headers & winsdk; reset when version increases (resp. all relevant versions)
{% set headers_build_number = 4 %}
Expand Down

0 comments on commit b0c13c2

Please sign in to comment.