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

theide, umk: Improved macos install

Browse source
This commit is contained in:
Mirek Fidler 2023-04-08 18:33:32 +02:00
parent 44b363d647
commit f1bf8ab3a3
1 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

24
uppsrc/ide/Builders/Install.cpp
View file

@ -27,8 +27,8 @@ DEBUGGER = "gdb";
ALLOW_PRECOMPILED_HEADERS = "0";
DISABLE_BLITZ = "0";
PATH = "";
INCLUDE = "/opt/local/include;/usr/include";
LIB = "/opt/local/lib;/usr/lib";
INCLUDE = "$INCLUDE$";
LIB = "$LIB$;
LINKMODE_LOCK = "0";)";
#elif PLATFORM_SOLARIS
@ -148,9 +148,23 @@ LINKMODE_LOCK = "0";)";
void CreateBuildMethods()
{
#ifdef PLATFORM_COCOA
String bm = ConfigFile("CLANG.bm");
if(IsNull(LoadFile(bm)))
SaveFile(bm, clang_bm);
String bm_path = ConfigFile("CLANG.bm");
if(IsNull(LoadFile(bm_path))) {
String bm = clang_bm;
auto Path = [&](const char *var, const char *path) {
String h;
for(String s : Split(path, ';'))
if(DirectoryExists(s))
MergeWith(h, ";", s);
bm.Replace(var, h);
};
Path("$INCLUDE$", "/opt/local/include;/usr/include;/opt/homebrew/include;/opt/homebrew/opt/openssl/include");
Path("$LIB$", "/opt/local/lib;/usr/lib;/opt/homebrew/lib;/opt/homebrew/opt/openssl/lib");
SaveFile(bm_path, bm);
}
#else
bool openbsd = ToLower(Sys("uname")).Find("openbsd") >= 0;
auto Fix = [=](const char *s) {