aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-12-29 03:40:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with develop

Browse source
This commit is contained in:
kervala 2015-11-24 10:13:18 +01:00
parent a2d1524b79
commit 0f418dddbc
1 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
code/nel/src/misc/common.cpp
View file

@ -23,6 +23,8 @@
# include <ShellAPI.h> # include <ShellAPI.h>
# include <io.h> # include <io.h>
# include <tchar.h> # include <tchar.h>
#elif defined NL_OS_MAC
# include <ApplicationServices/ApplicationServices.h>
#elif defined NL_OS_UNIX #elif defined NL_OS_UNIX
# include <unistd.h> # include <unistd.h>
# include <cerrno> # include <cerrno>
@ -1091,7 +1093,26 @@ static bool openDocWithExtension (const char *document, const char *ext)
return true; return true;
} }
#elif defined(NL_OS_MAC) #elif defined(NL_OS_MAC)
return launchProgram("open", document); CFURLRef url = CFURLCreateWithBytes(NULL, (const UInt8 *)document, strlen(document), kCFStringEncodingUTF8, NULL);
if (url)
{
OSStatus res = LSOpenCFURLRef(url, 0);
CFRelease(url);
if (res != 0)
{
nlwarning("LSOpenCFURLRef %s returned %d", document, (sint)res);
return false;
}
return true;
}
else
{
nlwarning("Unable to create URL from %s", document);
return false;
}
#else #else
std::string command = "/usr/bin/xdg-open"; std::string command = "/usr/bin/xdg-open";