~ruther/CTU-FEE-B0B35APO-Semestral-project

f769d1fb22c05df4096477d6223cbc5649f93c52 — František Boháček 3 years ago 2695640
refactor: cleanup build flags
4 files changed, 7 insertions(+), 9 deletions(-)

M image-viewer/Makefile
M lib-gui/Makefile
M lib-pheripherals/Makefile
M text-viewer/Makefile
M image-viewer/Makefile => image-viewer/Makefile +2 -2
@@ 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)


M lib-gui/Makefile => lib-gui/Makefile +1 -3
@@ 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

M lib-pheripherals/Makefile => lib-pheripherals/Makefile +2 -2
@@ 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

M text-viewer/Makefile => text-viewer/Makefile +2 -2
@@ 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)


Do not follow this link