From 45667dd24d09a9316ec9c152ca2bd992af883276 Mon Sep 17 00:00:00 2001 From: Jean-Michel Paris Date: Sat, 21 Apr 2018 09:56:49 +0200 Subject: [PATCH 1/2] Ignore generated files by Makefiles --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..bf4b79b16 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ + +*.exe + +*.o From 23d93c2be438d88bb2931e64805b28c3a0f113e2 Mon Sep 17 00:00:00 2001 From: Jean-Michel Paris Date: Sat, 21 Apr 2018 09:57:36 +0200 Subject: [PATCH 2/2] Change linker objects order Compatible MSYS2, Ubuntu --- gr-utils/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gr-utils/Makefile b/gr-utils/Makefile index 98eb3d0a3..0cfd7db23 100644 --- a/gr-utils/Makefile +++ b/gr-utils/Makefile @@ -1,3 +1,4 @@ + include ../Makefile.inc CFLAGS = -g -Wall -O2 @@ -14,7 +15,7 @@ loadpng.o: loadpng.c loadpng.h ### png2gr: png2gr.o loadpng.o - $(CC) $(LFLAGS) -lpng -o png2gr png2gr.o loadpng.o + $(CC) $(LFLAGS) -o png2gr png2gr.o loadpng.o -lpng png2gr.o: png2gr.c loadpng.h $(CC) $(CFLAGS) -c png2gr.c @@ -22,7 +23,7 @@ png2gr.o: png2gr.c loadpng.h ### png2rle: png2rle.o loadpng.o - $(CC) $(LFLAGS) -lpng -o png2rle png2rle.o loadpng.o + $(CC) $(LFLAGS) -o png2rle png2rle.o loadpng.o -lpng png2rle.o: png2rle.c loadpng.h $(CC) $(CFLAGS) -c png2rle.c