Merge remote-tracking branch 'irixxxx/master' into master

libretro · Jun 15, 2024 · 535217f · 535217f
2 parents f13350c + e8ca108
commit 535217f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -337,9 +337,9 @@ ZSTD_OBJS += $(ZSTD)/common/entropy_common.o $(ZSTD)/common/error_private.o
 ZSTD_OBJS += $(ZSTD)/common/fse_decompress.o $(ZSTD)/common/xxhash.o
 ZSTD_OBJS += $(ZSTD)/common/zstd_common.o
 ZSTD_OBJS += $(ZSTD)/decompress/huf_decompress.o
-#ifneq (,$(filter x86%, $(ARCH)))
+ifneq (,$(filter x86%, $(ARCH)))
 ZSTD_OBJS += $(ZSTD)/decompress/huf_decompress_amd64.o
-#endif
+endif
 ZSTD_OBJS += $(ZSTD)/decompress/zstd_ddict.o
 ZSTD_OBJS += $(ZSTD)/decompress/zstd_decompress_block.o
 ZSTD_OBJS += $(ZSTD)/decompress/zstd_decompress.o

diff --git a/Makefile.libretro b/Makefile.libretro
@@ -67,7 +67,7 @@ endif
 # x86/x86_64 generic
 else ifneq (,$(findstring x86,$(platform)))
 	TARGET := $(TARGET_NAME)_libretro.so
-	ARCH := 86
+	ARCH := x86
         fpic := -fPIC
 	SHARED := -shared
 	CFLAGS += -DFAMEC_NO_GOTOS