aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornegativeExponent2020-10-31 07:15:03 +0800
committernegativeExponent2020-10-31 17:50:30 +0800
commit8b9b4c9f8f3d892c657e5a4ad0f799c23cfa735b (patch)
treec891d3fcbfde668fcd8633a60dbf211d608278ae
parent2ead2fb6d618305ca48e50e1982bb7e01bf45237 (diff)
downloadpcsx_rearmed-8b9b4c9f8f3d892c657e5a4ad0f799c23cfa735b.tar.gz
pcsx_rearmed-8b9b4c9f8f3d892c657e5a4ad0f799c23cfa735b.tar.bz2
pcsx_rearmed-8b9b4c9f8f3d892c657e5a4ad0f799c23cfa735b.zip
Remove dfinput plugin from Makefile
The dfinput plugin is not used in this codebase, so remove them when compiling. Will repurpose dfinput_activate() to do out init later.
-rw-r--r--Makefile2
-rw-r--r--frontend/libretro.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 993b05e..d751fb1 100644
--- a/Makefile
+++ b/Makefile
@@ -258,7 +258,9 @@ LDFLAGS += -lm
endif
# dfinput
+ifneq "$(PLATFORM)" "libretro"
OBJS += plugins/dfinput/main.o plugins/dfinput/pad.o plugins/dfinput/guncon.o
+endif
# frontend/gui
OBJS += frontend/cspace.o
diff --git a/frontend/libretro.c b/frontend/libretro.c
index 323932a..6416b67 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -1440,7 +1440,7 @@ bool retro_load_game(const struct retro_game_info *info)
}
plugin_call_rearmed_cbs();
- dfinput_activate();
+ /* dfinput_activate(); */
if (CheckCdrom() == -1)
{
@@ -2198,7 +2198,7 @@ static void update_variables(bool in_flight)
GPU_open(&gpuDisp, "PCSX", NULL);
}
- dfinput_activate();
+ /* dfinput_activate(); */
}
else
{