From 637b626f06e2a5c4f7ebdd5e63872b6e94bb1653 Mon Sep 17 00:00:00 2001 From: Mirek Fidler Date: Fri, 3 Jan 2025 13:40:02 +0100 Subject: [PATCH] Makefile(s) updated --- Makefile | 9 +++++---- Makefile.in | 9 +++++---- umkMakefile | 9 +++++---- umkMakefile.in | 9 +++++---- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 2c2002119..7e11df560 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,15 @@ UPPDIR1 = ./uppsrc/ -UPPDIR2 = /home/cxl/.config/u++/umk/UppHub/gdal/ -UPPDIR3 = /home/cxl/.config/u++/umk/UppHub/eigen/ +UPPDIR2 = /home/cxl/.config/u++/theide/UppHub/gdal/ +UPPDIR3 = /home/cxl/.config/u++/theide/UppHub/eigen/ +UPPDIR4 = /home/cxl/.config/u++/theide/UppHub/Functions4U/ UPPOUT = .cache/upp.out/ -CINC = -I$(UPPDIR1) -I$(UPPDIR2) -I$(UPPDIR3) `pkg-config --cflags libpng` `pkg-config --cflags freetype2` `pkg-config --cflags fontconfig` `pkg-config --cflags x11` `pkg-config --cflags xcb` `pkg-config --cflags expat` `pkg-config --cflags xinerama` `pkg-config --cflags xrender` `pkg-config --cflags xft` `pkg-config --cflags xdmcp` `pkg-config --cflags xext` `pkg-config --cflags gtk+-3.0` `pkg-config --cflags libnotify` -I./ -I$(UPPOUT) +CINC = -I$(UPPDIR1) -I$(UPPDIR2) -I$(UPPDIR3) -I$(UPPDIR4) `pkg-config --cflags libpng` `pkg-config --cflags freetype2` `pkg-config --cflags fontconfig` `pkg-config --cflags x11` `pkg-config --cflags xcb` `pkg-config --cflags expat` `pkg-config --cflags xinerama` `pkg-config --cflags xrender` `pkg-config --cflags xft` `pkg-config --cflags xdmcp` `pkg-config --cflags xext` `pkg-config --cflags gtk+-3.0` `pkg-config --cflags libnotify` -I./ -I$(UPPOUT) Macro = -DflagGUI -DflagGCC -DflagSHARED -DflagPOSIX -DflagLINUX CXX = c++ LINKER = $(CXX) CFLAGS = -O3 -ffunction-sections -fdata-sections -CXXFLAGS = -O3 -ffunction-sections -fdata-sections -std=c++17 +CXXFLAGS = -O3 -ffunction-sections -fdata-sections -std=c++14 LDFLAGS = -Wl,--gc-sections $(LINKOPTIONS) LIBPATH = AR = ar -sr diff --git a/Makefile.in b/Makefile.in index 2c2002119..7e11df560 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,14 +1,15 @@ UPPDIR1 = ./uppsrc/ -UPPDIR2 = /home/cxl/.config/u++/umk/UppHub/gdal/ -UPPDIR3 = /home/cxl/.config/u++/umk/UppHub/eigen/ +UPPDIR2 = /home/cxl/.config/u++/theide/UppHub/gdal/ +UPPDIR3 = /home/cxl/.config/u++/theide/UppHub/eigen/ +UPPDIR4 = /home/cxl/.config/u++/theide/UppHub/Functions4U/ UPPOUT = .cache/upp.out/ -CINC = -I$(UPPDIR1) -I$(UPPDIR2) -I$(UPPDIR3) `pkg-config --cflags libpng` `pkg-config --cflags freetype2` `pkg-config --cflags fontconfig` `pkg-config --cflags x11` `pkg-config --cflags xcb` `pkg-config --cflags expat` `pkg-config --cflags xinerama` `pkg-config --cflags xrender` `pkg-config --cflags xft` `pkg-config --cflags xdmcp` `pkg-config --cflags xext` `pkg-config --cflags gtk+-3.0` `pkg-config --cflags libnotify` -I./ -I$(UPPOUT) +CINC = -I$(UPPDIR1) -I$(UPPDIR2) -I$(UPPDIR3) -I$(UPPDIR4) `pkg-config --cflags libpng` `pkg-config --cflags freetype2` `pkg-config --cflags fontconfig` `pkg-config --cflags x11` `pkg-config --cflags xcb` `pkg-config --cflags expat` `pkg-config --cflags xinerama` `pkg-config --cflags xrender` `pkg-config --cflags xft` `pkg-config --cflags xdmcp` `pkg-config --cflags xext` `pkg-config --cflags gtk+-3.0` `pkg-config --cflags libnotify` -I./ -I$(UPPOUT) Macro = -DflagGUI -DflagGCC -DflagSHARED -DflagPOSIX -DflagLINUX CXX = c++ LINKER = $(CXX) CFLAGS = -O3 -ffunction-sections -fdata-sections -CXXFLAGS = -O3 -ffunction-sections -fdata-sections -std=c++17 +CXXFLAGS = -O3 -ffunction-sections -fdata-sections -std=c++14 LDFLAGS = -Wl,--gc-sections $(LINKOPTIONS) LIBPATH = AR = ar -sr diff --git a/umkMakefile b/umkMakefile index 9e107704a..6accdd44f 100644 --- a/umkMakefile +++ b/umkMakefile @@ -1,14 +1,15 @@ UPPDIR1 = ./uppsrc/ -UPPDIR2 = /home/cxl/.config/u++/umk/UppHub/gdal/ -UPPDIR3 = /home/cxl/.config/u++/umk/UppHub/eigen/ +UPPDIR2 = /home/cxl/.config/u++/theide/UppHub/gdal/ +UPPDIR3 = /home/cxl/.config/u++/theide/UppHub/eigen/ +UPPDIR4 = /home/cxl/.config/u++/theide/UppHub/Functions4U/ UPPOUT = .cache/upp.out/ -CINC = -I$(UPPDIR1) -I$(UPPDIR2) -I$(UPPDIR3) `pkg-config --cflags libpng` `pkg-config --cflags freetype2` `pkg-config --cflags fontconfig` `pkg-config --cflags x11` `pkg-config --cflags xcb` `pkg-config --cflags expat` -I./ -I$(UPPOUT) +CINC = -I$(UPPDIR1) -I$(UPPDIR2) -I$(UPPDIR3) -I$(UPPDIR4) `pkg-config --cflags libpng` `pkg-config --cflags freetype2` `pkg-config --cflags fontconfig` `pkg-config --cflags x11` `pkg-config --cflags xcb` `pkg-config --cflags expat` -I./ -I$(UPPOUT) Macro = -DflagGCC -DflagSHARED -DflagPOSIX -DflagLINUX CXX = c++ LINKER = $(CXX) CFLAGS = -O3 -ffunction-sections -fdata-sections -CXXFLAGS = -O3 -ffunction-sections -fdata-sections -std=c++17 +CXXFLAGS = -O3 -ffunction-sections -fdata-sections -std=c++14 LDFLAGS = -Wl,--gc-sections $(LINKOPTIONS) LIBPATH = AR = ar -sr diff --git a/umkMakefile.in b/umkMakefile.in index 9e107704a..6accdd44f 100644 --- a/umkMakefile.in +++ b/umkMakefile.in @@ -1,14 +1,15 @@ UPPDIR1 = ./uppsrc/ -UPPDIR2 = /home/cxl/.config/u++/umk/UppHub/gdal/ -UPPDIR3 = /home/cxl/.config/u++/umk/UppHub/eigen/ +UPPDIR2 = /home/cxl/.config/u++/theide/UppHub/gdal/ +UPPDIR3 = /home/cxl/.config/u++/theide/UppHub/eigen/ +UPPDIR4 = /home/cxl/.config/u++/theide/UppHub/Functions4U/ UPPOUT = .cache/upp.out/ -CINC = -I$(UPPDIR1) -I$(UPPDIR2) -I$(UPPDIR3) `pkg-config --cflags libpng` `pkg-config --cflags freetype2` `pkg-config --cflags fontconfig` `pkg-config --cflags x11` `pkg-config --cflags xcb` `pkg-config --cflags expat` -I./ -I$(UPPOUT) +CINC = -I$(UPPDIR1) -I$(UPPDIR2) -I$(UPPDIR3) -I$(UPPDIR4) `pkg-config --cflags libpng` `pkg-config --cflags freetype2` `pkg-config --cflags fontconfig` `pkg-config --cflags x11` `pkg-config --cflags xcb` `pkg-config --cflags expat` -I./ -I$(UPPOUT) Macro = -DflagGCC -DflagSHARED -DflagPOSIX -DflagLINUX CXX = c++ LINKER = $(CXX) CFLAGS = -O3 -ffunction-sections -fdata-sections -CXXFLAGS = -O3 -ffunction-sections -fdata-sections -std=c++17 +CXXFLAGS = -O3 -ffunction-sections -fdata-sections -std=c++14 LDFLAGS = -Wl,--gc-sections $(LINKOPTIONS) LIBPATH = AR = ar -sr