diff --git a/aedi/target/__init__.py b/aedi/target/__init__.py index 27f50599..aa870a56 100644 --- a/aedi/target/__init__.py +++ b/aedi/target/__init__.py @@ -126,6 +126,7 @@ def targets(): AutoconfTarget(), AutomakeTarget(), DzipTarget(), + EricWToolsTarget(), GlslangTarget(), M4Target(), P7ZipTarget(), diff --git a/aedi/target/tool_tier2.py b/aedi/target/tool_tier2.py index 89c2bf14..1e5d1d7a 100644 --- a/aedi/target/tool_tier2.py +++ b/aedi/target/tool_tier2.py @@ -57,6 +57,17 @@ class DzipTarget(base.CMakeStaticDependencyTarget): '9f057e35ef5ddda1a0911b8f877a41b2934669377cb053b45364ddb72716b520') +class EricWToolsTarget(base.CMakeStaticDependencyTarget): + def __init__(self, name='ericw-tools'): + super().__init__(name) + + def prepare_source(self, state: BuildState): + state.download_source( + 'https://github.com/ericwa/ericw-tools/archive/refs/tags/v0.18.1.tar.gz', + '97790e742d4c06f2e4285d96ada597bb3c95a2623b8c5e67a14753d9735d4564', + patches='ericw-tools-hardcode-version') + + class GlslangTarget(base.CMakeStaticDependencyTarget): # Build with --os-version-x64=10.15 command line option diff --git a/patch/ericw-tools-hardcode-version.diff b/patch/ericw-tools-hardcode-version.diff new file mode 100644 index 00000000..5e434a19 --- /dev/null +++ b/patch/ericw-tools-hardcode-version.diff @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -108,7 +108,7 @@ + set(CMAKE_C_STANDARD 99) + endif () + +-add_definitions(-DERICWTOOLS_VERSION=${GIT_DESCRIBE}) ++add_definitions(-DERICWTOOLS_VERSION=v0.18.1) + + if (MSVC) + add_definitions("/DWIN32")