diff --git a/Makefile b/Makefile index 1b3b292..c72b7b4 100644 --- a/Makefile +++ b/Makefile @@ -31,52 +31,52 @@ dist: all mkdir -p dist mkdir -p dist/windows mkdir -p dist/linux - cp main dist/linux - cp main.exe dist/windows - cp SDL2.dll dist/windows + cp build/main dist/linux + cp build/main.exe 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 - $(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) +$(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 + 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 - $(CC) -c c-colours/colours.c -o c-colours/colours.o $(CCFLAGS) +build/colours.o: c-colours/colours.c c-colours/colours.h + $(CC) -c c-colours/colours.c -o build/colours.o $(CCFLAGS) -datastructures/datatypes.o: datastructures/datatypes.c datastructures/datatypes.h - $(CC) -c datastructures/datatypes.c -o datastructures/datatypes.o $(CCFLAGS) +build/datatypes.o: datastructures/datatypes.c datastructures/datatypes.h + $(CC) -c datastructures/datatypes.c -o build/datatypes.o $(CCFLAGS) -main.o: main.c logger.h game.h garbo.h draw.h - $(CC) -c main.c $(CCFLAGS) +build/main.o: src/main.c + $(CC) -c src/main.c -o build/main.o $(CCFLAGS) -logger.o: logger.c logger.h - $(CC) -c logger.c $(CCFLAGS) +build/logger.o: src/logger.c src/logger.h + $(CC) -c src/logger.c -o build/logger.o $(CCFLAGS) -game.o: game.c game.h draw.h - $(CC) -c game.c $(CCFLAGS) +build/game.o: src/game.c src/game.h + $(CC) -c src/game.c -o build/game.o $(CCFLAGS) -garbo.o: garbo.c garbo.h - $(CC) -c garbo.c $(CCFLAGS) +build/garbo.o: src/garbo.c src/garbo.h + $(CC) -c src/garbo.c -o build/garbo.o $(CCFLAGS) -draw.o: draw.c draw.h - $(CC) -c draw.c $(CCFLAGS) +build/draw.o: src/draw.c src/draw.h + $(CC) -c src/draw.c -o build/draw.o $(CCFLAGS) -vect.o: vect.c vect.h - $(CC) -c vect.c $(CCFLAGS) +build/vect.o: src/vect.c src/vect.h + $(CC) -c src/vect.c -o build/vect.o $(CCFLAGS) -controlscheme.o: controlscheme.c controlscheme.h - $(CC) -c controlscheme.c $(CCFLAGS) +build/controlscheme.o: src/controlscheme.c src/controlscheme.h + $(CC) -c src/controlscheme.c -o build/controlscheme.o $(CCFLAGS) -environment.o: environment.c environment.h - $(CC) -c environment.c $(CCFLAGS) +build/environment.o: src/environment.c src/environment.h + $(CC) -c src/environment.c -o build/environment.o $(CCFLAGS) clean: - rm c-colours/*.o - rm datastructures/*.o - rm *.o - rm -rf dist + rm build/*.o + +prebuild: + mkdir -p build diff --git a/setup.sh b/setup.sh old mode 100644 new mode 100755 index ae7bf16..2b96343 --- a/setup.sh +++ b/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/* . -mv bin/SDL2.dll . -rmdir bin -mv lib sdllib +# move them to where they belong +#cp -r /tmp/sdl-extract/SDL2-2.0.12/x86_64-w64-mingw32/* . + +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" diff --git a/basic-lib.c b/src/basic-lib.c similarity index 100% rename from basic-lib.c rename to src/basic-lib.c diff --git a/controlscheme.c b/src/controlscheme.c similarity index 100% rename from controlscheme.c rename to src/controlscheme.c diff --git a/controlscheme.h b/src/controlscheme.h similarity index 100% rename from controlscheme.h rename to src/controlscheme.h diff --git a/debuginfo.h b/src/debuginfo.h similarity index 100% rename from debuginfo.h rename to src/debuginfo.h diff --git a/draw.c b/src/draw.c similarity index 100% rename from draw.c rename to src/draw.c diff --git a/draw.h b/src/draw.h similarity index 100% rename from draw.h rename to src/draw.h diff --git a/environment.c b/src/environment.c similarity index 100% rename from environment.c rename to src/environment.c diff --git a/environment.h b/src/environment.h similarity index 100% rename from environment.h rename to src/environment.h diff --git a/game.c b/src/game.c similarity index 100% rename from game.c rename to src/game.c diff --git a/game.h b/src/game.h similarity index 100% rename from game.h rename to src/game.h diff --git a/garbo.c b/src/garbo.c similarity index 100% rename from garbo.c rename to src/garbo.c diff --git a/garbo.h b/src/garbo.h similarity index 100% rename from garbo.h rename to src/garbo.h diff --git a/logger.c b/src/logger.c similarity index 100% rename from logger.c rename to src/logger.c diff --git a/logger.h b/src/logger.h similarity index 100% rename from logger.h rename to src/logger.h diff --git a/main.c b/src/main.c similarity index 100% rename from main.c rename to src/main.c diff --git a/physics.c b/src/physics.c similarity index 52% rename from physics.c rename to src/physics.c index 5aaaacb..1eb9348 100644 --- a/physics.c +++ b/src/physics.c @@ -1 +1,2 @@ #include "physics.h" +#include "types.h" diff --git a/physics.h b/src/physics.h similarity index 100% rename from physics.h rename to src/physics.h diff --git a/types.h b/src/types.h similarity index 100% rename from types.h rename to src/types.h diff --git a/vect.c b/src/vect.c similarity index 100% rename from vect.c rename to src/vect.c diff --git a/vect.h b/src/vect.h similarity index 100% rename from vect.h rename to src/vect.h