diff options
author | notaz | 2010-11-19 01:56:51 +0200 |
---|---|---|
committer | notaz | 2010-11-19 01:56:51 +0200 |
commit | b60f2812208aa36dc8b9e8e90f02b608dafd0c00 (patch) | |
tree | e169253e546478f8be4962f90546b3dc43ad0787 /frontend/main.c | |
parent | e906c010e1bea71ed4df425be97ce45dc777818c (diff) | |
download | pcsx_rearmed-b60f2812208aa36dc8b9e8e90f02b608dafd0c00.tar.gz pcsx_rearmed-b60f2812208aa36dc8b9e8e90f02b608dafd0c00.tar.bz2 pcsx_rearmed-b60f2812208aa36dc8b9e8e90f02b608dafd0c00.zip |
fbdev output for xvideo, basic ARM build
Diffstat (limited to 'frontend/main.c')
-rw-r--r-- | frontend/main.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/frontend/main.c b/frontend/main.c index 6ee0b2f..e36ad48 100644 --- a/frontend/main.c +++ b/frontend/main.c @@ -18,6 +18,7 @@ #include "../libpcsxcore/misc.h" int UseGui; +static char *(*real_getenv)(const char *name); static void make_path(char *buf, size_t size, const char *dir, const char *fname) { @@ -67,8 +68,18 @@ int main(int argc, char *argv[]) char path[MAXPATHLEN]; int runcd = 0; int loadst = 0; + void *tmp; int i; + tmp = dlopen("/lib/libdl.so.2", RTLD_LAZY); + if (tmp != NULL) + real_getenv = dlsym(tmp, "getenv"); + if (real_getenv == NULL) { + fprintf(stderr, "%s\n", dlerror()); + return 1; + } + dlclose(tmp); + // what is the name of the config file? // it may be redefined by -cfg on the command line strcpy(cfgfile_basename, "pcsx.cfg"); @@ -376,14 +387,10 @@ char *getenv(const char *name) { static char ret[8] = "."; - // HACK - if (name && strcmp(name, "DISPLAY") == 0) - return ":0"; - - if (name && strcmp(name, "HOME") != 0) - fprintf(stderr, "getenv called with %s\n", name); + if (name && strcmp(name, "HOME") == 0) + return ret; - return ret; + return real_getenv(name); } #endif |