diff --git a/aedi/target/__init__.py b/aedi/target/__init__.py index b92f38b7..6579a93e 100644 --- a/aedi/target/__init__.py +++ b/aedi/target/__init__.py @@ -74,7 +74,6 @@ def targets(): ExpatTarget(), FmtTarget(), FreeTypeTarget(), - FtglTarget(), GlewTarget(), HarfBuzzTarget(), LuaTarget(), @@ -102,6 +101,7 @@ def targets(): # Obsolete libraries without binaries FreeImageTarget(), + FtglTarget(), WxWidgetsTarget(), # Tools diff --git a/aedi/target/library_tier2.py b/aedi/target/library_tier2.py index 82414159..e492ab71 100644 --- a/aedi/target/library_tier2.py +++ b/aedi/target/library_tier2.py @@ -134,27 +134,6 @@ class FreeTypeTarget(CMakeStaticDependencyTarget): self.update_text_file(cmake_module, update_linker_flags) -class FtglTarget(ConfigureMakeStaticDependencyTarget): - def __init__(self, name='ftgl'): - super().__init__(name) - - def prepare_source(self, state: BuildState): - state.download_source( - 'https://downloads.sourceforge.net/project/ftgl/FTGL%20Source/2.1.3~rc5/ftgl-2.1.3-rc5.tar.gz', - '5458d62122454869572d39f8aa85745fc05d5518001bcefa63bd6cbb8d26565b', - patches='ftgl-support-arm64') - - def detect(self, state: BuildState) -> bool: - return state.has_source_file('ftgl.pc.in') - - def configure(self, state: BuildState): - opts = state.options - opts['--with-glut-inc'] = '/dev/null' - opts['--with-glut-lib'] = '/dev/null' - - super().configure(state) - - class GlewTarget(CMakeStaticDependencyTarget): def __init__(self, name='glew'): super().__init__(name) diff --git a/aedi/target/library_tier3.py b/aedi/target/library_tier3.py index c13a011d..11316d0c 100644 --- a/aedi/target/library_tier3.py +++ b/aedi/target/library_tier3.py @@ -59,6 +59,27 @@ class FreeImageTarget(MakeTarget): self.write_pc_file(state, version='3.18.0', libs='-lfreeimage -lc++') +class FtglTarget(ConfigureMakeStaticDependencyTarget): + def __init__(self, name='ftgl'): + super().__init__(name) + + def prepare_source(self, state: BuildState): + state.download_source( + 'https://downloads.sourceforge.net/project/ftgl/FTGL%20Source/2.1.3~rc5/ftgl-2.1.3-rc5.tar.gz', + '5458d62122454869572d39f8aa85745fc05d5518001bcefa63bd6cbb8d26565b', + patches='ftgl-support-arm64') + + def detect(self, state: BuildState) -> bool: + return state.has_source_file('ftgl.pc.in') + + def configure(self, state: BuildState): + opts = state.options + opts['--with-glut-inc'] = '/dev/null' + opts['--with-glut-lib'] = '/dev/null' + + super().configure(state) + + class WxWidgetsTarget(CMakeStaticDependencyTarget): def __init__(self, name='wxwidgets'): super().__init__(name)