fix standalone build

diff --git a/frontend/menu.c b/frontend/menu.c
index c8f34fe..969b35c 100644 (file)
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -36,7 +36,6 @@
 #include "../libpcsxcore/cdriso.h"
 #include "../libpcsxcore/cheat.h"
 #include "../libpcsxcore/new_dynarec/new_dynarec.h"
-#include "../plugins/dfinput/externals.h"
 #include "../plugins/dfsound/spu_config.h"
 #include "psemu_plugin_defs.h"
 #include "arm_features.h"
@@ -2700,8 +2699,6 @@ void menu_prepare_emu(void)
                if (ret)
                        fprintf(stderr, "Warning: GPU_open returned %d\n", ret);
        }
-
-       dfinput_activate();
 }
 
 void menu_update_msg(const char *msg)

diff --git a/frontend/pl_gun_ts.c b/frontend/pl_gun_ts.c
index 315c70c..6c05b7c 100644 (file)
--- a/frontend/pl_gun_ts.c
+++ b/frontend/pl_gun_ts.c
@@ -15,8 +15,6 @@
 #include "plugin_lib.h"
 #include "pl_gun_ts.h"
 #include "menu.h"
-#include "../plugins/dfinput/externals.h"
-#include "../plugins/dfinput/main.h"
 
 #ifdef MAEMO
 #define N900_TSMAX_X 4096
@@ -57,9 +55,9 @@ int pl_gun_ts_update_raw(struct tsdev *ts, int *x, int *y, int *p)
                        limit(gun_x, 0, 1023);
                        limit(gun_y, 0, 1023);
                        if (sp && !(g_opts & OPT_TSGUN_NOTRIGGER))
-                               gun_in |= GUNIN_TRIGGER;
+                               gun_in |= 1;
                        else
-                               gun_in &= ~GUNIN_TRIGGER;
+                               gun_in &= ~1;
                }
        }
 

diff --git a/frontend/plugin_lib.c b/frontend/plugin_lib.c
index 2a417a4..8a6b6ad 100644 (file)
--- a/frontend/plugin_lib.c
+++ b/frontend/plugin_lib.c
@@ -33,7 +33,6 @@
 #include "psemu_plugin_defs.h"
 #include "../libpcsxcore/new_dynarec/new_dynarec.h"
 #include "../libpcsxcore/psxmem_map.h"
-#include "../plugins/dfinput/externals.h"
 
 #define HUD_HEIGHT 10
 
@@ -620,20 +619,16 @@ static void update_input(void)
        emu_set_action(emu_act);
 
        in_keystate[0] = actions[IN_BINDTYPE_PLAYER12];
+
+       // fixme
+       //if (in_type[0] == PSE_PAD_TYPE_GUNCON && tsdev)
+       //      pl_gun_ts_update(tsdev, xn, yn, in);
+       //      in_analog_left[0][0] = xn
 }
 #else /* MAEMO */
 extern void update_input(void);
 #endif
 
-void pl_update_gun(int *xn, int *yn, int *xres, int *yres, int *in)
-{
-       if (tsdev)
-               pl_gun_ts_update(tsdev, xn, yn, in);
-
-       *xres = psx_w;
-       *yres = psx_h;
-}
-
 void pl_gun_byte2(int port, unsigned char byte)
 {
 }