bu5hm4n
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* embryo: fix binary path detection on MacOsX. 

SVN revision: 55208
This commit is contained in:
Cedric BAIL 2010-12-03 17:48:17 +00:00
parent 030c1f3f18
commit 2635ddcbf5
1 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
legacy/embryo/src/bin/embryo_cc_prefix.c
View File

@ -29,6 +29,10 @@
# include <glob.h> # include <glob.h>
#endif /* ! HAVE_EVIL */ #endif /* ! HAVE_EVIL */
#ifdef __MacOSX__
# include <mach-o/dyld.h>
#endif
#include "embryo_cc_prefix.h" #include "embryo_cc_prefix.h"
/* local subsystem functions */ /* local subsystem functions */
@ -36,6 +40,9 @@ static int _e_prefix_share_hunt(void);
static int _e_prefix_fallbacks(void); static int _e_prefix_fallbacks(void);
static int _e_prefix_try_proc(void); static int _e_prefix_try_proc(void);
static int _e_prefix_try_argv(char *argv0); static int _e_prefix_try_argv(char *argv0);
#ifdef __MacOSX__
static int _e_prefix_try_dyld(void);
#endif
/* local subsystem globals */ /* local subsystem globals */
static char *_exe_path = NULL; static char *_exe_path = NULL;
@ -89,8 +96,16 @@ e_prefix_determine(char *argv0)
{ {
if (!_e_prefix_try_argv(argv0)) if (!_e_prefix_try_argv(argv0))
{ {
_e_prefix_fallbacks(); #ifdef __MacOSX__
return 0; if (!_e_prefix_try_dyld())
{
#endif
_e_prefix_fallbacks();
return 0;
#ifdef __MacOSX__
}
#endif
} }
} }
/* _exe_path is now a full absolute path TO this exe - figure out rest */ /* _exe_path is now a full absolute path TO this exe - figure out rest */
@ -313,6 +328,21 @@ _e_prefix_fallbacks(void)
return 1; return 1;
} }
#ifdef __MacOSX__
static int
_e_prefix_try_dyld(void)
{
char path[PATH_MAX];
uint32_t size = sizeof (path);
if (_NSGetExecutablePath(path, &size) != 0)
return 0;
_exe_path = strdup(path);
return 1;
}
#endif
static int static int
_e_prefix_try_proc(void) _e_prefix_try_proc(void)
{ {