diff --git a/Start_Linux/makefile b/Start_Linux/makefile index 4921078..ad25ab2 100644 --- a/Start_Linux/makefile +++ b/Start_Linux/makefile @@ -1,12 +1,11 @@ CC = gcc -CFLAGS = -g -Wall -I$(raylibfolder) +CFLAGS = -g -Wall LDFLAGS = -lGL -lX11 -lm BINARIES = ./linux -raylib_folder = ./raylib +raylibfolder = ./raylib unityfolder = ./unity - # -------------------------- # Initiales Programm bauen (zum ausprobieren) # -------------------------- @@ -17,7 +16,7 @@ mnist_initial: $(BINARIES)/libmnist_complete.a # Selbst implementiertes Programm bauen # -------------------------- mnist: main.o matrix.o neuralNetwork.o imageInput.o mnistVisualization.o $(BINARIES)/libraylib.a - $(CC) $(CFLAGS) -I$(raylibfolder) -o mnist main.o matrix.o neuralNetwork.o imageInput.o $(BINARIES)/libraylib.a ${LDFLAGS} + $(CC) $(CFLAGS) -I$(raylibfolder) -o mnist main.o matrix.o neuralNetwork.o imageInput.o mnistVisualization.o $(BINARIES)/libraylib.a ${LDFLAGS} main.o: main.c $(CC) -c $(CFLAGS) main.c @@ -31,6 +30,9 @@ neuralNetwork.o: neuralNetwork.c imageInput.o: imageInput.c $(CC) -c $(CFLAGS) imageInput.c +mnistVisualization.o: mnistVisualization.c + $(CC) -c $(CFLAGS) -I$(raylibfolder) imageInput.c + # -------------------------- # Unit Tests # -------------------------- diff --git a/Start_Mac/macos-x64/libmnist_complete.a b/Start_Mac/macos-x86_64/libmnist_complete.a similarity index 100% rename from Start_Mac/macos-x64/libmnist_complete.a rename to Start_Mac/macos-x86_64/libmnist_complete.a diff --git a/Start_Mac/macos-x64/libraylib.a b/Start_Mac/macos-x86_64/libraylib.a similarity index 100% rename from Start_Mac/macos-x64/libraylib.a rename to Start_Mac/macos-x86_64/libraylib.a diff --git a/Start_Mac/macos-x64/libunity.a b/Start_Mac/macos-x86_64/libunity.a similarity index 100% rename from Start_Mac/macos-x64/libunity.a rename to Start_Mac/macos-x86_64/libunity.a diff --git a/Start_Mac/makefile b/Start_Mac/makefile index 68d788c..11b34ab 100644 --- a/Start_Mac/makefile +++ b/Start_Mac/makefile @@ -4,7 +4,7 @@ LDFLAGS = -framework OpenGL -framework CoreFoundation -framework CoreGraphics -f ARCH := $(shell uname -m) BINARIES = ./macos-$(ARCH) -raylib_folder = ./raylib +raylibfolder = ./raylib unityfolder = ./unity # -------------------------- @@ -17,7 +17,7 @@ mnist_initial: $(BINARIES)/libmnist_complete.a # Selbst implementiertes Programm bauen # -------------------------- mnist: main.o matrix.o neuralNetwork.o imageInput.o mnistVisualization.o $(BINARIES)/libraylib.a - $(CC) $(CFLAGS) -I$(raylibfolder) -o mnist main.o matrix.o neuralNetwork.o imageInput.o $(BINARIES)/libraylib.a ${LDFLAGS} + $(CC) $(CFLAGS) -I$(raylibfolder) -o mnist main.o matrix.o neuralNetwork.o imageInput.o mnistVisualization.o $(BINARIES)/libraylib.a ${LDFLAGS} main.o: main.c $(CC) -c $(CFLAGS) main.c @@ -31,6 +31,9 @@ neuralNetwork.o: neuralNetwork.c imageInput.o: imageInput.c $(CC) -c $(CFLAGS) imageInput.c +mnistVisualization.o: mnistVisualization.c + $(CC) -c $(CFLAGS) -I$(raylibfolder) imageInput.c + # -------------------------- # Unit Tests # -------------------------- diff --git a/Start_Windows/makefile b/Start_Windows/makefile index 62c915e..166891e 100644 --- a/Start_Windows/makefile +++ b/Start_Windows/makefile @@ -1,9 +1,9 @@ CC = gcc -CFLAGS = -g -Wall -I$(raylibfolder) +CFLAGS = -g -Wall LDFLAGS = -lopengl32 -lgdi32 -lwinmm BINARIES = ./windows -raylib_folder = ./raylib +raylibfolder = ./raylib unityfolder = ./unity # -------------------------- @@ -16,7 +16,7 @@ mnist_initial: $(BINARIES)/libmnist_complete.a # Selbst implementiertes Programm bauen # -------------------------- mnist: main.o matrix.o neuralNetwork.o imageInput.o mnistVisualization.o $(BINARIES)/libraylib.a - $(CC) $(CFLAGS) -I$(raylibfolder) -o mnist main.o matrix.o neuralNetwork.o imageInput.o $(BINARIES)/libraylib.a ${LDFLAGS} + $(CC) $(CFLAGS) -I$(raylibfolder) -o mnist main.o matrix.o neuralNetwork.o imageInput.o mnistVisualization.o $(BINARIES)/libraylib.a ${LDFLAGS} main.o: main.c $(CC) -c $(CFLAGS) main.c @@ -30,6 +30,9 @@ neuralNetwork.o: neuralNetwork.c imageInput.o: imageInput.c $(CC) -c $(CFLAGS) imageInput.c +mnistVisualization.o: mnistVisualization.c + $(CC) -c $(CFLAGS) -I$(raylibfolder) imageInput.c + # -------------------------- # Unit Tests # -------------------------- @@ -46,5 +49,5 @@ imageInputTests: imageInput.o imageInputTests.c # Clean # -------------------------- clean: - del /f *.o mnist runMatrixTests runNeuralNetworkTests runImageInputTests + del /f *.o *.exe diff --git a/Start_Windows/mnist_initial b/Start_Windows/mnist_initial deleted file mode 100755 index 5c08571..0000000 Binary files a/Start_Windows/mnist_initial and /dev/null differ