Merge pull request #21 from libretro/revert-18-libretro_neon

Revert "added HAVE_NEON flag to enable building of src/util/arm-algo.S"
libretro · Oct 18, 2015 · e801060 · e801060
2 parents 25a2497 + 2d1e662
commit e801060
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/Makefile.libretro b/Makefile.libretro
@@ -286,7 +286,7 @@ endif
 
 include $(BUILD_DIR)/Makefile.common
 
-OBJS := $(SOURCES_C:.c=.o) $(SOURCES_ASM:.S=.o)
+OBJS := $(SOURCES_C:.c=.o)
 
 DEFINES += $(PLATFORM_DEFINES) $(RETRODEFS)
 
@@ -296,9 +296,6 @@ LIBS :=
 
 %.o: %.c
 	$(CC) -c -o $@ $< $(CFLAGS) $(INCLUDES)
-%.o: %.S
-	$(CC) -c -o $@ $< $(CFLAGS) $(INCLUDES)
-
 
 ifeq ($(platform), theos_ios)
 COMMON_FLAGS := -DIOS $(COMMON_DEFINES) $(INCLUDES) -I$(THEOS_INCLUDE_PATH) -Wno-error

diff --git a/libretro-build/Makefile.common b/libretro-build/Makefile.common
@@ -63,10 +63,6 @@ SOURCES_C :=   $(CORE_DIR)/src/arm/arm.c \
 					$(CORE_DIR)/src/third-party/blip_buf/blip_buf.c \
 					$(CORE_DIR)/src/util/crc32.c
 
-#ifeq ($(HAVE_NEON),1)
-SOURCES_ASM += $(CORE_DIR)/src/util/arm-algo.S
-#endif
-
 ifeq ($(HAVE_VFS_FD),1)
 ifeq ($(platform), vita)
 SOURCES_C += $(CORE_DIR)/src/platform/psp2/sce-vfs.c