mirror of
https://github.com/libsdl-org/SDL.git
synced 2026-07-31 12:38:58 +00:00
windows: vendor GameInput headers
This commit is contained in:
committed by
Anonymous Maarten
parent
331e10c2a3
commit
b048e8e6f8
15
.github/workflows/create-test-plan.py
vendored
15
.github/workflows/create-test-plan.py
vendored
@@ -244,8 +244,6 @@ class JobDetails:
|
||||
msys2_packages: list[str] = dataclasses.field(default_factory=list)
|
||||
cygwin_packages: list[str] = dataclasses.field(default_factory=list)
|
||||
werror: bool = True
|
||||
microsoft_gameinput: bool = False
|
||||
microsoft_gameinput_arch: str = ""
|
||||
msvc_vcvars_arch: str = ""
|
||||
msvc_vcvars_sdk: str = ""
|
||||
msvc_project: str = ""
|
||||
@@ -316,8 +314,6 @@ class JobDetails:
|
||||
"android-mk": self.android_mk,
|
||||
"werror": self.werror,
|
||||
"sudo": self.sudo,
|
||||
"microsoft-gameinput": self.microsoft_gameinput,
|
||||
"microsoft-gameinput-arch": self.microsoft_gameinput_arch,
|
||||
"msvc-vcvars-arch": self.msvc_vcvars_arch,
|
||||
"msvc-vcvars-sdk": self.msvc_vcvars_sdk,
|
||||
"msvc-project": self.msvc_project,
|
||||
@@ -483,14 +479,6 @@ def spec_to_job(spec: JobSpec, key: str, trackmem_symbol_names: bool, ctest_args
|
||||
job.setup_libusb_arch = "x86"
|
||||
case MsvcArch.X64:
|
||||
job.setup_libusb_arch = "x64"
|
||||
job.microsoft_gameinput = True
|
||||
match spec.msvc_arch:
|
||||
case MsvcArch.X64:
|
||||
job.microsoft_gameinput_arch = "x64"
|
||||
case MsvcArch.Arm64:
|
||||
job.microsoft_gameinput_arch = "arm64"
|
||||
job.cflags.append("-I$GAMEINPUT_INCLUDE")
|
||||
job.cxxflags.append("-I$GAMEINPUT_INCLUDE")
|
||||
case SdlPlatform.Linux:
|
||||
if spec.name.startswith("Ubuntu"):
|
||||
assert spec.os.value.startswith("ubuntu-")
|
||||
@@ -827,9 +815,6 @@ def spec_to_job(spec: JobSpec, key: str, trackmem_symbol_names: bool, ctest_args
|
||||
job.msys2_packages.append(f"{msys2_env}-clang-tools-extra")
|
||||
if job.ccache:
|
||||
job.msys2_packages.append(f"{msys2_env}-ccache")
|
||||
job.microsoft_gameinput = True
|
||||
job.cflags.append("-I$GAMEINPUT_INCLUDE")
|
||||
job.cxxflags.append("-I$GAMEINPUT_INCLUDE")
|
||||
case SdlPlatform.Cygwin:
|
||||
job.ccache = False # Missing evict-older-than option
|
||||
job.clang_tidy = False # error finding files [clang-diagnostic-error] cause might be space in command path
|
||||
|
||||
7
.github/workflows/generic.yml
vendored
7
.github/workflows/generic.yml
vendored
@@ -176,13 +176,6 @@ jobs:
|
||||
echo '#error "System SDL headers must not be used by build system"' >"$dest"
|
||||
done
|
||||
done
|
||||
- name: 'Set up Microsoft.GameInput headers'
|
||||
if: ${{ !!matrix.platform.microsoft-gameinput }}
|
||||
run: |
|
||||
python build-scripts/download-gameinput-sdk.py -o $HOME/gameinput
|
||||
echo "GAMEINPUT_INCLUDE=$(cygpath -w "$HOME/gameinput/include")" >>$GITHUB_ENV
|
||||
echo "INCLUDE=$(cygpath -w "$HOME/gameinput/include");$INCLUDE" >>$GITHUB_ENV
|
||||
${{ (!!matrix.platform.microsoft-gameinput-arch && format('echo "LIB=$(cygpath -w "$HOME/gameinput/lib/{0}");$LIB" >>$GITHUB_ENV', matrix.platform.microsoft-gameinput-arch)) || '' }}
|
||||
- name: 'Calculate ccache key'
|
||||
if: ${{ matrix.platform.ccache }}
|
||||
id: prepare-restore-ccache
|
||||
|
||||
Reference in New Issue
Block a user