mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-27 10:57:34 +09:00
I Did Not Clobberbuild, What Happens Next Is Shocking
This commit is contained in:
parent
0f27590a85
commit
a03f914c47
1 changed files with 0 additions and 3 deletions
|
|
@ -28,8 +28,6 @@
|
|||
#elif defined(XP_DARWIN)
|
||||
#include "config_darwin64.h"
|
||||
#elif defined(XP_UNIX)
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
#if defined(__aarch64__)
|
||||
#include "config_unix_aarch64.h"
|
||||
#elif defined(__alpha) || defined(__alpha__)
|
||||
|
|
@ -41,7 +39,6 @@
|
|||
#elif defined(__loongarch64)
|
||||
#include "config_unix_loongarch64.h"
|
||||
#else
|
||||
>>>>>>> fb438829b5 (MoonchildProductions/UXP#2897: Fix ffvpx build on loongarch64)
|
||||
#if defined(HAVE_64BIT_BUILD)
|
||||
#include "config_unix64.h"
|
||||
#else
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue