From 86e097b3020f45f031e3196e0c187a12ac3f2b3d Mon Sep 17 00:00:00 2001 From: Mirek Fidler Date: Mon, 24 Nov 2025 14:34:00 +0100 Subject: [PATCH] x11s experiment --- uppsrc/Core/Core.upp | 4 ++++ uppsrc/Core/FileMapping.cpp | 3 ++- uppsrc/CtrlCore/CtrlCore.upp | 4 +++- uppsrc/Draw/Draw.upp | 4 ++-- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/uppsrc/Core/Core.upp b/uppsrc/Core/Core.upp index 04a4df2bf..f0b9af189 100644 --- a/uppsrc/Core/Core.upp +++ b/uppsrc/Core/Core.upp @@ -25,6 +25,10 @@ static_library(ANDROID) cpufeatures; link(GCC POSIX STACKTRACE) -rdynamic; +link(LINUX !SHARED) "-nodefaultlibs -Wl,-shared -l c -Wl,-static"; + +link(LINUX SHARED) "-Wl,-static -Wl,--start-group -lfreetype -lfontconfig -lfreetype -lX11 -lxcb -lexpat -lpng16 -lfreetype -lX11 -lXinerama -lXrender -lXdmcp -lXau -lxcb -lXext -lbrotlidec -lbrotlicommon -lpng16 -lbz2 -lXft -lpthread -ldl -lrt -lz -Wl,--end-group -Wl,-shared"; + file Core.h options(BUILDER_OPTION) PCH, config.h, diff --git a/uppsrc/Core/FileMapping.cpp b/uppsrc/Core/FileMapping.cpp index 43aef1ffb..923fcbb5b 100644 --- a/uppsrc/Core/FileMapping.cpp +++ b/uppsrc/Core/FileMapping.cpp @@ -65,7 +65,8 @@ bool FileMapping::Open(const char *filename, dword mode, int64 wsize, mode_t acm if(!FileStream::OpenHandle(filename, mode, hfile, filesize, acm)) return false; if((mode & FileStream::MODEMASK) == FileStream::CREATE) { - (void)ftruncate(hfile, wsize); + if(ftruncate(hfile, wsize)) + return false; filesize = wsize; } #endif diff --git a/uppsrc/CtrlCore/CtrlCore.upp b/uppsrc/CtrlCore/CtrlCore.upp index 16ccf00c1..bc0456e80 100644 --- a/uppsrc/CtrlCore/CtrlCore.upp +++ b/uppsrc/CtrlCore/CtrlCore.upp @@ -8,7 +8,9 @@ uses library(WIN32) "advapi32 comdlg32 comctl32 imm32"; -pkg_config(POSIX !OSX !VIRTUALGUI) "freetype2 x11 xinerama xrender xft xdmcp fontconfig xcb xext"; +library(POSIX !OSX !VIRTUALGUI !SO X11) "freetype X11 Xinerama Xrender Xdmcp Xau xcb Xext brotlidec brotlicommon png16 bz2 Xft"; + +pkg_config(POSIX !OSX !VIRTUALGUI SO) "freetype2 x11 xinerama xrender xft xdmcp fontconfig xcb xext"; pkg_config(POSIX !X11 !OSX !VIRTUALGUI) "gtk+-3.0 libnotify"; diff --git a/uppsrc/Draw/Draw.upp b/uppsrc/Draw/Draw.upp index 995df938b..37231c805 100644 --- a/uppsrc/Draw/Draw.upp +++ b/uppsrc/Draw/Draw.upp @@ -13,9 +13,9 @@ library(WIN32) "usp10 user32 gdi32"; link(OSX !X11 !NOMM) "-framework Foundation -framework Cocoa -framework Carbon"; -pkg_config(POSIX !OSX) "freetype2 fontconfig"; +pkg_config(POSIX !OSX !SO) "freetype2 fontconfig"; -pkg_config(POSIX !OSX !VIRTUALGUI) "x11 xcb expat"; +pkg_config(POSIX !OSX !VIRTUALGUI !SO) "x11 xcb expat"; file Draw.h options(BUILDER_OPTION) PCH,