Joystick: use weak functions

include/core/joystickapi.hpp

@@ -1,6 +1,12 @@
 #ifndef _joystickapi__hpp__included__
 #define _joystickapi__hpp__included__
 
+#ifdef JOYSTICK_WEAK
+#define JOYSTICK_DRV_ATTRIBUTE __attribute__((weak))
+#else
+#define JOYSTICK_DRV_ATTRIBUTE
+#endif
+
 /**
  * Joystick initialization function.
  *
@@ -8,7 +14,7 @@
  * - The call occurs in the main thread.
  * - Implemented by the joystick plugin.
  */
-void joystick_driver_init() throw();
+void joystick_driver_init() throw() JOYSTICK_DRV_ATTRIBUTE ;
 /**
  * Joystick quit function.
  *
@@ -16,21 +22,21 @@ void joystick_driver_init() throw();
  * - The call occurs in the main thread.
  * - Implemented by the joystick plugin.
  */
-void joystick_driver_quit() throw();
+void joystick_driver_quit() throw() JOYSTICK_DRV_ATTRIBUTE ;
 /**
  * This thread becomes the joystick polling thread.
  *
  * - Called in joystick polling thread.
  */
-void joystick_driver_thread_fn() throw();
+void joystick_driver_thread_fn() throw() JOYSTICK_DRV_ATTRIBUTE ;
 /**
  * Signal the joystick thread to quit.
  */
-void joystick_driver_signal() throw();
+void joystick_driver_signal() throw() JOYSTICK_DRV_ATTRIBUTE ;
 /**
  * Identification for joystick plugin.
  */
-const char* joystick_driver_name;
+extern const char* joystick_driver_name JOYSTICK_DRV_ATTRIBUTE ;
 
 #endif
 

src/core/dummyjoy.cpp

@@ -1,3 +1,4 @@
+#define JOYSTICK_WEAK
 #include "core/joystickapi.hpp"
 
 void joystick_driver_init() throw()

src/platform/dummy/Makefile

@@ -2,9 +2,6 @@ OBJECTS=
 ifeq ($(SOUND),DUMMY)
 OBJECTS += sound.$(OBJECT_SUFFIX)
 endif
-ifeq ($(JOYSTICK),DUMMY)
-OBJECTS += joystick.$(OBJECT_SUFFIX)
-endif
 
 .PRECIOUS: %.$(OBJECT_SUFFIX) %.files
 

src/platform/dummy/joystick.cpp

@@ -1,19 +0,0 @@
-#include "core/joystickapi.hpp"
-
-void joystick_driver_init() throw()
-{
-}
-
-void joystick_driver_quit() throw()
-{
-}
-
-void joystick_driver_thread_fn() throw()
-{
-}
-
-void joystick_driver_signal() throw()
-{
-}
-
-const char* joystick_driver_name = "Dummy joystick plugin";