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

ide: Fixed issue with MacOS install

Browse source
This commit is contained in:
Mirek Fidler 2021-10-07 10:26:43 +02:00
parent dbe763c771
commit 5a332b0c93
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
uppsrc/ide/Install.cpp
View file

@ -71,15 +71,20 @@ bool Install(bool& hasvars)
}
}
};
#ifdef PLATFORM_COCOA
String idir = GetFileFolder(GetAppFolder());
String myapps = DirectoryExists(idir + "/uppsrc") ? idir + "/MyApps" : GetHomeDirFile("MyApps");
#else
String myapps = (DirectoryExists(GetExeDirFile("uppsrc")) ? GetExeDirFile : GetHomeDirFile)("MyApps");
#endif
for(pass = 0; pass < 2; pass++) {
if(pass)
MakeAssembly(myapps);
#ifdef PLATFORM_COCOA
Scan(GetFileFolder(GetAppFolder()) + "/uppsrc");
Scan(GetFileFolder(GetAppFolder()) + "/*");
Scan(idir + "/uppsrc");
Scan(idir + "/*");
#endif
Scan(GetExeFolder() + "/uppsrc");
Scan(GetExeFolder() + "/*");

2
uppsrc/ide/main.cpp
View file

@ -149,9 +149,7 @@ void AppMain___()
#ifdef PLATFORM_WIN32
AutoInstantSetup();
#endif
bool hasvars = FindFile(ConfigFile("*.var"));
#ifdef PLATFORM_POSIX
RemoveConsoleScripts(); // remove old console-script files