From 92c0ab2c28223bc13c4e168ed577a2ee97dc4871 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Schr=C3=B6der?= Date: Thu, 16 Oct 2025 13:48:45 +0200 Subject: [PATCH 1/4] macOS lib Ordner umbenannt (x86_64) --- Start_Mac/{macos-x64 => macos-x86_64}/libraylib.a | Bin Start_Mac/{macos-x64 => macos-x86_64}/libunity.a | Bin .../{macos-x64 => macos-x86_64}/libwordsalad.a | Bin .../libwordsalad_complete.a | Bin 4 files changed, 0 insertions(+), 0 deletions(-) rename Start_Mac/{macos-x64 => macos-x86_64}/libraylib.a (100%) rename Start_Mac/{macos-x64 => macos-x86_64}/libunity.a (100%) rename Start_Mac/{macos-x64 => macos-x86_64}/libwordsalad.a (100%) rename Start_Mac/{macos-x64 => macos-x86_64}/libwordsalad_complete.a (100%) diff --git a/Start_Mac/macos-x64/libraylib.a b/Start_Mac/macos-x86_64/libraylib.a similarity index 100% rename from Start_Mac/macos-x64/libraylib.a rename to Start_Mac/macos-x86_64/libraylib.a diff --git a/Start_Mac/macos-x64/libunity.a b/Start_Mac/macos-x86_64/libunity.a similarity index 100% rename from Start_Mac/macos-x64/libunity.a rename to Start_Mac/macos-x86_64/libunity.a diff --git a/Start_Mac/macos-x64/libwordsalad.a b/Start_Mac/macos-x86_64/libwordsalad.a similarity index 100% rename from Start_Mac/macos-x64/libwordsalad.a rename to Start_Mac/macos-x86_64/libwordsalad.a diff --git a/Start_Mac/macos-x64/libwordsalad_complete.a b/Start_Mac/macos-x86_64/libwordsalad_complete.a similarity index 100% rename from Start_Mac/macos-x64/libwordsalad_complete.a rename to Start_Mac/macos-x86_64/libwordsalad_complete.a -- 2.47.2 From 6b435cf82d7136acebda4ca7b5921fda4b5b4c60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Schr=C3=B6der?= Date: Mon, 20 Oct 2025 14:39:05 +0200 Subject: [PATCH 2/4] Fix makefiles. --- Start_Linux/makefile | 6 +++--- Start_Mac/makefile | 2 +- Start_Windows/makefile | 7 +++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Start_Linux/makefile b/Start_Linux/makefile index 096695a..a8d8f59 100644 --- a/Start_Linux/makefile +++ b/Start_Linux/makefile @@ -1,9 +1,9 @@ CC = gcc -CFLAGS = -g -Wall -I$(raylibfolder) +CFLAGS = -g -Wall LDFLAGS = -lGL -lX11 -lm BINARIES = ./linux -raylib_folder = ./raylib +raylibfolder = ./raylib unityfolder = ./unity # -------------------------- @@ -28,7 +28,7 @@ game.o: game.c $(CC) $(CFLAGS) -c game.c graphicalGame.o: graphicalGame.c - $(CC) $(CFLAGS) -c graphicalGame.c + $(CC) $(CFLAGS) -I$(raylibfolder) -c graphicalGame.c # -------------------------- # Unit Tests diff --git a/Start_Mac/makefile b/Start_Mac/makefile index 49654ae..5e659e4 100644 --- a/Start_Mac/makefile +++ b/Start_Mac/makefile @@ -4,7 +4,7 @@ LDFLAGS = -framework OpenGL -framework CoreFoundation -framework CoreGraphics -f ARCH := $(shell uname -m) BINARIES = ./macos-$(ARCH) -raylib_folder = ./raylib +raylibfolder = ./raylib unityfolder = ./unity # -------------------------- diff --git a/Start_Windows/makefile b/Start_Windows/makefile index 146a8c6..2529cce 100644 --- a/Start_Windows/makefile +++ b/Start_Windows/makefile @@ -1,9 +1,9 @@ CC = gcc -CFLAGS = -g -Wall -I$(raylibfolder) +CFLAGS = -g -Wall LDFLAGS = -lopengl32 -lgdi32 -lwinmm BINARIES = ./windows -raylib_folder = ./raylib +raylibfolder = ./raylib unityfolder = ./unity # -------------------------- @@ -12,7 +12,6 @@ unityfolder = ./unity wordsalad_initial: $(CC) -o wordsalad_initial $(BINARIES)/libwordsalad_complete.a $(BINARIES)/libraylib.a $(LDFLAGS) - # -------------------------- # Normales Spiel bauen # -------------------------- @@ -29,7 +28,7 @@ game.o: game.c $(CC) -c $(CFLAGS) game.c graphicalGame.o: graphicalGame.c - $(CC) -I$(raylib_folder) -c $(CFLAGS) graphicalGame.c + $(CC) -I$(raylibfolder) -c $(CFLAGS) graphicalGame.c # -------------------------- # Unit Tests -- 2.47.2 From 1ed03a34448689735b942fc0bd589fbbad417e14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Schr=C3=B6der?= Date: Tue, 21 Oct 2025 11:24:14 +0200 Subject: [PATCH 3/4] Windows Makefile korrigiert --- Start_Windows/makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Start_Windows/makefile b/Start_Windows/makefile index 2529cce..72cccb7 100644 --- a/Start_Windows/makefile +++ b/Start_Windows/makefile @@ -22,7 +22,7 @@ main.o: main.c $(CC) -c $(CFLAGS) main.c input.o: input.c - $(CC) -c $(CFLAGS)input.c + $(CC) -c $(CFLAGS) input.c game.o: game.c $(CC) -c $(CFLAGS) game.c -- 2.47.2 From e20bf82c19448aefe0a1efaf1d884876b0f794ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Schr=C3=B6der?= Date: Tue, 21 Oct 2025 11:45:37 +0200 Subject: [PATCH 4/4] Makefile angepasst --- Start_Mac/makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Start_Mac/makefile b/Start_Mac/makefile index 5e659e4..1d3b4a6 100644 --- a/Start_Mac/makefile +++ b/Start_Mac/makefile @@ -43,4 +43,4 @@ test: input.o game.o unit_tests.c $(BINARIES)/libunity.a # Clean # -------------------------- clean: - rm -f *.o wordsalad + rm -f *.o wordsalad $(TEST_BIN) -- 2.47.2