updated files in StartMac
This commit is contained in:
parent
2579dede52
commit
c745cdd148
7
.gitignore
vendored
Normal file
7
.gitignore
vendored
Normal file
@ -0,0 +1,7 @@
|
||||
I2_Wortsalat/.DS_Store
|
||||
I2_Wortsalat/Start_Mac/game.c
|
||||
I2_Wortsalat/Start_Mac/game.o
|
||||
I2_Wortsalat/Start_Mac/input.o
|
||||
I2_Wortsalat/Start_Mac/main.o
|
||||
I2_Wortsalat/Start_Mac/runTests
|
||||
I2_Wortsalat/Start_Mac/wordsalad_initial
|
BIN
I2_Wortsalat/Start_Mac/.DS_Store
vendored
Normal file
BIN
I2_Wortsalat/Start_Mac/.DS_Store
vendored
Normal file
Binary file not shown.
@ -19,5 +19,11 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi
|
||||
// Prints the word salad to console
|
||||
void showWordSalad(const char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen)
|
||||
{
|
||||
|
||||
for( int i = 0; i < searchFieldLen; i++ )
|
||||
{
|
||||
for( int j = 0; j < searchFieldLen; j++ )
|
||||
{
|
||||
printf("%c", salad[i][j]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -38,13 +38,20 @@ int main(int argc, char *argv[])
|
||||
|
||||
// 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)
|
||||
{
|
||||
printf("Eingabe war erfolgreich!\nDas Spiel beginnt:");
|
||||
void startGame(wordSalad, searchFieldSize, words, numberOfWords, windowSize);
|
||||
}
|
||||
else
|
||||
{
|
||||
printf("Fehler! Es konnten nicht alle Woerter hinzugefuegt werden!\n Bitte Spiel neustarten!");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// Print error message if file couldn't be opened
|
||||
|
||||
fprintf(stderr, "Could not open file %s for reading ...\n", argv[1]);
|
||||
exitCode = EXIT_FAILURE;
|
||||
}
|
||||
|
@ -3,44 +3,46 @@ 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
|
||||
raylibfolder = ./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
|
||||
rm -f *.o wordsalad $(TEST_BIN)
|
@ -39,19 +39,14 @@ int main(int argc, char *argv[])
|
||||
// TODO:
|
||||
// Check if all words were successfully placed
|
||||
if(placedWords == wordCount)
|
||||
{
|
||||
printf("Eingabe war erfolgreich!\nDas Spiel beginnt:");
|
||||
void startGame(wordSalad[][], searchFieldSize, words[][], numberOfWords, windowSize)
|
||||
}
|
||||
{
|
||||
printf("Eingabe war erfolgreich!\nDas Spiel beginnt:");
|
||||
void startGame(wordSalad, searchFieldSize, words, numberOfWords, windowSize);
|
||||
}
|
||||
else
|
||||
{
|
||||
printf("Fehler! Es konnten nicht alle Woerter hinzugefuegt werden!\n Bitte Spiel neustarten!");
|
||||
}
|
||||
|
||||
// Start the game if successful
|
||||
|
||||
|
||||
// error message if some words couldn't be placed
|
||||
{
|
||||
printf("Fehler! Es konnten nicht alle Woerter hinzugefuegt werden!\n Bitte Spiel neustarten!");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user