Merge branch 'main' of https://git.efi.th-nuernberg.de/gitea/nitschema101555/info2Praktikum-WortsalatGruppe1_richtig

.vscode/dryrun.log

@@ -1,6 +1,6 @@
 make.exe --dry-run --always-make --keep-going --print-directory
+make: *** No targets specified and no makefile found.  Stop.
+
 make: Entering directory 'c:/Users/Moritz/Documents/Informatik 2 Praktikum/info2Praktikum-WortsalatGruppe1_richtig'
 make: Leaving directory 'c:/Users/Moritz/Documents/Informatik 2 Praktikum/info2Praktikum-WortsalatGruppe1_richtig'
  
-make: *** No targets specified and no makefile found.  Stop.
-

.vscode/targets.log

@@ -1,4 +1,6 @@
 make.exe all --print-data-base --no-builtin-variables --no-builtin-rules --question
+make: *** No rule to make target 'all'.  Stop.
+
 # GNU Make 4.4.1
 # Built for Windows32
 # Copyright (C) 1988-2023 Free Software Foundation, Inc.
@@ -6,10 +8,12 @@ make.exe all --print-data-base --no-builtin-variables --no-builtin-rules --quest
 # This is free software: you are free to change and redistribute it.
 # There is NO WARRANTY, to the extent permitted by law.
 
-# Make data base, printed on Tue Oct 28 13:38:15 2025
+# Make data base, printed on Tue Nov 04 15:04:11 2025
 
 # Variables
 
+# environment
+FPS_BROWSER_APP_PROFILE_STRING = Internet Explorer
 # environment
 SYSTEMDRIVE = C:
 # environment
@@ -35,13 +39,17 @@ MAKE_COMMAND := C:/ProgramData/chocolatey/lib/make/tools/install/bin/make.exe
 # automatic
 @D = $(patsubst %/,%,$(patsubst %\,%,$(dir $@)))
 # environment
-CHROME_CRASHPAD_PIPE_NAME = \\.\pipe\crashpad_9148_ARFCBCRJZHAKAMQX
+CHROME_CRASHPAD_PIPE_NAME = \\.\pipe\crashpad_3256_UEJPRASITZYEFUKO
+# environment
+FPS_BROWSER_USER_PROFILE_STRING = Default
 # environment
 VSCODE_HANDLES_UNCAUGHT_ERRORS = true
 # default
 .VARIABLES := 
 # automatic
 %D = $(patsubst %/,%,$(patsubst %\,%,$(dir $%)))
+# environment
+IVIROOTDIR64 = C:\Program Files\IVI Foundation\IVI\
 # automatic
 ^D = $(patsubst %/,%,$(patsubst %\,%,$(dir $^)))
 # automatic
@@ -51,10 +59,7 @@ VSCODE_CODE_CACHE_PATH = C:\Users\Moritz\AppData\Roaming\Code\CachedData\7d842fb
 # environment
 LANG = C
 # default
-.L 
-make: *** No rule to make target 'all'.  Stop.
-
-OADED := 
+.LOADED := 
 # environment
 TMP = C:\Users\Moritz\AppData\Local\Temp
 # default
@@ -86,7 +91,7 @@ MAKEFILE_LIST :=
 # automatic
 @F = $(notdir $@)
 # environment
-VSCODE_PID = 9148
+VSCODE_PID = 3256
 # automatic
 ?D = $(patsubst %/,%,$(patsubst %\,%,$(dir $?)))
 # environment
@@ -118,7 +123,7 @@ MAKELEVEL := 0
 # default
 MAKE = $(MAKE_COMMAND)
 # environment
-PATH = C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Program Files\Git\cmd;C:\ProgramData\chocolatey\bin;C:\msys64\ucrt64\bin;C:\Program Files\Microsoft VS Code\bin;C:\ProgramData\mingw64\mingw64\bin;C:\Users\Moritz\AppData\Local\Programs\Python\Launcher\;C:\Users\Moritz\AppData\Local\Microsoft\WindowsApps;;C:\intelFPGA_lite\18.1\modelsim_ase\win32aloem
+PATH = C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Program Files\Git\cmd;C:\ProgramData\chocolatey\bin;C:\msys64\ucrt64\bin;C:\Program Files\Microsoft VS Code\bin;C:\ProgramData\mingw64\mingw64\bin;C:\Program Files\dotnet\;C:\Program Files (x86)\IVI Foundation\VISA\WinNT\Bin\;C:\Program Files\IVI Foundation\VISA\Win64\Bin\;C:\Program Files (x86)\National Instruments\Shared\LabVIEW CLI;C:\Program Files (x86)\IVI Foundation\VISA\WinNT\Bin;C:\Program Files (x86)\IVI Foundation\IVI\Bin\;C:\Program Files\IVI Foundation\IVI\Bin\;C:\Users\Moritz\AppData\Local\Programs\Python\Launcher\;C:\Users\Moritz\AppData\Local\Microsoft\WindowsApps;;C:\intelFPGA_lite\18.1\modelsim_ase\win32aloem
 # environment
 COMPUTERNAME = DESKTOP-TV1DOMD
 # default
@@ -126,10 +131,16 @@ MAKEFILES :=
 # automatic
 ^F = $(notdir $^)
 # environment
+NIEXTCCOMPILERSUPP = C:\Program Files (x86)\National Instruments\Shared\ExternalCompilerSupport\C\
+# environment
 PROMPT = $P$G
 # environment
 CHOCOLATEYLASTPATHUPDATE = 134060496987803747
 # environment
+VXIPNPPATH64 = C:\Program Files\IVI Foundation\VISA\
+# environment
+NIDAQMXSWITCHDIR = C:\Program Files (x86)\National Instruments\NI-DAQ\Switch\
+# environment
 APPLICATION_INSIGHTS_NO_STATSBEAT = true
 # environment
 LOGONSERVER = \\DESKTOP-TV1DOMD
@@ -178,6 +189,8 @@ HOMEDRIVE = C:
 # environment
 PROCESSOR_ARCHITECTURE = x86
 # environment
+VXIPNPPATH = C:\Program Files (x86)\IVI Foundation\VISA\
+# environment
 COMMONPROGRAMFILES(X86) = C:\Program Files (x86)\Common Files
 # environment
 ELECTRON_RUN_AS_NODE = 1
@@ -200,11 +213,13 @@ SESSIONNAME = Console
 # environment
 PROCESSOR_REVISION = 5000
 # environment
+IVIROOTDIR32 = C:\Program Files (x86)\IVI Foundation\IVI\
+# environment
 VSCODE_ESM_ENTRYPOINT = vs/workbench/api/node/extensionHostProcess
 # environment
 PROCESSOR_IDENTIFIER = AMD64 Family 25 Model 80 Stepping 0, AuthenticAMD
 # variable set hash-table stats:
-# Load=95/1024=9%, Rehash=0, Collisions=8/120=7%
+# Load=103/1024=10%, Rehash=0, Collisions=9/128=7%
 
 # Pattern-specific Variable Values
 
@@ -277,6 +292,6 @@ GNUmakefile:
 # strcache performance: lookups = 21 / hit rate = 14%
 # hash-table stats:
 # Load=18/8192=0%, Rehash=0, Collisions=0/21=0%
-# Finished Make data base on Tue Oct 28 13:38:15 2025
+# Finished Make data base on Tue Nov 04 15:04:11 2025
 
  

Start_Windows/makefile

@@ -1,46 +1,51 @@
-CC = gcc
-CFLAGS = -g -Wall -I$(raylibfolder)
-LDFLAGS = -lopengl32 -lgdi32 -lwinmm
+# --------------------------
+# Variablen
+# --------------------------
+raylib_folder = ./raylib
+unity_folder = ./unity
 BINARIES = ./windows
 
-raylib_folder = ./raylib
-unityfolder = ./unity
-
-# --------------------------
-# initiales Spiel bauen
-# --------------------------
-wordsalad_initial:
-	$(CC) -o wordsalad_initial $(BINARIES)/libwordsalad_complete.a $(BINARIES)/libraylib.a $(LDFLAGS)
-
-
-# --------------------------
-# Normales Spiel bauen
-# --------------------------
-all: 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) -c $(CFLAGS) main.c
-
-input.o: input.c
-	$(CC) -c $(CFLAGS)input.c
-
-game.o: game.c
-	$(CC) -c $(CFLAGS) game.c
-
-graphicalGame.o: graphicalGame.c
-	$(CC) -I$(raylib_folder) -c $(CFLAGS) graphicalGame.c
-
-# --------------------------
-# Unit Tests
-# --------------------------
+CC = gcc
+CFLAGS = -g -Wall -I$(raylib_folder)
+LDFLAGS = -lopengl32 -lgdi32 -lwinmm
 TEST_BIN = runTests
 
-test: input.o game.o unit_tests.c
-	$(CC) $(CFLAGS) -I$(unityfolder) -o $(TEST_BIN) input.o game.o unit_tests.c $(BINARIES)/libunity.a
+# --------------------------
+# Ziel: Normales Spiel bauen
+# --------------------------
+all: wordsalad
+
+wordsalad: main.o input.o game.o graphicalGame.o $(BINARIES)/libraylib.a
+	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
+
+main.o: main.c
+	$(CC) -c $(CFLAGS) $< -o $@
+
+input.o: input.c
+	$(CC) -c $(CFLAGS) $< -o $@
+
+game.o: game.c
+	$(CC) -c $(CFLAGS) $< -o $@
+
+graphicalGame.o: graphicalGame.c
+	$(CC) -c $(CFLAGS) $< -o $@
 
 # --------------------------
-# Clean
+# Ziel: Initiales Spiel bauen
+# --------------------------
+wordsalad_initial:
+	$(CC) -o $@ $(BINARIES)/libwordsalad_complete.a $(BINARIES)/libraylib.a $(LDFLAGS)
+
+# --------------------------
+# Ziel: Unit Tests
+# --------------------------
+test: $(TEST_BIN)
+
+$(TEST_BIN): input.o game.o unit_tests.c
+	$(CC) $(CFLAGS) -I$(unity_folder) -o $@ input.o game.o unit_tests.c $(BINARIES)/libunity.a
+
+# --------------------------
+# Ziel: Aufräumen
 # --------------------------
 clean:
-	del /f *.o *.exe
+	rm -f *.o wordsalad wordsalad_initial $(TEST_BIN)