From 4892e33b7640e151c4bbe612216705e8c232bb41 Mon Sep 17 00:00:00 2001 From: Florian Wetzel Date: Thu, 30 Oct 2025 15:06:44 +0100 Subject: [PATCH] =?UTF-8?q?=C3=84nderungen=20Flo=20f=C3=BCr=20Mac=20Macefi?= =?UTF-8?q?le?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Start_Mac/makefile | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/Start_Mac/makefile b/Start_Mac/makefile index 49654ae..385e1b7 100644 --- a/Start_Mac/makefile +++ b/Start_Mac/makefile @@ -1,22 +1,29 @@ CC = gcc CFLAGS = -g -Wall -LDFLAGS = -framework OpenGL -framework CoreFoundation -framework CoreGraphics -framework IOKit -framework Cocoa -framework CoreVideo +LDFLAGS = -framework OpenGL -framework Cocoa -framework IOKit -framework CoreVideo + +# Architektur automatisch erkennen (arm64 oder x86_64) ARCH := $(shell uname -m) -BINARIES = ./macos-$(ARCH) + +ifeq ($(ARCH),arm64) + BINARIES = ./macos-arm64 +else + BINARIES = ./macos-x64 +endif raylib_folder = ./raylib unityfolder = ./unity # -------------------------- -# initiales Spiel bauen +# eigenes Spiel bauen # -------------------------- -wordsalad_initial: - $(CC) -o wordsalad_initial $(BINARIES)/libwordsalad_complete.a $(BINARIES)/libraylib.a $(LDFLAGS) +wordsalad_myversion: main.o graphicalGame.o $(BINARIES)/libwordsalad.a $(BINARIES)/libraylib.a + $(CC) $(CFLAGS) -o wordsalad_myversion main.c graphicalGame.c $(BINARIES)/libwordsalad.a $(BINARIES)/libraylib.a $(LDFLAGS) # -------------------------- # Normales Spiel bauen # -------------------------- -wordsalad: main.o input.o game.o graphicalGame.o $(BINARIES)/libraylib.a +all: main.o input.o game.o graphicalGame.o $(BINARIES)/libraylib.a $(CC) $(CFLAGS) -o wordsalad main.o input.o game.o graphicalGame.o $(BINARIES)/libraylib.a $(LDFLAGS) main.o: main.c @@ -29,18 +36,18 @@ game.o: game.c $(CC) -c $(CFLAGS) game.c graphicalGame.o: graphicalGame.c - $(CC) -I$(raylibfolder) -c $(CFLAGS) graphicalGame.c - + $(CC) -I$(raylib_folder) -c $(CFLAGS) graphicalGame.c # -------------------------- # Unit Tests # -------------------------- TEST_BIN = runTests -test: input.o game.o unit_tests.c $(BINARIES)/libunity.a - $(CC) -Wall -I$(unityfolder) -o $(TEST_BIN) input.o game.o unit_tests.c $(BINARIES)/libunity.a +test: input.o game.o unit_tests.c + $(CC) $(CFLAGS) -I$(unityfolder) -o $(TEST_BIN) input.o game.o unit_tests.c $(BINARIES)/libunity.a + # -------------------------- # Clean # -------------------------- clean: - rm -f *.o wordsalad + rm -f *.o wordsalad wordsalad_myversion $(TEST_BIN) \ No newline at end of file