From 9d57dbffddf49bf158446e162e476194058ad95a Mon Sep 17 00:00:00 2001 From: goettschejo Date: Sun, 11 Oct 2026 21:16:57 +0200 Subject: [PATCH] Aufgabe 1 - makefile angepasst / main.c TODOs erledigt --- Startcode/main.c | 10 +++++++++- Startcode/makefile | 6 ++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Startcode/main.c b/Startcode/main.c index 03da755..e6f9736 100644 --- a/Startcode/main.c +++ b/Startcode/main.c @@ -40,7 +40,15 @@ int main(int argc, char *argv[]) // Check if all words were successfully placed // Start the game if successful // error message if some words couldn't be placed - + if(placedWords == wordCount) + { + startGame(wordSalad, SALAD_SIZE, words, wordCount, 800); + } + else + { + fprintf(stderr, "Could not place all words (%u of %u placed) ...\n", placedWords, wordCount); + exitCode = EXIT_FAILURE; + } } else { diff --git a/Startcode/makefile b/Startcode/makefile index 7cf1d4c..3e71abf 100644 --- a/Startcode/makefile +++ b/Startcode/makefile @@ -28,6 +28,12 @@ wordsalad_initial: wordsalad: 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) +# -------------------------- +# Eigene main.c + Bibliothek (input.o, game.o) bauen +# -------------------------- +wordsalad_myversion: main.o graphicalGame.o $(BINARIES)/libwordsalad.a $(BINARIES)/libraylib.a + $(CC) $(CFLAGS) -o wordsalad_myversion main.o graphicalGame.o $(BINARIES)/libwordsalad.a $(BINARIES)/libraylib.a $(LDFLAGS) + main.o: $(codefolder)/main.c $(CC) -c $(CFLAGS) $(codefolder)/main.c