diff --git a/uppsrc/ide/Install.cpp b/uppsrc/ide/Install.cpp index ae67e42c0..77e984c72 100644 --- a/uppsrc/ide/Install.cpp +++ b/uppsrc/ide/Install.cpp @@ -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() + "/*"); diff --git a/uppsrc/ide/main.cpp b/uppsrc/ide/main.cpp index 81f0306a8..ae0f60203 100644 --- a/uppsrc/ide/main.cpp +++ b/uppsrc/ide/main.cpp @@ -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