diff --git a/aedi/target/__init__.py b/aedi/target/__init__.py
index 0e6d6801..f63a5c7c 100644
--- a/aedi/target/__init__.py
+++ b/aedi/target/__init__.py
@@ -53,7 +53,6 @@ def targets():
QuakespasmExpTarget(),
# Libraries needed for GZDoom and Raze
- BrotliTarget(),
Bzip2Target(),
FfiTarget(),
FlacTarget(),
@@ -98,6 +97,7 @@ def targets():
XmpTarget(),
# Obsolete libraries without binaries
+ BrotliTarget(),
ExpatTarget(),
FreeImageTarget(),
FreeTypeTarget(),
diff --git a/aedi/target/library_tier1.py b/aedi/target/library_tier1.py
index 039cc203..96ac6041 100644
--- a/aedi/target/library_tier1.py
+++ b/aedi/target/library_tier1.py
@@ -16,7 +16,6 @@
# along with this program. If not, see .
#
-import glob
import os
import shutil
import subprocess
@@ -26,33 +25,6 @@ from ..state import BuildState
from . import base
-class BrotliTarget(base.CMakeStaticDependencyTarget):
- def __init__(self, name='brotli'):
- super().__init__(name)
-
- def prepare_source(self, state: BuildState):
- state.download_source(
- 'https://github.com/google/brotli/archive/refs/tags/v1.0.9.tar.gz',
- 'f9e8d81d0405ba66d181529af42a3354f838c939095ff99930da6aa9cdf6fe46')
-
- def post_build(self, state: BuildState):
- super().post_build(state)
-
- dylib_pattern = str(state.install_path / 'lib/*.dylib')
- for dylib in glob.iglob(dylib_pattern):
- os.unlink(dylib)
-
- archive_suffix = '-static.a'
- archive_pattern = str(state.install_path / f'lib/*{archive_suffix}')
- for archive in glob.iglob(archive_pattern):
- no_suffix_name = archive.replace(archive_suffix, '.a')
- os.rename(archive, no_suffix_name)
-
- @staticmethod
- def _process_pkg_config(pcfile: Path, line: str) -> str:
- return line.replace('-R${libdir} ', '') if line.startswith('Libs:') else line
-
-
class Bzip2Target(base.MakeTarget):
def __init__(self, name='bzip2'):
super().__init__(name)
diff --git a/aedi/target/library_tier3.py b/aedi/target/library_tier3.py
index ab8046d4..61087522 100644
--- a/aedi/target/library_tier3.py
+++ b/aedi/target/library_tier3.py
@@ -16,6 +16,7 @@
# along with this program. If not, see .
#
+import glob
import os
import shutil
from pathlib import Path
@@ -24,6 +25,33 @@ from ..state import BuildState
from . import base
+class BrotliTarget(base.CMakeStaticDependencyTarget):
+ def __init__(self, name='brotli'):
+ super().__init__(name)
+
+ def prepare_source(self, state: BuildState):
+ state.download_source(
+ 'https://github.com/google/brotli/archive/refs/tags/v1.0.9.tar.gz',
+ 'f9e8d81d0405ba66d181529af42a3354f838c939095ff99930da6aa9cdf6fe46')
+
+ def post_build(self, state: BuildState):
+ super().post_build(state)
+
+ dylib_pattern = str(state.install_path / 'lib/*.dylib')
+ for dylib in glob.iglob(dylib_pattern):
+ os.unlink(dylib)
+
+ archive_suffix = '-static.a'
+ archive_pattern = str(state.install_path / f'lib/*{archive_suffix}')
+ for archive in glob.iglob(archive_pattern):
+ no_suffix_name = archive.replace(archive_suffix, '.a')
+ os.rename(archive, no_suffix_name)
+
+ @staticmethod
+ def _process_pkg_config(pcfile: Path, line: str) -> str:
+ return line.replace('-R${libdir} ', '') if line.startswith('Libs:') else line
+
+
class ExpatTarget(base.CMakeStaticDependencyTarget):
def __init__(self, name='expat'):
super().__init__(name)