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