Skip to content

Commit 16c9a7c

Browse files
committed
COnsolidate metal_renderer.m
1 parent cadeb6c commit 16c9a7c

6 files changed

Lines changed: 1413 additions & 1448 deletions

File tree

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,6 @@ $(OBJDIR)/%.o: %.m
273273
# compile under ARC — so we cannot set -fobjc-arc globally. Xcode does
274274
# the equivalent via per-file CLANG_ENABLE_OBJC_ARC=YES build settings.
275275
$(OBJDIR)/gfx/drivers/metal.o: OBJCFLAGS += -fobjc-arc
276-
$(OBJDIR)/gfx/common/metal/metal_renderer.o: OBJCFLAGS += -fobjc-arc
277276
$(OBJDIR)/input/drivers_joypad/mfi_joypad.o: OBJCFLAGS += -fobjc-arc
278277

279278
$(OBJDIR)/%.o: %.S config.h config.mk $(HEADERS)

Makefile.common

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1644,12 +1644,10 @@ endif
16441644
ifeq ($(HAVE_METAL), 1)
16451645
DEFINES += -DHAVE_METAL
16461646
LIBS += -framework Metal -framework MetalKit -framework QuartzCore
1647-
# Metal code (metal.m, metal_renderer.m) relies on ARC. Enabled per-file
1648-
# via an override in the top-level Makefile, since applying -fobjc-arc
1649-
# globally would break the MRC-written Cocoa code (ui_cocoa.m et al.).
1650-
OBJ += \
1651-
gfx/common/metal/metal_renderer.o \
1652-
gfx/drivers/metal.o
1647+
# Metal code (metal.m) relies on ARC. Enabled per-file via an override
1648+
# in the top-level Makefile, since applying -fobjc-arc globally would
1649+
# break the MRC-written Cocoa code (ui_cocoa.m et al.).
1650+
OBJ += gfx/drivers/metal.o
16531651
endif
16541652

16551653
ifeq ($(HAVE_MFI), 1)

0 commit comments

Comments
 (0)