main geändert, makefile geändert
This commit is contained in:
+21
-14
@@ -1,17 +1,17 @@
|
||||
CC = gcc # Compiler-Variable: welcher C-Compiler genutzt wird (hier gcc)
|
||||
CFLAGS = -g -Wall -I$(raylibfolder) # -Wall -> alle wichtigen Warnungen aktivieren, -I : suche dort (raylibfolder) nach datei.
|
||||
LDFLAGS = -lGL -lX11 -lm # Linker-Flags: Bibliotheken, die an das Linker-Kommando übergeben werden
|
||||
CC = gcc
|
||||
CFLAGS = -g -Wall -I$(raylib_folder) # <- KORRIGIERT
|
||||
LDFLAGS = -lGL -lX11 -lm
|
||||
BINARIES = ./linux
|
||||
|
||||
raylib_folder = ./raylib #Pfade zu raylib_folder und unityfolder
|
||||
raylib_folder = ./raylib
|
||||
unityfolder = ./unity
|
||||
|
||||
# --------------------------
|
||||
# initiales Spiel bauen
|
||||
# --------------------------
|
||||
wordsalad_initial: #hier kommen normalerweise Abhängikeiten hin. Z.b die Datei game.o muss vorhanden sein.
|
||||
wordsalad_initial:
|
||||
$(CC) -o wordsalad_initial -L. $(BINARIES)/libwordsalad_complete.a $(BINARIES)/libraylib.a $(LDFLAGS)
|
||||
#wordsalad_initial linkt nur bibliotheken. Deshalb hat es keine Abhängigkeiten.
|
||||
|
||||
# --------------------------
|
||||
# Normales Spiel bauen
|
||||
# --------------------------
|
||||
@@ -19,29 +19,36 @@ 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)
|
||||
|
||||
main.o: main.c
|
||||
$(CC) $(CFLAGS) -c main.c
|
||||
$(CC) $(CFLAGS) -c $< -o $@ # <- KORRIGIERT
|
||||
|
||||
input.o: input.c
|
||||
$(CC) $(CFLAGS) -c input.c
|
||||
input.o: input.c input.h
|
||||
$(CC) $(CFLAGS) -c $< -o $@ # <- KORRIGIERT (Zeile 25/26)
|
||||
|
||||
game.o: game.c
|
||||
$(CC) $(CFLAGS) -c game.c
|
||||
$(CC) $(CFLAGS) -c $< -o $@ # <- KORRIGIERT
|
||||
|
||||
graphicalGame.o: graphicalGame.c
|
||||
$(CC) $(CFLAGS) -c graphicalGame.c
|
||||
$(CC) $(CFLAGS) -c $< -o $@ # <- KORRIGIERT
|
||||
|
||||
# --------------------------
|
||||
# Unit Tests
|
||||
# --------------------------
|
||||
TEST_BIN = runTests
|
||||
|
||||
test: input.o game.o unit_tests.c
|
||||
$(CC) -I$(unityfolder) -o $(TEST_BIN) input.o game.o unit_tests.c $(BINARIES)/libunity.a
|
||||
# KORRIGIERTE Test-Regel (umbenannt von neuer_test)
|
||||
test: input.o game.o unit_tests.o
|
||||
$(CC) -I$(unityfolder) -o $(TEST_BIN) input.o game.o unit_tests.o $(BINARIES)/libunity.a
|
||||
|
||||
# KORRIGIERTE unit_tests.o Regel
|
||||
unit_tests.o: unit_tests.c input.h game.h
|
||||
$(CC) $(CFLAGS) -I$(unityfolder) -c $< -o $@
|
||||
|
||||
# --------------------------
|
||||
# Clean
|
||||
# --------------------------
|
||||
wordsalad_myversion: main.o $(BINARIES)/libwordsalad.a #eigenes Programm erstellen.
|
||||
wordsalad_myversion: main.o $(BINARIES)/libwordsalad.a
|
||||
$(CC) -o wordsalad_myversion main.o $(BINARIES)/libwordsalad.a
|
||||
|
||||
clean:
|
||||
rm -f *.o wordsalad $(TEST_BIN)
|
||||
# Tests starten mit ./runTests
|
||||
Reference in New Issue
Block a user