fix some build issues and warnings

[pcsx_rearmed.git] / frontend / main.c

diff --git a/frontend/main.c b/frontend/main.c
index d3df714..4ebcf34 100644 (file)
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -364,9 +364,9 @@ int main(int argc, char *argv[])
                return 1;
 
        // frontend stuff
+       // init input but leave probing to platform code,
+       // they add input drivers and may need to modify them after probe
        in_init();
-       in_evdev_init();
-       //in_probe();
        pl_init();
        plat_init();
        menu_init(); // loads config
@@ -730,9 +730,11 @@ void *SysLoadLibrary(const char *lib) {
 
 #if defined(__x86_64__) || defined(__i386__)
        // convenience hack
-       char name[MAXPATHLEN];
-       snprintf(name, sizeof(name), "%s.x86", lib);
-       lib = name;
+       if (strstr(lib, ".x86") == NULL) {
+               char name[MAXPATHLEN];
+               snprintf(name, sizeof(name), "%s.x86", lib);
+               lib = name;
+       }
 #endif
 
        ret = dlopen(lib, RTLD_NOW);