diff --git a/.gitignore b/.gitignore index 1c6fd0a..ac6c02f 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,5 @@ I2_Wortsalat/.idea/editor.xml I2_Wortsalat/.idea/I2_Wortsalat.iml I2_Wortsalat/.idea/modules.xml I2_Wortsalat/Start_Mac/main.o +I2_Wortsalat/Start_Mac/.DS_Store +I2_Wortsalat/Start_Mac/.DS_Store diff --git a/I2_Wortsalat/Start_Mac/.DS_Store b/I2_Wortsalat/Start_Mac/.DS_Store index 5008ddf..87b442e 100644 Binary files a/I2_Wortsalat/Start_Mac/.DS_Store and b/I2_Wortsalat/Start_Mac/.DS_Store differ diff --git a/I2_Wortsalat/Start_Mac/makefile b/I2_Wortsalat/Start_Mac/makefile index e537fd4..49654ae 100644 --- a/I2_Wortsalat/Start_Mac/makefile +++ b/I2_Wortsalat/Start_Mac/makefile @@ -3,46 +3,44 @@ CFLAGS = -g -Wall LDFLAGS = -framework OpenGL -framework CoreFoundation -framework CoreGraphics -framework IOKit -framework Cocoa -framework CoreVideo ARCH := $(shell uname -m) BINARIES = ./macos-$(ARCH) -raylibfolder = ./raylib + +raylib_folder = ./raylib unityfolder = ./unity # -------------------------- # initiales Spiel bauen # -------------------------- - wordsalad_initial: -$(CC) -o wordsalad_initial $(BINARIES)/libwordsalad_complete.a $(BINARIES)/libraylib.a $(LDFLAGS) + $(CC) -o wordsalad_initial $(BINARIES)/libwordsalad_complete.a $(BINARIES)/libraylib.a $(LDFLAGS) # -------------------------- # 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) + $(CC) $(CFLAGS) -o wordsalad main.o input.o game.o graphicalGame.o $(BINARIES)/libraylib.a $(LDFLAGS) main.o: main.c -$(CC) -c $(CFLAGS) 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 + $(CC) -c $(CFLAGS) game.c graphicalGame.o: graphicalGame.c -$(CC) -I$(raylibfolder) -c $(CFLAGS) graphicalGame.c + $(CC) -I$(raylibfolder) -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 - + $(CC) -Wall -I$(unityfolder) -o $(TEST_BIN) input.o game.o unit_tests.c $(BINARIES)/libunity.a # -------------------------- # Clean # -------------------------- - clean: -rm -f *.o wordsalad $(TEST_BIN) \ No newline at end of file + rm -f *.o wordsalad