diff --git a/Makefile b/Makefile index 1e5740b1..e1421f83 100644 --- a/Makefile +++ b/Makefile @@ -263,14 +263,6 @@ GODDARD_O_FILES := $(foreach file,$(GODDARD_C_FILES),$(BUILD_DIR)/$(file:.c=.o)) # Automatic dependency files DEP_FILES := $(O_FILES:.o=.d) $(GODDARD_O_FILES:.o=.d) $(BUILD_DIR)/$(LD_SCRIPT).d -# Files with GLOBAL_ASM blocks -ifeq ($(NON_MATCHING),0) - GLOBAL_ASM_C_FILES != grep -rl 'GLOBAL_ASM(' $(wildcard src/**/*.c) - GLOBAL_ASM_O_FILES = $(foreach file,$(GLOBAL_ASM_C_FILES),$(BUILD_DIR)/$(file:.c=.o)) - GLOBAL_ASM_DEP = $(BUILD_DIR)/src/audio/non_matching_dep -endif - - #==============================================================================# # Compiler Options # #==============================================================================# @@ -623,18 +615,6 @@ $(BUILD_DIR)/include/level_headers.h: levels/level_headers.h.in $(call print,Preprocessing level headers:,$<,$@) $(V)$(CPP) $(CPPFLAGS) -I . $< | sed -E 's|(.+)|#include "\1"|' > $@ -# Run asm_processor on files that have NON_MATCHING code -ifeq ($(NON_MATCHING),0) -$(GLOBAL_ASM_O_FILES): CC := $(V)$(PYTHON) $(TOOLS_DIR)/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) -- -endif - -# Rebuild files with 'GLOBAL_ASM' if the NON_MATCHING flag changes. -$(GLOBAL_ASM_O_FILES): $(GLOBAL_ASM_DEP).$(NON_MATCHING) -$(GLOBAL_ASM_DEP).$(NON_MATCHING): - @$(RM) $(GLOBAL_ASM_DEP).* - $(V)touch $@ - - #==============================================================================# # Compilation Recipes # #==============================================================================# diff --git a/include/macros.h b/include/macros.h index 803fc6c1..918716f9 100644 --- a/include/macros.h +++ b/include/macros.h @@ -12,10 +12,6 @@ // Since we are using both compilers to match iQue, ignore these errors. #ifndef EGCS_GCC -#ifndef __sgi -#define GLOBAL_ASM(...) -#endif - #if !defined(__sgi) && (!defined(NON_MATCHING) || !defined(AVOID_UB)) // asm-process isn't supported outside of IDO, and undefined behavior causes crashes. #error Matching build is only possible on IDO; please build with NON_MATCHING=1.