wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-09 17:31:47 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix merge-conflict markers in moz.build (whoops)

Browse source
This commit is contained in:
wuggy 2026-04-23 22:21:46 -07:00
commit 224f4ac229
2 changed files with 0 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
media/ffvpx/libavcodec/moz.build
View file

@ -8,16 +8,12 @@
if CONFIG['FFVPX_ASFLAGS']:
DIRS += ['x86']
<<<<<<< HEAD
# 'dummy_funcs.c',
=======
if CONFIG['CPU_ARCH'] == 'aarch64':
DIRS += ['aarch64']
elif CONFIG['CPU_ARCH'].startswith('ppc'):
DIRS += ['ppc']
elif CONFIG['CPU_ARCH'].startswith('loongarch64'):
DIRS += ['loongarch']
>>>>>>> fb438829b5 (MoonchildProductions/UXP#2897: Fix ffvpx build on loongarch64)
SharedLibrary('mozavcodec')
SOURCES += [

4
media/ffvpx/libavutil/moz.build
View file

@ -6,9 +6,6 @@
# Due to duplicate file names, we compile libavutil/x86 in its own
# moz.build file.
if CONFIG['FFVPX_ASFLAGS']:
<<<<<<< HEAD
DIRS += ['x86']
=======
if CONFIG['CPU_ARCH'].startswith('x86'):
DIRS += ['x86']
elif CONFIG['CPU_ARCH'].startswith('arm'):
@ -20,7 +17,6 @@ elif CONFIG['CPU_ARCH'].startswith('ppc'):
DIRS += ['ppc']
elif CONFIG['CPU_ARCH'].startswith('loongarch64'):
DIRS += ['loongarch']
>>>>>>> fb438829b5 (MoonchildProductions/UXP#2897: Fix ffvpx build on loongarch64)
SharedLibrary('mozavutil')