From e4d9589ba89a556ecbb716fdc84e5b44efd262e0 Mon Sep 17 00:00:00 2001 From: Shaun Inman Date: Sat, 18 Mar 2023 19:31:26 -0400 Subject: [PATCH] too many main.c files, renamed to match elf output --- src/clock/{main.c => clock.c} | 0 src/clock/makefile | 6 +++--- src/minarch/makefile | 6 +++--- src/minarch/{main.c => minarch.c} | 0 src/minui/makefile | 6 +++--- src/minui/{main.c => minui.c} | 0 6 files changed, 9 insertions(+), 9 deletions(-) rename src/clock/{main.c => clock.c} (100%) rename src/minarch/{main.c => minarch.c} (100%) rename src/minui/{main.c => minui.c} (100%) diff --git a/src/clock/main.c b/src/clock/clock.c similarity index 100% rename from src/clock/main.c rename to src/clock/clock.c diff --git a/src/clock/makefile b/src/clock/makefile index 1f0b722..c9d5432 100644 --- a/src/clock/makefile +++ b/src/clock/makefile @@ -2,7 +2,7 @@ ifeq (,$(CROSS_COMPILE)) $(error missing CROSS_COMPILE for this toolchain) endif -TARGET = clock.elf +TARGET = clock CC = $(CROSS_COMPILE)gcc CFLAGS = -marm -mtune=cortex-a9 -mfpu=neon-fp16 -mfloat-abi=hard -march=armv7-a -fomit-frame-pointer @@ -10,6 +10,6 @@ CFLAGS += -I. -I../common -DPLATFORM=\"$(UNION_PLATFORM)\" LDFLAGS = -ldl -lSDL -lSDL_image -lSDL_ttf -lmsettings -lpthread all: - $(CC) main.c ../common/utils.c ../common/api.c -o $(TARGET) $(CFLAGS) $(LDFLAGS) + $(CC) $(TARGET).c ../common/utils.c ../common/api.c -o $(TARGET).elf $(CFLAGS) $(LDFLAGS) clean: - rm -f $(TARGET) \ No newline at end of file + rm -f $(TARGET).elf diff --git a/src/minarch/makefile b/src/minarch/makefile index b8ecb1c..60e9d9a 100644 --- a/src/minarch/makefile +++ b/src/minarch/makefile @@ -2,7 +2,7 @@ ifeq (,$(CROSS_COMPILE)) $(error missing CROSS_COMPILE for this toolchain) endif -TARGET = minarch.elf +TARGET = minarch CC = $(CROSS_COMPILE)gcc CFLAGS = -marm -mtune=cortex-a9 -mfpu=neon-fp16 -mfloat-abi=hard -march=armv7-a -fomit-frame-pointer @@ -17,6 +17,6 @@ BUILD_HASH!=git rev-parse --short HEAD CFLAGS += -DBUILD_DATE=\"${BUILD_DATE}\" -DBUILD_HASH=\"${BUILD_HASH}\" all: - $(CC) main.c ../common/scaler_neon.c ../common/utils.c ../common/api.c -o $(TARGET) $(CFLAGS) $(LDFLAGS) + $(CC) $(TARGET).c ../common/scaler_neon.c ../common/utils.c ../common/api.c -o $(TARGET).elf $(CFLAGS) $(LDFLAGS) clean: - rm -f $(TARGET) \ No newline at end of file + rm -f $(TARGET).elf \ No newline at end of file diff --git a/src/minarch/main.c b/src/minarch/minarch.c similarity index 100% rename from src/minarch/main.c rename to src/minarch/minarch.c diff --git a/src/minui/makefile b/src/minui/makefile index b246416..73fdc03 100644 --- a/src/minui/makefile +++ b/src/minui/makefile @@ -2,7 +2,7 @@ ifeq (,$(CROSS_COMPILE)) $(error missing CROSS_COMPILE for this toolchain) endif -TARGET = minui.elf +TARGET = minui CC = $(CROSS_COMPILE)gcc CFLAGS = -marm -mtune=cortex-a9 -mfpu=neon-fp16 -mfloat-abi=hard -march=armv7-a -fomit-frame-pointer @@ -12,6 +12,6 @@ LDFLAGS = -ldl -lSDL -lSDL_image -lSDL_ttf -lmsettings -lpthread # LDFLAGS += -lasan all: - $(CC) main.c ../common/utils.c ../common/api.c -o $(TARGET) $(CFLAGS) $(LDFLAGS) + $(CC) $(TARGET).c ../common/utils.c ../common/api.c -o $(TARGET).elf $(CFLAGS) $(LDFLAGS) clean: - rm -f $(TARGET) \ No newline at end of file + rm -f $(TARGET).elf \ No newline at end of file diff --git a/src/minui/main.c b/src/minui/minui.c similarity index 100% rename from src/minui/main.c rename to src/minui/minui.c