diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/cdrcimg/cdrcimg.c | 4 | ||||
| -rw-r--r-- | plugins/dfinput/main.c | 2 | ||||
| -rw-r--r-- | plugins/dfxvideo/gpulib_if.c | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/plugins/cdrcimg/cdrcimg.c b/plugins/cdrcimg/cdrcimg.c index 76cdfba..47371aa 100644 --- a/plugins/cdrcimg/cdrcimg.c +++ b/plugins/cdrcimg/cdrcimg.c @@ -14,7 +14,9 @@ #include <zlib.h> #ifndef _WIN32 #define CALLBACK +#ifndef NO_DYLIB #include <dlfcn.h> +#endif #else #define WIN32_LEAN_AND_MEAN #include <windows.h> @@ -285,7 +287,7 @@ static long CDRinit(void) return -1; } } -#ifndef _WIN32 +#if !defined(_WIN32) && !defined(NO_DYLIB) if (pBZ2_bzBuffToBuffDecompress == NULL) { void *h = dlopen("/usr/lib/libbz2.so.1", RTLD_LAZY); if (h == NULL) diff --git a/plugins/dfinput/main.c b/plugins/dfinput/main.c index 475ea07..c3adedd 100644 --- a/plugins/dfinput/main.c +++ b/plugins/dfinput/main.c @@ -44,6 +44,7 @@ static int old_controller_type1 = -1, old_controller_type2 = -1; PAD##n##_poll = PADpoll_guncon; \ guncon_init(); \ break; \ + case PSE_PAD_TYPE_NEGCON: \ case PSE_PAD_TYPE_GUN: \ default: \ PAD##n##_startPoll = PAD##n##__startPoll; \ @@ -52,6 +53,7 @@ static int old_controller_type1 = -1, old_controller_type2 = -1; } \ } + void dfinput_activate(void) { PadDataS pad; diff --git a/plugins/dfxvideo/gpulib_if.c b/plugins/dfxvideo/gpulib_if.c index 01b8dde..bb3ad56 100644 --- a/plugins/dfxvideo/gpulib_if.c +++ b/plugins/dfxvideo/gpulib_if.c @@ -309,11 +309,11 @@ void renderer_notify_res_change(void) extern const unsigned char cmd_lengths[256]; -int do_cmd_list(unsigned int *list, int list_len, int *last_cmd) +int do_cmd_list(uint32_t *list, int list_len, int *last_cmd) { unsigned int cmd = 0, len; - unsigned int *list_start = list; - unsigned int *list_end = list + list_len; + uint32_t *list_start = list; + uint32_t *list_end = list + list_len; for (; list < list_end; list += 1 + len) { |