mirror of
https://github.com/ultimatepp/ultimatepp.git
synced 2026-08-17 22:03:03 -06:00
Merge branch 'master' of https://github.com/ultimatepp/ultimatepp
This commit is contained in:
commit
5757da059d
4 changed files with 20 additions and 16 deletions
9
Makefile
9
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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue