aboutsummaryrefslogtreecommitdiff
path: root/frontend
diff options
context:
space:
mode:
authornotaz2012-04-29 19:23:09 +0300
committernotaz2012-04-29 19:32:08 +0300
commitac6575cdd93d665efc374c1a14b391c6a5308972 (patch)
tree835c3727018e98f2ec096cdec5560b12f6093f05 /frontend
parent4ea7de6a1495abfbc49c54fd2a90e902fdfa13d9 (diff)
downloadpcsx_rearmed-ac6575cdd93d665efc374c1a14b391c6a5308972.tar.gz
pcsx_rearmed-ac6575cdd93d665efc374c1a14b391c6a5308972.tar.bz2
pcsx_rearmed-ac6575cdd93d665efc374c1a14b391c6a5308972.zip
fix some build issues and warnings
Diffstat (limited to 'frontend')
-rw-r--r--frontend/config.h2
-rw-r--r--frontend/main.c8
2 files changed, 6 insertions, 4 deletions
diff --git a/frontend/config.h b/frontend/config.h
index 15ffd30..dcfb598 100644
--- a/frontend/config.h
+++ b/frontend/config.h
@@ -1,6 +1,6 @@
#define MAXPATHLEN 256
//#define NOPSXREC
-#define __LINUX__
+#define __LINUX__ 1
#define PACKAGE_NAME "pcsx"
#define PACKAGE_VERSION "1.9"
#define DEF_PLUGIN_DIR "."
diff --git a/frontend/main.c b/frontend/main.c
index dc5be3c..4ebcf34 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -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);