diff --git a/Makefile b/Makefile deleted file mode 100644 index dd25390..0000000 --- a/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -build: main.c bitmap.c - gcc main.c bitmap.c -o main -O3 - -run: build - ./main - -show: run - feh after.bmp - -convert: run - magick after.bmp after.png # for showing image in pdf - -zip: before.bmp main.pdf ../Makefile main.c bitmap.h bitmap.c - zip handin.zip before.bmp main.pdf ../Makefile main.c bitmap.h bitmap.c - -unzip: handin.zip - unzip handin.zip -d handin diff --git a/exercise0/Makefile b/exercise0/Makefile index bb69e69..8894f43 100644 --- a/exercise0/Makefile +++ b/exercise0/Makefile @@ -1 +1,17 @@ -include ../Makefile +build: main.c bitmap.c + gcc main.c bitmap.c -o main -O2 + +run: build + ./main + +show: run + feh after.bmp + +convert: run + magick after.bmp after.png # for showing image in pdf + +zip: before.bmp main.pdf Makefile main.c bitmap.h bitmap.c + zip handin.zip before.bmp main.pdf Makefile main.c bitmap.h bitmap.c + +unzip: handin.zip + unzip handin.zip -d handin diff --git a/exercise0/main b/exercise0/main index 9d728cb..911c9b3 100755 Binary files a/exercise0/main and b/exercise0/main differ