forked from freudenreichan/info2Praktikum-Wortsalat
Compare commits
2
Commits
feature-input
...
ramiz
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fd6e92d674 | ||
|
|
b91ef39e6f |
No files matched your search
+2
-1
@@ -35,9 +35,10 @@
|
|||||||
*.i*86
|
*.i*86
|
||||||
*.x86_64
|
*.x86_64
|
||||||
*.hex
|
*.hex
|
||||||
|
Startcode/wordsalad_myversion
|
||||||
Startcode/wordsalad_initial
|
Startcode/wordsalad_initial
|
||||||
Startcode/wordsalad
|
Startcode/wordsalad
|
||||||
test
|
runtest
|
||||||
|
|
||||||
# Debug files
|
# Debug files
|
||||||
*.dSYM/
|
*.dSYM/
|
||||||
|
|||||||
@@ -38,8 +38,20 @@ int main(int argc, char *argv[])
|
|||||||
|
|
||||||
// TODO:
|
// TODO:
|
||||||
// Check if all words were successfully placed
|
// Check if all words were successfully placed
|
||||||
|
if (placedWords == wordCount)
|
||||||
|
{
|
||||||
// Start the game if successful
|
// Start the game if successful
|
||||||
|
startGame(wordSalad, SALAD_SIZE, words, wordCount, 600);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
// error message if some words couldn't be placed
|
// error message if some words couldn't be placed
|
||||||
|
fprintf(stderr, "Fehler. Es konnten nicht alle Wörter Platziert werden.");
|
||||||
|
exitCode = EXIT_FAILURE;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
+7
-1
@@ -22,6 +22,12 @@ codefolder = .
|
|||||||
wordsalad_initial:
|
wordsalad_initial:
|
||||||
$(CC) -o wordsalad_initial -L. $(BINARIES)/libwordsalad_complete.a $(BINARIES)/libraylib.a $(LDFLAGS)
|
$(CC) -o wordsalad_initial -L. $(BINARIES)/libwordsalad_complete.a $(BINARIES)/libraylib.a $(LDFLAGS)
|
||||||
|
|
||||||
|
# Eigenes Target
|
||||||
|
|
||||||
|
wordsalad_myversion: main.o graphicalGame.o $(BINARIES)/libraylib.a
|
||||||
|
$(CC) $(CFLAGS) -o wordsalad_myversion main.o graphicalGame.o $(BINARIES)/libwordsalad.a $(BINARIES)/libraylib.a $(LDFLAGS)
|
||||||
|
|
||||||
|
|
||||||
# --------------------------
|
# --------------------------
|
||||||
# Normales Spiel bauen
|
# Normales Spiel bauen
|
||||||
# --------------------------
|
# --------------------------
|
||||||
@@ -55,5 +61,5 @@ clean:
|
|||||||
ifeq ($(OS),Windows_NT)
|
ifeq ($(OS),Windows_NT)
|
||||||
del /f *.o *.exe
|
del /f *.o *.exe
|
||||||
else
|
else
|
||||||
rm -f *.o wordsalad $(TEST_BIN)
|
rm -f *.o wordsalad wordsalad_initial wordsalad_myversion $(TEST_BIN)
|
||||||
endif
|
endif
|
||||||
Executable
BIN
Binary file not shown.
Executable
BIN
Binary file not shown.
Reference in new issue
Block a user