From f769d1fb22c05df4096477d6223cbc5649f93c52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Boh=C3=A1=C4=8Dek?= Date: Tue, 22 Jun 2021 08:40:22 +0200 Subject: [PATCH] refactor: cleanup build flags --- image-viewer/Makefile | 4 ++-- lib-gui/Makefile | 4 +--- lib-pheripherals/Makefile | 4 ++-- text-viewer/Makefile | 4 ++-- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/image-viewer/Makefile b/image-viewer/Makefile index dbdf1031ad66ded1203bd270bfde18433cf29299..a100445cf98baefcd30ea29ffc31d1728ec017f8 100644 --- a/image-viewer/Makefile +++ b/image-viewer/Makefile @@ -16,10 +16,10 @@ CFLAGS =-g -std=gnu99 -O1 -Wall -D ILI9481 CXXFLAGS = -g -std=gnu++11 -O1 -Wall ifdef COMPUTER -LDFLAGS = -lrt -lmzapo-pheripherals -lpthread -lmagic -ljpeg -lpng $(shell sdl2-config --libs) -lSDL2_image +LDFLAGS = -lmzapo-pheripherals -lmagic -ljpeg -lpng $(shell sdl2-config --libs) -lSDL2_image CFLAGS += -DCOMPUTER $(shell sdl2-config --cflags) else -LDFLAGS = -lrt -lmzapo-pheripherals -lpthread -l :libmagic.so.1 -l :libjpeg.so.62 -l :libz.so -l :libpng16.so.16 +LDFLAGS = -lmzapo-pheripherals -l :libmagic.so.1 -l :libjpeg.so.62 -l :libz.so -l :libpng16.so.16 endif LDFLAGS += -Wl,-rpath,'$${ORIGIN}' $(LIB_DIR) diff --git a/lib-gui/Makefile b/lib-gui/Makefile index 94101c4cb14695b1a2c2cfc1cfa7663fe6dd85fe..6129b06f0ac30e89b78ece41518dbd49476765bf 100644 --- a/lib-gui/Makefile +++ b/lib-gui/Makefile @@ -15,10 +15,8 @@ CFLAGS =-g -std=gnu99 -O1 -Wall -D ILI9481 CXXFLAGS = -g -std=gnu++11 -O1 -Wall ifdef COMPUTER -LDFLAGS = -lrt -lpthread -lmagic -ljpeg -lpng $(shell sdl2-config --libs) -lSDL2_image -CFLAGS += -DCOMPUTER $(shell sdl2-config --cflags) +CFLAGS += -DCOMPUTER else -LDFLAGS = -lrt -lpthread -l :libmagic.so.1 -l :libjpeg.so.62 -l :libz.so -l :libpng16.so.16 endif NAME=mzapo-gui diff --git a/lib-pheripherals/Makefile b/lib-pheripherals/Makefile index 71b852e878b046cf2902273d592bbb130c787ca1..58cef3d4b5128a48d0ce6fd2827153b6745387ae 100644 --- a/lib-pheripherals/Makefile +++ b/lib-pheripherals/Makefile @@ -15,10 +15,10 @@ CFLAGS =-g -std=gnu99 -O1 -Wall -D ILI9481 CXXFLAGS = -g -std=gnu++11 -O1 -Wall ifdef COMPUTER -LDFLAGS = -lrt -lpthread -lmagic -ljpeg -lpng $(shell sdl2-config --libs) -lSDL2_image +LDFLAGS = -lmagic -ljpeg -lpng $(shell sdl2-config --libs) -lSDL2_image CFLAGS += -DCOMPUTER $(shell sdl2-config --cflags) else -LDFLAGS = -lrt -lpthread -l :libmagic.so.1 -l :libjpeg.so.62 -l :libz.so -l :libpng16.so.16 +LDFLAGS = -l :libmagic.so.1 -l :libjpeg.so.62 -l :libz.so -l :libpng16.so.16 endif NAME=mzapo-pheripherals diff --git a/text-viewer/Makefile b/text-viewer/Makefile index d2351ab0160797fe9dbee229fc343813ede4841d..378d27c01c2f2b6b936bf8f17982e362f48c55b1 100644 --- a/text-viewer/Makefile +++ b/text-viewer/Makefile @@ -16,10 +16,10 @@ CFLAGS =-g -std=gnu99 -O1 -Wall -D ILI9481 CXXFLAGS = -g -std=gnu++11 -O1 -Wall ifdef COMPUTER -LDFLAGS = -lrt -lmzapo-pheripherals -lmzapo-gui -lpthread -lmagic -ljpeg -lpng $(shell sdl2-config --libs) -lSDL2_image +LDFLAGS = -lmzapo-pheripherals -lmzapo-gui -lmagic -ljpeg -lpng $(shell sdl2-config --libs) -lSDL2_image CFLAGS += -DCOMPUTER $(shell sdl2-config --cflags) else -LDFLAGS = -lrt -lmzapo-pheripherals -lmzapo-gui -lpthread -l :libmagic.so.1 -l :libjpeg.so.62 -l :libz.so -l :libpng16.so.16 +LDFLAGS = -lmzapo-pheripherals -lmzapo-gui -l :libmagic.so.1 -l :libjpeg.so.62 -l :libz.so -l :libpng16.so.16 endif LDFLAGS += -Wl,-rpath,'$${ORIGIN}' $(LIB_DIR)