notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix some build issues and warnings
[pcsx_rearmed.git]
/
frontend
/
main.c
diff --git
a/frontend/main.c
b/frontend/main.c
index
c512175
..
4ebcf34
100644
(file)
--- a/
frontend/main.c
+++ b/
frontend/main.c
@@
-151,6
+151,7
@@
void emu_set_default_config(void)
pl_rearmed_cbs.gpu_unai.abe_hack =
pl_rearmed_cbs.gpu_unai.no_light =
pl_rearmed_cbs.gpu_unai.no_blend = 0;
pl_rearmed_cbs.gpu_unai.abe_hack =
pl_rearmed_cbs.gpu_unai.no_light =
pl_rearmed_cbs.gpu_unai.no_blend = 0;
+ memset(&pl_rearmed_cbs.gpu_peopsgl, 0, sizeof(pl_rearmed_cbs.gpu_peopsgl));
pl_rearmed_cbs.gpu_peopsgl.iVRamSize = 64;
pl_rearmed_cbs.gpu_peopsgl.iTexGarbageCollection = 1;
pl_rearmed_cbs.gpu_peopsgl.iVRamSize = 64;
pl_rearmed_cbs.gpu_peopsgl.iTexGarbageCollection = 1;
@@
-363,9
+364,9
@@
int main(int argc, char *argv[])
return 1;
// frontend stuff
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_init();
- in_evdev_init();
- //in_probe();
pl_init();
plat_init();
menu_init(); // loads config
pl_init();
plat_init();
menu_init(); // loads config
@@
-729,9
+730,11
@@
void *SysLoadLibrary(const char *lib) {
#if defined(__x86_64__) || defined(__i386__)
// convenience hack
#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);
#endif
ret = dlopen(lib, RTLD_NOW);