From 86bf0775f86997b819030beb7c2c1950b9d51a2b Mon Sep 17 00:00:00 2001 From: ChristophFischer Date: Wed, 14 Oct 2026 14:58:10 +0200 Subject: [PATCH 1/2] neue makefile --- Startcode/main.c | 2 ++ Startcode/makefile | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/Startcode/main.c b/Startcode/main.c index 03da755..e8a3b20 100644 --- a/Startcode/main.c +++ b/Startcode/main.c @@ -36,6 +36,8 @@ int main(int argc, char *argv[]) // Create the word salad by placing words into grid placedWords = createWordSalad(wordSalad, SALAD_SIZE, words, wordCount); + + // TODO: // Check if all words were successfully placed // Start the game if successful diff --git a/Startcode/makefile b/Startcode/makefile index 7cf1d4c..bd18f6c 100644 --- a/Startcode/makefile +++ b/Startcode/makefile @@ -25,6 +25,11 @@ wordsalad_initial: # -------------------------- # Normales Spiel bauen # -------------------------- + +wordsalad_myversion: main.o input.o $(BINARIES)/libraylib.a + $(CC) $(CFLAGS) -o wordsalad_myversion main.o input.o$(BINARIES)/libraylib.a $(LDFLAGS) + + 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) From b9fd1b3553226ba57feea4d1a80db3764712c0b9 Mon Sep 17 00:00:00 2001 From: ChristophFischer Date: Wed, 14 Oct 2026 15:35:51 +0200 Subject: [PATCH 2/2] input.c mit makefile getestet --- Startcode/main.c | 9 ++++----- Startcode/makefile | 6 ++++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Startcode/main.c b/Startcode/main.c index e8a3b20..7931401 100644 --- a/Startcode/main.c +++ b/Startcode/main.c @@ -37,11 +37,10 @@ int main(int argc, char *argv[]) placedWords = createWordSalad(wordSalad, SALAD_SIZE, words, wordCount); - - // TODO: - // 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 diff --git a/Startcode/makefile b/Startcode/makefile index bd18f6c..b9298a3 100644 --- a/Startcode/makefile +++ b/Startcode/makefile @@ -26,9 +26,11 @@ wordsalad_initial: # Normales Spiel bauen # -------------------------- -wordsalad_myversion: main.o input.o $(BINARIES)/libraylib.a - $(CC) $(CFLAGS) -o wordsalad_myversion main.o input.o$(BINARIES)/libraylib.a $(LDFLAGS) +wordsalad_myversion: input.o $(BINARIES)/libwordsalad_complete.a $(BINARIES)/libraylib.a + $(CC) $(CFLAGS) -o wordsalad_myversion input.o $(BINARIES)/libwordsalad_complete.a $(BINARIES)/libraylib.a $(LDFLAGS) +wordsalad_2: main.o input.o $(BINARIES)/libwordsalad_complete.a $(BINARIES)/libraylib.a + $(CC) $(CFLAGS) -o wordsalad_2 main.o input.o $(BINARIES)/libwordsalad_complete.a $(BINARIES)/libraylib.a $(LDFLAGS) 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)