github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

uppsrc: external library dependencies refactored with pkg-config

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@13917 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2020-01-19 12:59:46 +00:00
parent f7a00a4a2e
commit 2b49b2aac4
6 changed files with 11 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

10
uppsrc/Core/Core.upp
View file

@ -9,8 +9,6 @@ library(LINUX !ANDROID) "pthread dl rt";
library(BSD !OSX) "pthread rt execinfo";
library(WIN32 !MSC8ARM) "advapi32 shell32 winmm mpr";
library(SOLARIS) "posix4 dl";
library(!WIN32) z;
@ -19,16 +17,10 @@ library(OSX) pthread;
library(ANDROID) atomic;
library(WIN32) "kernel32 user32 ole32 oleaut32 uuid ws2_32";
library(WIN32) "kernel32 user32 ole32 oleaut32 uuid ws2_32 advapi32 shell32 winmm mpr";
static_library(ANDROID) cpufeatures;
options(XGNU) -O0;
options(XGNU) -ffunction-sections;
link(SOLARIS) "-Wl,-R -Wl,/usr/local/lib";
link(GCC POSIX STACKTRACE) -rdynamic;
file

26
uppsrc/CtrlCore/CtrlCore.upp
View file

@ -6,31 +6,15 @@ uses
RichText,
Painter;
library(WIN32 !MSC8ARM) "advapi32 comdlg32 comctl32";
library(WIN32) "advapi32 comdlg32 comctl32";
library(WIN32 !MSC8ARM) "user32 gdi32";
library(LINUX !RAINBOW GUI) "X11 Xrender Xinerama";
library(LINUX !RAINBOW) dl;
library(LINUX !XLFD !RAINBOW GUI) Xft;
library(BSD !RAINBOW !OSX) "X11 Xau Xdmcp";
library(BSD !XLFD !RAINBOW !OSX) "Xft fontconfig Xrender freetype expat";
library(LINUX !XLFD !SHARED !RAINBOW GUI) "fontconfig Xrender freetype";
library(FREEBSD | DRAGONFLY) xcb;
library(POSIX !NOGTK !RAINBOW GUI !OSX) notify;
library(DRAGONFLY) "Xext Xinerama";
library(WIN32) "user32 gdi32";
link(OSX !X11) "-framework Foundation -framework Cocoa -framework Carbon";
pkg_config(POSIX !X11) gtk+-3.0;
pkg_config(LINUX | FREEBSD) "freetype2 x11 xinerama xrender xft xdmpc fontconfig xcb xext";
pkg_config((LINUX | FREEBSD) !X11) "gtk+-3.0 libnotify";
file
Core readonly separator,

12
uppsrc/Draw/Draw.upp
View file

@ -8,17 +8,9 @@ acceptflags
uses
Core;
library(WIN32 !MSC8ARM) "user32 gdi32";
library(WIN32) "user32 gdi32";
library(LINUX) "dl freetype";
library(BSD !XLFD !OSX) "fontconfig freetype expat";
library(LINUX !XLFD) "fontconfig expat";
library(OSX11) "fontconfig freetype expat";
library(FREEBSD) xcb;
pkg_config(LINUX|FREEBSD) "freetype2 x11 fontconfig xcb expat";
file
Draw.h options(BUILDER_OPTION) PCH,

12
uppsrc/ide/ide.upp
View file

@ -23,8 +23,6 @@ uses
urepo,
Report;
link(WIN32 MSC) /MAP;
file
IDE readonly separator,
ide.h options(BUILDER_OPTION) PCH,
@ -116,18 +114,12 @@ file
mainconfig
"" = "GUI",
"" = "GUI .USEMALLOC",
"" = ".NOGTK GUI",
"" = "GUI HEAPDBG CHECKINIT",
"" = "GUI TESTINSTALL",
"" = "GUI CHECKCLIPBOARD",
"" = "GUI SVO_VALUE",
"" = "GUI GTK",
"" = "GUI MT X11",
"" = "GUI MT NOGTK",
"" = "GUI NOGTK",
"" = "GUI MT TEST_HIDPI",
"" = "GUI PEAKMEM",
"" = "GUI HEAPLOG";
"" = "GUI HEAPLOG",
"" = "GUI X11";
custom() "",
"ASDFASDFASDF",

4
uppsrc/plugin/png/png.upp
View file

@ -6,8 +6,6 @@ uses
Core,
Draw;
library(!WIN32 !OSX) png;
options
-DPNG_NO_READ_EXPAND,
-DPNG_NO_READ_SHIFT,
@ -56,7 +54,7 @@ options
-DPNG_NO_READ_OPT_PLTE,
-DPNG_NO_INFO_IMAGE;
options(MSC8ARM) "-D_WIN32_WCE -DARM -D_ARM_ -DUNDER_CE -DUNICODE -D_UNICODE";
pkg_config(LINUX|FREEBSD) libpng;
file
png.h,

4
uppsrc/plugin/z/z.upp
View file

@ -2,10 +2,6 @@ description "zlib compressor/decompressor and its U++ encapsulation\3770,128,128
options(BUILDER_OPTION) NOWARNINGS;
flags(NOTMFC) "!GUI !CONSOLE";
options(MSC8ARM) -DNO_ERRNO_H;
file
z.h,
"Original files" readonly separator,