github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-24 14:22:40 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

uppbox: MakePosixIntall: umks32 NOSSL flag; cosmetics

Browse source
This commit is contained in:
Mirek Fidler 2023-06-03 01:54:48 +02:00
parent e00bdcecc7
commit 1a0e604510
4 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppbox/MakePosixInstall/Main.cpp
View file

@ -127,7 +127,7 @@ CONSOLE_APP_MAIN
#endif
#ifdef PLATFORM_LINUX
Syx(GetHomeDirFile("bin/umk") + " ./uppsrc umk GCC32 " OPTS + release + "/umks32");
Syx(GetHomeDirFile("bin/umk") + " ./uppsrc umk GCC32 " OPTS + "+NOSSL " + release + "/umks32");
#endif
Syx(GetHomeDirFile("bin/umk") + " ./uppsrc umk GCC +NOMM -rvsM");

1
uppsrc/Core/Ops.h
View file

@ -262,7 +262,6 @@ byte addc64(uint64& result, const uint64& value, byte carry) {
force_inline
byte addc64(uint64& r, uint64 a, byte carry)
{
uint64_t r1 = r;
r += a + carry;
return carry ? r <= a : r < a;
}

2
uppsrc/umk/UppHub.cpp
View file

@ -151,7 +151,6 @@ void UppHubDlg::Install(const Index<String>& ii_)
bool UppHubAuto(const String& main)
{
bool noprompt = false;
Index<String> pmissing;
for(;;) {
Workspace wspc;
@ -176,7 +175,6 @@ bool UppHubAuto(const String& main)
if(found.GetCount() == missing.GetCount() && missing != pmissing) {
dlg.Install(found);
noprompt = true;
pmissing = clone(missing);
continue;
}

8
uppsrc/umk/umk.upp
View file

@ -1,8 +1,9 @@
description "Commandline U++ package/assembly builder\377";
uses
ide\Builders,
Core/SSL;
ide\Builders;
uses(!NOSSL) Core/SSL;
file
umake.h,
@ -15,5 +16,6 @@ file
mainconfig
"" = "",
"" = "NOMM";
"" = "NOMM",
"" = "NOSSL";