github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-15 14:16:07 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

CtrlLib: Default maximum line len increased to 400000 characters, Core: Fixed to compile with MSVC x86, .scripts

Browse source
This commit is contained in:
Mirek Fidler 2025-10-08 23:58:11 +02:00
parent 2ff3a99bc8
commit c2dc0b3617
5 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
uppbox/Scripts/updateinfo.txt
View file

@ -107,11 +107,11 @@ nasm, strawberry perl
make sure Scripts folder is on windows path (needs restart)
from perl prompt run
from perl prompt
check echo %PATH%
vc32.bat
vc32.bat (use msvs*.bm file to update, do not forget %PATH%;)
unpack openssl into new dir (it seems there is a problem reusing it in mingw64)

6
uppbox/Scripts/vc32.bat
View file

@ -1,3 +1,3 @@
set PATH=c:/upp/nasm;c:/program files (x86)/microsoft visual studio/2019/buildtools/vc/tools/msvc/14.23.28105/bin/hostx86/x86;c:/program files (x86)/windows kits/10/bin/10.0.18362.0/x86;C:\\upp\\bin/openssl/bin;C:\\upp\\bin/SDL2/lib/x86;C:\\upp\\bin/pgsql/x86/bin;C:\\upp\\bin/mysql/lib32;%PATH%
set INCLUDE=c:/program files (x86)/microsoft visual studio/2019/buildtools/vc/tools/msvc/14.23.28105/include;c:/program files (x86)/windows kits/10/include/10.0.18362.0/um;c:/program files (x86)/windows kits/10/include/10.0.18362.0/ucrt;c:/program files (x86)/windows kits/10/include/10.0.18362.0/shared
set LIB=c:/program files (x86)/microsoft visual studio/2019/buildtools/vc/tools/msvc/14.23.28105/lib/x86;c:/program files (x86)/windows kits/10/lib/10.0.18362.0/ucrt/x86;c:/program files (x86)/windows kits/10/lib/10.0.18362.0/um/x86
set PATH=%PATH%;c:/program files/microsoft visual studio/2022/community/vc/tools/msvc/14.44.35207/bin/hostx86/x86;c:/program files (x86)/windows kits/10/bin/10.0.26100.0/x86;C:\\upp\\bin/SDL2/lib/x86;C:\\upp\\bin/pgsql/x86/bin;C:\\upp\\bin/mysql/lib32
set INCLUDE=c:/program files/microsoft visual studio/2022/community/vc/tools/msvc/14.44.35207/include;c:/program files (x86)/windows kits/10/include/10.0.26100.0/um;c:/program files (x86)/windows kits/10/include/10.0.26100.0/ucrt;c:/program files (x86)/windows kits/10/include/10.0.26100.0/shared;C:\\upp\\bin/openssl/include;C:\\upp\\bin/SDL2/include;C:\\upp\\bin/pgsql/x86/include;C:\\upp\\bin/mysql/include;C:\\upp\\bin/llvm"
set LIB=c:/program files/microsoft visual studio/2022/community/vc/tools/msvc/14.44.35207/lib/x86;c:/program files (x86)/windows kits/10/lib/10.0.26100.0/ucrt/x86;c:/program files (x86)/windows kits/10/lib/10.0.26100.0/um/x86;C:\\upp\\bin/openssl/lib32;C:\\upp\\bin/SDL2/lib/x86;C:\\upp\\bin/pgsql/x86/lib;C:\\upp\\bin/mysql/lib32;C:\\upp\\bin/llvm

6
uppbox/Scripts/vc64.bat
View file

@ -1,3 +1,3 @@
set PATH=c:/upp/nasm;c:/program files (x86)/microsoft visual studio/2019/buildtools/vc/tools/msvc/14.23.28105/bin/hostx64/x64;c:/program files (x86)/windows kits/10/bin/10.0.18362.0/x64;C:\\upp\\bin/openssl/bin64;C:\\upp\\bin/SDL2/lib/x64;C:\\upp\\bin/pgsql/x64/bin;C:\\upp\\bin/mysql/lib64;%PATH%
set INCLUDE=c:/program files (x86)/microsoft visual studio/2019/buildtools/vc/tools/msvc/14.23.28105/include;c:/program files (x86)/windows kits/10/include/10.0.18362.0/um;c:/program files (x86)/windows kits/10/include/10.0.18362.0/ucrt;c:/program files (x86)/windows kits/10/include/10.0.18362.0/shared
set LIB=c:/program files (x86)/microsoft visual studio/2019/buildtools/vc/tools/msvc/14.23.28105/lib/x64;c:/program files (x86)/windows kits/10/lib/10.0.18362.0/ucrt/x64;c:/program files (x86)/windows kits/10/lib/10.0.18362.0/um/x64
set PATH=%PATH%;c:/program files/microsoft visual studio/2022/community/vc/tools/msvc/14.44.35207/bin/hostx64/x64;c:/program files (x86)/windows kits/10/bin/10.0.26100.0/x64;C:\\upp\\bin/SDL2/lib/x64;C:\\upp\\bin/pgsql/x64/bin;C:\\upp\\bin/mysql/lib64
set INCLUDE=c:/program files/microsoft visual studio/2022/community/vc/tools/msvc/14.44.35207/include;c:/program files (x86)/windows kits/10/include/10.0.26100.0/um;c:/program files (x86)/windows kits/10/include/10.0.26100.0/ucrt;c:/program files (x86)/windows kits/10/include/10.0.26100.0/shared;C:\\upp\\bin/openssl/include;C:\\upp\\bin/SDL2/include;C:\\upp\\bin/pgsql/x64/include;C:\\upp\\bin/mysql/include;C:\\upp\\bin/llvm
set LIB=c:/program files/microsoft visual studio/2022/community/vc/tools/msvc/14.44.35207/lib/x64;c:/program files (x86)/windows kits/10/lib/10.0.26100.0/ucrt/x64;c:/program files (x86)/windows kits/10/lib/10.0.26100.0/um/x64;C:\\upp\\bin/openssl/lib64;C:\\upp\\bin/SDL2/lib/x64;C:\\upp\\bin/pgsql/x64/lib;C:\\upp\\bin/mysql/lib64;C:\\upp\\bin/llvm;C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v12.6\\lib\\x64

2
uppsrc/Core/Ops.h
View file

@ -284,7 +284,7 @@ int CountTrailingZeroBits64(uint64 x)
{
#if COMPILER_GCC && !defined(flagLEGACY_CPU)
return __builtin_ctzll(x);
#elif COMPILER_MSC && !defined(flagLEGACY_CPU)
#elif COMPILER_MSC && !defined(flagLEGACY_CPU) && CPU_64
unsigned long index;
_BitScanForward64(&index, x);
return index;

5
uppsrc/CtrlLib/Text.cpp
View file

@ -36,7 +36,7 @@ TextCtrl::TextCtrl()
max_total = 200 * 1024 * 1024;
#endif
#endif
max_line_len = 100000;
max_line_len = 400000;
truncated = false;
}
@ -188,6 +188,7 @@ int TextCtrl::LoadLines(Vector<Ln>& ls, int n, int64& total, Stream& in, byte ch
bool cr = false;
byte b8 = 0;
auto line_count = [&] { return view_line_count ? *view_line_count : ls.GetCount(); };
int max_line_len16 = max_line_len / 4;
if(charset == CHARSET_UTF16_LE || charset == CHARSET_UTF16_BE) {
WStringBuffer wln;
auto put_wln = [&]() {
@ -219,7 +220,7 @@ int TextCtrl::LoadLines(Vector<Ln>& ls, int n, int64& total, Stream& in, byte ch
}
else {
wln.Cat(c);
if(wln.GetCount() >= max_line_len)
if(wln.GetCount() >= max_line_len16)
goto truncate_line;
}
}