fbdev output for xvideo, basic ARM build

[pcsx_rearmed.git] / frontend / main.c

diff --git a/frontend/main.c b/frontend/main.c
index 6ee0b2f..e36ad48 100644 (file)
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -18,6 +18,7 @@
 #include "../libpcsxcore/misc.h"
 
 int UseGui;
 #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)
 {
 
 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;
        char path[MAXPATHLEN];
        int runcd = 0;
        int loadst = 0;

+       void *tmp;

        int i;
 
        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");
        // 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] = ".";
 
 {
        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
 
 }
 #endif