Skip to content

Commit b3a0c14

Browse files
pblinzerpblinzer
authored
Merge branch 'yasm:master' into master
2 parents 57ca5ae + 121ab15 commit b3a0c14

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+496
-175
lines changed

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
name: "Build - ${{ matrix.artifact-name }}"
1919
runs-on: ${{ matrix.os }}
2020
steps:
21-
- uses: actions/checkout@v2
21+
- uses: actions/checkout@v3
2222
- name: Install autotools
2323
run: |
2424
if [ "$RUNNER_OS" == "macOS" ]; then
@@ -34,7 +34,7 @@ jobs:
3434
- name: Dist
3535
run: make dist
3636

37-
- uses: actions/upload-artifact@v2
37+
- uses: actions/upload-artifact@v3
3838
with:
3939
name: ${{ matrix.artifact-name }}
4040
path: yasm-*.tar.gz

‎ConfigureChecks.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ CHECK_INCLUDE_FILE(stdint.h HAVE_STDINT_H)
1818
CHECK_SYMBOL_EXISTS(abort "stdlib.h" HAVE_ABORT)
1919

2020
CHECK_FUNCTION_EXISTS(getcwd HAVE_GETCWD)
21+
CHECK_FUNCTION_EXISTS(_stricmp HAVE__STRICMP)
2122
CHECK_FUNCTION_EXISTS(toascii HAVE_TOASCII)
2223

2324
CHECK_LIBRARY_EXISTS(dl dlopen "" HAVE_LIBDL)

‎INSTALL‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,18 @@ The simplest way to compile this package is:
5151
all sorts of other programs in order to regenerate files that came
5252
with the distribution.
5353

54+
Installation using vcpkg
55+
==================
56+
You can build and install yasm using [vcpkg](https://github.com/Microsoft/vcpkg/) dependency manager:
57+
58+
`git clone https://github.com/Microsoft/vcpkg.git'
59+
`cd vcpkg'
60+
`./bootstrap-vcpkg.sh' # `./bootstrap-vcpkg.bat' for Windows
61+
`./vcpkg integrate install'
62+
`./vcpkg install yasm'
63+
64+
The yasm port in vcpkg is kept up to date by Microsoft team members and community contributors. If the version is out of date, please [create an issue or pull request](https://github.com/Microsoft/vcpkg) on the vcpkg repository.
65+
5466
Compilers and Options
5567
=====================
5668

‎Mkfiles/vs/genmacro/genmacro.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,22 @@
2828
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
2929
<ConfigurationType>Application</ConfigurationType>
3030
<CharacterSet>MultiByte</CharacterSet>
31-
<PlatformToolset>v142</PlatformToolset>
31+
<PlatformToolset>v143</PlatformToolset>
3232
</PropertyGroup>
3333
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
3434
<ConfigurationType>Application</ConfigurationType>
3535
<CharacterSet>MultiByte</CharacterSet>
36-
<PlatformToolset>v142</PlatformToolset>
36+
<PlatformToolset>v143</PlatformToolset>
3737
</PropertyGroup>
3838
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3939
<ConfigurationType>Application</ConfigurationType>
4040
<CharacterSet>MultiByte</CharacterSet>
41-
<PlatformToolset>v142</PlatformToolset>
41+
<PlatformToolset>v143</PlatformToolset>
4242
</PropertyGroup>
4343
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4444
<ConfigurationType>Application</ConfigurationType>
4545
<CharacterSet>MultiByte</CharacterSet>
46-
<PlatformToolset>v142</PlatformToolset>
46+
<PlatformToolset>v143</PlatformToolset>
4747
</PropertyGroup>
4848
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
4949
<ImportGroup Label="ExtensionSettings">

‎Mkfiles/vs/genmodule/genmodule.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,22 @@
2828
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
2929
<ConfigurationType>Application</ConfigurationType>
3030
<CharacterSet>MultiByte</CharacterSet>
31-
<PlatformToolset>v142</PlatformToolset>
31+
<PlatformToolset>v143</PlatformToolset>
3232
</PropertyGroup>
3333
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
3434
<ConfigurationType>Application</ConfigurationType>
3535
<CharacterSet>MultiByte</CharacterSet>
36-
<PlatformToolset>v142</PlatformToolset>
36+
<PlatformToolset>v143</PlatformToolset>
3737
</PropertyGroup>
3838
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3939
<ConfigurationType>Application</ConfigurationType>
4040
<CharacterSet>MultiByte</CharacterSet>
41-
<PlatformToolset>v142</PlatformToolset>
41+
<PlatformToolset>v143</PlatformToolset>
4242
</PropertyGroup>
4343
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4444
<ConfigurationType>Application</ConfigurationType>
4545
<CharacterSet>MultiByte</CharacterSet>
46-
<PlatformToolset>v142</PlatformToolset>
46+
<PlatformToolset>v143</PlatformToolset>
4747
</PropertyGroup>
4848
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
4949
<ImportGroup Label="ExtensionSettings">

‎Mkfiles/vs/genperf/genperf.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,22 @@
2828
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
2929
<ConfigurationType>Application</ConfigurationType>
3030
<CharacterSet>MultiByte</CharacterSet>
31-
<PlatformToolset>v142</PlatformToolset>
31+
<PlatformToolset>v143</PlatformToolset>
3232
</PropertyGroup>
3333
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
3434
<ConfigurationType>Application</ConfigurationType>
3535
<CharacterSet>MultiByte</CharacterSet>
36-
<PlatformToolset>v142</PlatformToolset>
36+
<PlatformToolset>v143</PlatformToolset>
3737
</PropertyGroup>
3838
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3939
<ConfigurationType>Application</ConfigurationType>
4040
<CharacterSet>MultiByte</CharacterSet>
41-
<PlatformToolset>v142</PlatformToolset>
41+
<PlatformToolset>v143</PlatformToolset>
4242
</PropertyGroup>
4343
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4444
<ConfigurationType>Application</ConfigurationType>
4545
<CharacterSet>MultiByte</CharacterSet>
46-
<PlatformToolset>v142</PlatformToolset>
46+
<PlatformToolset>v143</PlatformToolset>
4747
</PropertyGroup>
4848
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
4949
<ImportGroup Label="ExtensionSettings">

‎Mkfiles/vs/genstring/genstring.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,22 @@
2828
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
2929
<ConfigurationType>Application</ConfigurationType>
3030
<CharacterSet>MultiByte</CharacterSet>
31-
<PlatformToolset>v142</PlatformToolset>
31+
<PlatformToolset>v143</PlatformToolset>
3232
</PropertyGroup>
3333
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
3434
<ConfigurationType>Application</ConfigurationType>
3535
<CharacterSet>MultiByte</CharacterSet>
36-
<PlatformToolset>v142</PlatformToolset>
36+
<PlatformToolset>v143</PlatformToolset>
3737
</PropertyGroup>
3838
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3939
<ConfigurationType>Application</ConfigurationType>
4040
<CharacterSet>MultiByte</CharacterSet>
41-
<PlatformToolset>v142</PlatformToolset>
41+
<PlatformToolset>v143</PlatformToolset>
4242
</PropertyGroup>
4343
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4444
<ConfigurationType>Application</ConfigurationType>
4545
<CharacterSet>MultiByte</CharacterSet>
46-
<PlatformToolset>v142</PlatformToolset>
46+
<PlatformToolset>v143</PlatformToolset>
4747
</PropertyGroup>
4848
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
4949
<ImportGroup Label="ExtensionSettings">

‎Mkfiles/vs/genversion/genversion.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,22 @@
2828
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
2929
<ConfigurationType>Application</ConfigurationType>
3030
<CharacterSet>MultiByte</CharacterSet>
31-
<PlatformToolset>v142</PlatformToolset>
31+
<PlatformToolset>v143</PlatformToolset>
3232
</PropertyGroup>
3333
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
3434
<ConfigurationType>Application</ConfigurationType>
3535
<CharacterSet>MultiByte</CharacterSet>
36-
<PlatformToolset>v142</PlatformToolset>
36+
<PlatformToolset>v143</PlatformToolset>
3737
</PropertyGroup>
3838
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3939
<ConfigurationType>Application</ConfigurationType>
4040
<CharacterSet>MultiByte</CharacterSet>
41-
<PlatformToolset>v142</PlatformToolset>
41+
<PlatformToolset>v143</PlatformToolset>
4242
</PropertyGroup>
4343
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4444
<ConfigurationType>Application</ConfigurationType>
4545
<CharacterSet>MultiByte</CharacterSet>
46-
<PlatformToolset>v142</PlatformToolset>
46+
<PlatformToolset>v143</PlatformToolset>
4747
</PropertyGroup>
4848
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
4949
<ImportGroup Label="ExtensionSettings">

‎Mkfiles/vs/libyasm/libyasm.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,25 +28,25 @@
2828
<ConfigurationType>StaticLibrary</ConfigurationType>
2929
<UseOfMfc>false</UseOfMfc>
3030
<CharacterSet>MultiByte</CharacterSet>
31-
<PlatformToolset>v142</PlatformToolset>
31+
<PlatformToolset>v143</PlatformToolset>
3232
</PropertyGroup>
3333
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3434
<ConfigurationType>StaticLibrary</ConfigurationType>
3535
<UseOfMfc>false</UseOfMfc>
3636
<CharacterSet>MultiByte</CharacterSet>
37-
<PlatformToolset>v142</PlatformToolset>
37+
<PlatformToolset>v143</PlatformToolset>
3838
</PropertyGroup>
3939
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4040
<ConfigurationType>StaticLibrary</ConfigurationType>
4141
<UseOfMfc>false</UseOfMfc>
4242
<CharacterSet>MultiByte</CharacterSet>
43-
<PlatformToolset>v142</PlatformToolset>
43+
<PlatformToolset>v143</PlatformToolset>
4444
</PropertyGroup>
4545
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4646
<ConfigurationType>StaticLibrary</ConfigurationType>
4747
<UseOfMfc>false</UseOfMfc>
4848
<CharacterSet>MultiByte</CharacterSet>
49-
<PlatformToolset>v142</PlatformToolset>
49+
<PlatformToolset>v143</PlatformToolset>
5050
</PropertyGroup>
5151
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5252
<ImportGroup Label="ExtensionSettings">

‎Mkfiles/vs/modules/modules.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,25 +28,25 @@
2828
<ConfigurationType>StaticLibrary</ConfigurationType>
2929
<UseOfMfc>false</UseOfMfc>
3030
<CharacterSet>MultiByte</CharacterSet>
31-
<PlatformToolset>v142</PlatformToolset>
31+
<PlatformToolset>v143</PlatformToolset>
3232
</PropertyGroup>
3333
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3434
<ConfigurationType>StaticLibrary</ConfigurationType>
3535
<UseOfMfc>false</UseOfMfc>
3636
<CharacterSet>MultiByte</CharacterSet>
37-
<PlatformToolset>v142</PlatformToolset>
37+
<PlatformToolset>v143</PlatformToolset>
3838
</PropertyGroup>
3939
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4040
<ConfigurationType>StaticLibrary</ConfigurationType>
4141
<UseOfMfc>false</UseOfMfc>
4242
<CharacterSet>MultiByte</CharacterSet>
43-
<PlatformToolset>v142</PlatformToolset>
43+
<PlatformToolset>v143</PlatformToolset>
4444
</PropertyGroup>
4545
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4646
<ConfigurationType>StaticLibrary</ConfigurationType>
4747
<UseOfMfc>false</UseOfMfc>
4848
<CharacterSet>MultiByte</CharacterSet>
49-
<PlatformToolset>v142</PlatformToolset>
49+
<PlatformToolset>v143</PlatformToolset>
5050
</PropertyGroup>
5151
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5252
<ImportGroup Label="ExtensionSettings">

0 commit comments

Comments
 (0)