separate source and build

Makefile

@@ -31,52 +31,52 @@ dist: all
 	mkdir -p dist
 	mkdir -p dist/windows
 	mkdir -p dist/linux
-	cp main dist/linux
+	cp build/main dist/linux
-	cp main.exe dist/windows
+	cp build/main.exe dist/windows
-	cp SDL2.dll dist/windows
+	cp build/SDL2.dll dist/windows
 	cd dist && zip -r windows.zip windows 
-	cd dist && tar -czvf linux.tar.gz linux
+	cd dist && zip -r linux.zip linux 
 
 run: all
 	./main
 
 all: $(EXE)
 
-$(EXE): main.o vect.o logger.o game.o garbo.o draw.o controlscheme.o environment.o c-colours/colours.o datastructures/datatypes.o
+$(EXE): prebuild build/main.o build/vect.o build/logger.o build/game.o build/garbo.o build/draw.o build/controlscheme.o build/environment.o build/colours.o build/datatypes.o 
-	$(CC) -o $(EXE)  main.o vect.o game.o logger.o  draw.o garbo.o environment.o controlscheme.o c-colours/colours.o datastructures/datatypes.o $(CCFLAGS) 
+	cd build && $(CC) -o $(EXE)  main.o vect.o game.o logger.o  draw.o garbo.o environment.o controlscheme.o colours.o datatypes.o $(CCFLAGS) 
 
-c-colours/colours.o: c-colours/colours.c c-colours/colours.h
+build/colours.o: c-colours/colours.c c-colours/colours.h
-	$(CC) -c c-colours/colours.c -o c-colours/colours.o $(CCFLAGS) 
+	$(CC) -c c-colours/colours.c -o build/colours.o $(CCFLAGS) 
 
-datastructures/datatypes.o: datastructures/datatypes.c datastructures/datatypes.h
+build/datatypes.o: datastructures/datatypes.c datastructures/datatypes.h
-	$(CC) -c datastructures/datatypes.c -o datastructures/datatypes.o $(CCFLAGS) 
+	$(CC) -c datastructures/datatypes.c -o build/datatypes.o $(CCFLAGS) 
 
-main.o: main.c logger.h game.h garbo.h draw.h
+build/main.o: src/main.c
-	$(CC) -c main.c  $(CCFLAGS) 
+	$(CC) -c src/main.c -o build/main.o $(CCFLAGS) 
 
-logger.o: logger.c logger.h
+build/logger.o: src/logger.c src/logger.h
-	$(CC)  -c logger.c   $(CCFLAGS)
+	$(CC)  -c src/logger.c -o build/logger.o $(CCFLAGS)
 
-game.o: game.c game.h draw.h
+build/game.o: src/game.c src/game.h
-	$(CC) -c game.c  $(CCFLAGS) 
+	$(CC) -c src/game.c -o build/game.o $(CCFLAGS) 
 
-garbo.o: garbo.c garbo.h
+build/garbo.o: src/garbo.c src/garbo.h 
-	$(CC) -c garbo.c  $(CCFLAGS) 
+	$(CC) -c src/garbo.c -o build/garbo.o $(CCFLAGS) 
 
-draw.o: draw.c draw.h
+build/draw.o: src/draw.c src/draw.h
-	$(CC) -c draw.c   $(CCFLAGS) 
+	$(CC) -c src/draw.c -o build/draw.o  $(CCFLAGS) 
 
-vect.o: vect.c vect.h
+build/vect.o: src/vect.c src/vect.h
-	$(CC) -c vect.c   $(CCFLAGS) 
+	$(CC) -c src/vect.c -o build/vect.o  $(CCFLAGS) 
 
-controlscheme.o: controlscheme.c controlscheme.h
+build/controlscheme.o: src/controlscheme.c src/controlscheme.h
-	$(CC) -c controlscheme.c   $(CCFLAGS) 
+	$(CC) -c src/controlscheme.c -o build/controlscheme.o  $(CCFLAGS) 
 
-environment.o: environment.c environment.h
+build/environment.o: src/environment.c src/environment.h
-	$(CC) -c environment.c   $(CCFLAGS) 
+	$(CC) -c src/environment.c -o build/environment.o  $(CCFLAGS) 
 
 clean:
-	rm c-colours/*.o
+	rm build/*.o
-	rm datastructures/*.o
+
-	rm *.o 
+prebuild:
-	rm -rf dist
+	mkdir -p build

setup.sh

@@ -5,21 +5,28 @@ set -o pipefail
 
 # This is here for building the windows binary
 
-wget https://www.libsdl.org/release/SDL2-devel-2.0.12-mingw.tar.gz -O /tmp/sdl.tar.gz
+# wget https://www.libsdl.org/release/SDL2-devel-2.0.12-mingw.tar.gz -O /tmp/sdl.tar.gz
 
 mkdir -p /tmp/sdl-extract
 
+printf "extracting...\n"
+
 # We want the library
 tar -C /tmp/sdl-extract -xzf /tmp/sdl.tar.gz SDL2-2.0.12/x86_64-w64-mingw32/lib
 
 # and the DLL
 tar -C /tmp/sdl-extract -xzf /tmp/sdl.tar.gz SDL2-2.0.12/x86_64-w64-mingw32/bin/SDL2.dll
 
+# and the headers just to be safe
+tar -C /tmp/sdl-extract -xzf /tmp/sdl.tar.gz SDL2-2.0.12/x86_64-w64-mingw32/include
+
 printf "copying...\n"
 
-cp -r /tmp/sdl-extract/SDL2-2.0.12/x86_64-w64-mingw32/* .
+# move them to where they belong
-mv bin/SDL2.dll .
+#cp -r /tmp/sdl-extract/SDL2-2.0.12/x86_64-w64-mingw32/* .
-rmdir bin
+
-mv lib sdllib
+mv -n /tmp/sdl-extract/SDL2-2.0.12/x86_64-w64-mingw32/bin/SDL2.dll build/
+mv -n /tmp/sdl-extract/SDL2-2.0.12/x86_64-w64-mingw32/lib/ src/sdllib
+mv -n /tmp/sdl-extract/SDL2-2.0.12/x86_64-w64-mingw32/include/SDL2 src/
 
 printf "Success.\n"

src/physics.c

@@ -1 +1,2 @@
 #include "physics.h"
+#include "types.h"