Makefile.am
author Sam Lantinga <slouken@libsdl.org>
Mon, 02 Jun 2003 14:50:22 +0000
changeset 632 85e104fe14c2
parent 521 136d97397288
child 720 f90d80d68071
permissions -rw-r--r--
Date: Sun, 1 Jun 2003 15:38:45 -0700 (PDT)
From: Jeff Brown <jabrown@caida.org>
Subject: [patch] SDL-1.2.5 + FreeBSD joystick axes, hat fixes

Hello again! When I sent in some SDL fixes last December, I found out
they'd already been fixed in the CVS version. This time, I checked the
repository before bugging you. =)

I'm using SDL-1.2.5 on a FreeBSD 4.6.2-RELEASE system, and in the course
of getting my multi-analog-axis USB controller (with a hat switch!)
working with d2x-sdl -- the SDL port of the Descent 2 engine -- I came
across a few problems:

1) The second analog stick is reported as a slider in one direction, and
"Rz" in the other. SDL was ignoring the Rz axis, so I added Rx/Ry/Rz to
the set of things SDL considers to be axes.

2) After the above change, the set of JOYAXE_* axes for my gamepad was
{0,1,3,7}; however, d2x-sdl expects the axes to be contiguously numbered
from 0, which seems like a pretty reasonable expectation, rather than
having to scan the entire space of axes that SDL may or may not have.
So, I added a table lookup which maps the JOYAXE_* axis numbers to 0,1,...
in the order they're detected by SDL_SYS_JoystickOpen(), when reporting
them to the application. I also added a function "usage_to_joyaxe()"
which maps the USB HUG_* usage values to JOYAXE_values, since the repeated
case statements testing for HUG_* were getting out of hand.

3) The BSD joystick driver had no hat support, so I added it. It looks
like our USB library can only support one hat switch per device, which
makes life easy.

The patch against SDL-1.2.5 which implements these changes is at:

http://www.caida.org/~jabrown/patches/sdl-1.2.5-bsdhat.diff

After applying, SDL's "testjoystick" reports all activity from my gamepad
correctly, and d2x works too (though it needed some other fixes).

Moving on...

There is also a problem with slightly different USBHID library interfaces
on different versions of FreeBSD. I wasn't going to mention this since the
FreeBSD port for SDL-1.2.5 (and not SDL itself) was doing the FreeBSD
version-specific patching, so I e-mailed the port maintainer with this
change. However, I see that you've incorporated the FreeBSD
version-checking stuff into the CVS version of SDL, so now it's relevant
for you too.

The problem is, the FreeBSD #if tests don't work right for FreeBSD
4.6.2-RELEASE. There may be other versions with this problem, but I've
only tested 4.6.2-R. The following patch against your latest CVS version
fixes this:

--- SDL_sysjoystick.c-1.16 Tue Apr 15 09:02:08 2003
+++ SDL_sysjoystick.c Sun Jun 1 15:10:28 2003
@@ -420,6 +420,8 @@
# else
len = hid_report_size(rd, repinfo[repind].kind, r->rid);
# endif
+# elif (__FreeBSD_version == 460002)
+ len = hid_report_size(rd, r->rid, repinfo[repind].kind);
# else
len = hid_report_size(rd, repinfo[repind].kind, &r->rid);
#endif


I hope this is all useful to you. I've been getting myself dizzy playing
Descent 2 with it, all morning!

-Jeff Brown


P.S. My USB controller is a Thrustmaster Firestorm Dual Analog 2. That's
probably irrelevant, but I threw it in for completeness.
     1 # The top-level input Makefile for SDL
     2 
     3 # require automake 1.4
     4 AUTOMAKE_OPTIONS = 1.4
     5 
     6 ## Any directories that you want built and installed should go here.
     7 SUBDIRS = src include docs
     8 
     9 ## Any directories you want a part of the distribution should be listed
    10 ## here, as well as have a Makefile generated at the end of configure.in
    11 ##
    12 ## This only works for subdirectories one level deep.
    13 DIST_SUBDIRS = $(SUBDIRS)
    14 
    15 # SDL runtime configuration script
    16 bin_SCRIPTS = sdl-config
    17 
    18 # All the rest of the distributed files
    19 EXTRA_DIST =		\
    20 	BUGS		\
    21 	TODO		\
    22 	COPYING		\
    23 	CREDITS		\
    24 	INSTALL		\
    25 	README		\
    26 	README.AmigaOS	\
    27 	README.CVS	\
    28 	README.DC	\
    29 	README.Epoc	\
    30 	README.MacOS	\
    31 	README.MacOSX	\
    32 	README.MiNT	\
    33 	README.NanoX	\
    34 	README.PicoGUI	\
    35 	README.QNX	\
    36 	README.Qtopia	\
    37 	README.WinCE	\
    38 	README-SDL.txt	\
    39 	Borland.html	\
    40 	Borland.zip	\
    41 	VisualC.html	\
    42 	VisualC.zip	\
    43 	VisualC7.zip	\
    44 	VisualCE.zip	\
    45 	Makefile.dc	\
    46 	MPWmake.sea.bin	\
    47 	CWprojects.sea.bin \
    48 	PBProjects.tar.gz \
    49 	EpocBuildFiles.zip \
    50 	WhatsNew	\
    51 	docs.html	\
    52 	sdl.m4		\
    53 	SDL.spec	\
    54 	autogen.sh	\
    55 	strip_fPIC.sh
    56 
    57 # M4 macro file for inclusion with autoconf
    58 m4datadir = $(datadir)/aclocal
    59 m4data_DATA = sdl.m4
    60 
    61 # Rule to build tar-gzipped distribution package
    62 $(PACKAGE)-$(VERSION).tar.gz: dist
    63 
    64 # Rule to build RPM distribution package
    65 rpm: $(PACKAGE)-$(VERSION).tar.gz
    66 	rpm -ta $(PACKAGE)-$(VERSION).tar.gz
    67 
    68 # Rule to rebuild the export lists for BeOS, MacOS and Win32.
    69 exports:
    70 	(cd src/main/beos/exports; $(MAKE))
    71 	(cd src/main/macos/exports; $(MAKE))
    72 	(cd src/main/win32/exports; $(MAKE))
    73 
    74 # Rule to build the Project Builder archive in MacOS X
    75 PBProjects.tar.gz:
    76 	rm -f `find . -name .DS_Store`
    77 	if [ -d PBProjects ]; then \
    78 	    tar zcvf $@ PBProjects; \
    79 	fi
    80 
    81 # Rule to force automake to rebuild the library
    82 changed:
    83 	@echo "This build target is no longer necessary"
    84 
    85 # Rule to install the libraries only - prevent rebuilding apps
    86 install-lib:
    87 	cd src && $(MAKE) install-libLTLIBRARIES
    88 
    89 # Run ldconfig after installing the library:
    90 install-hook:
    91 	-ldconfig
    92 
    93 # Grab the test programs for the distribution:
    94 dist-hook:
    95 	if test -f test/Makefile; then (cd test; make distclean); fi
    96 	cp -rp $(srcdir)/test $(distdir)
    97 	rm -rf `find $(distdir) -type d -name CVS -print`
    98 
    99 # Create a CVS snapshot that people can run update -d on
   100 CVSROOT = :pserver:guest@libsdl.org:/home/sdlweb/libsdl.org/cvs
   101 snapshot:
   102 	cvs -d $(CVSROOT) login
   103 	cvs -d $(CVSROOT) checkout SDL12
   104 	(cd SDL12 && ./autogen.sh)
   105 	mv SDL12 SDL-1.2
   106 	tar zcvf $(HOME)/SDL-1.2.tar.gz SDL-1.2
   107 	rm -rf SDL-1.2