aedi: keep only one lzdoom target, 3.x

This commit is contained in:
alexey.lysiuk 2021-08-01 12:43:57 +03:00
parent 25310c6080
commit 0d04ae835f
2 changed files with 2 additions and 14 deletions

View file

@ -28,7 +28,6 @@ def targets():
GZDoomTarget(), GZDoomTarget(),
QZDoomTarget(), QZDoomTarget(),
LZDoomTarget(), LZDoomTarget(),
LZDoom3Target(),
RazeTarget(), RazeTarget(),
AccTarget(), AccTarget(),
SladeTarget(), SladeTarget(),

View file

@ -125,20 +125,9 @@ class QZDoomTarget(ZDoomVulkanBaseTarget):
state.checkout_git('https://github.com/madame-rachelle/qzdoom.git') state.checkout_git('https://github.com/madame-rachelle/qzdoom.git')
class LZDoomTarget(ZDoomVulkanBaseTarget): class LZDoomTarget(ZDoomBaseTarget):
def __init__(self, name='lzdoom'): def __init__(self, name='lzdoom'):
super().__init__(name) super().__init__(name)
def prepare_source(self, state: BuildState):
state.checkout_git('https://github.com/drfrag666/gzdoom.git')
def detect(self, state: BuildState) -> bool:
return super().detect(state) and not state.has_source_file('libraries/zmusic')
class LZDoom3Target(ZDoomBaseTarget):
def __init__(self, name='lzdoom3'):
super().__init__(name)
self.unsupported_architectures = ('arm64',) self.unsupported_architectures = ('arm64',)
opts = self.options opts = self.options
@ -150,7 +139,7 @@ class LZDoom3Target(ZDoomBaseTarget):
state.checkout_git('https://github.com/drfrag666/gzdoom.git', branch='g3.3mgw') state.checkout_git('https://github.com/drfrag666/gzdoom.git', branch='g3.3mgw')
def detect(self, state: BuildState) -> bool: def detect(self, state: BuildState) -> bool:
return state.has_source_file('ico_lzdoom.png') and state.has_source_file('libraries/zmusic') return state.has_source_file('ico_lzdoom.png')
class RazeTarget(ZDoomVulkanBaseTarget): class RazeTarget(ZDoomVulkanBaseTarget):