diff --git a/Start_Mac/main.c b/Start_Mac/main.c index 1e1f25a..62911d7 100644 --- a/Start_Mac/main.c +++ b/Start_Mac/main.c @@ -42,7 +42,7 @@ int main(int argc, char *argv[]) if(placedWords == wordCount) { // Start the game if successful - startGame(wordSalad,SALAD_SIZE,words,wordCount,900); + startGame(wordSalad,SALAD_SIZE,words,wordCount,600); // welche Variable wird für windowWidth gewählt? } else diff --git a/Start_Mac/makefile b/Start_Mac/makefile index 49654ae..b9ac347 100644 --- a/Start_Mac/makefile +++ b/Start_Mac/makefile @@ -3,24 +3,20 @@ CFLAGS = -g -Wall LDFLAGS = -framework OpenGL -framework CoreFoundation -framework CoreGraphics -framework IOKit -framework Cocoa -framework CoreVideo ARCH := $(shell uname -m) BINARIES = ./macos-$(ARCH) - -raylib_folder = ./raylib unityfolder = ./unity -# -------------------------- -# initiales Spiel bauen -# -------------------------- -wordsalad_initial: - $(CC) -o wordsalad_initial $(BINARIES)/libwordsalad_complete.a $(BINARIES)/libraylib.a $(LDFLAGS) +RAYLIB_PATH = $(shell brew --prefix raylib) +RAYLIB_INCLUDE = -I$(RAYLIB_PATH)/include +RAYLIB_LIB = -L$(RAYLIB_PATH)/lib -lraylib -# -------------------------- -# Normales Spiel bauen -# -------------------------- -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) +wordsalad_initial: + $(CC) -o wordsalad_initial $(BINARIES)/libwordsalad_complete.a $(RAYLIB_LIB) $(LDFLAGS) + +wordsalad: main.o input.o game.o graphicalGame.o + $(CC) $(CFLAGS) -o wordsalad main.o input.o game.o graphicalGame.o $(RAYLIB_LIB) $(LDFLAGS) main.o: main.c - $(CC) -c $(CFLAGS) main.c + $(CC) -c $(CFLAGS) $(RAYLIB_INCLUDE) main.c input.o: input.c $(CC) -c $(CFLAGS) input.c @@ -29,18 +25,11 @@ game.o: game.c $(CC) -c $(CFLAGS) game.c graphicalGame.o: graphicalGame.c - $(CC) -I$(raylibfolder) -c $(CFLAGS) graphicalGame.c + $(CC) -c $(CFLAGS) $(RAYLIB_INCLUDE) 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 -# -------------------------- -# Clean -# -------------------------- + clean: - rm -f *.o wordsalad + rm -f *.o wordsalad wordsalad_initial $(TEST_BIN) \ No newline at end of file