Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed broken test for wxUSE_JOYSTICK in configure.

Browse Source 
added joytest sample to samples_dist and samples/configure.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6867 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
2000-03-19 23:04:18 +00:00
parent 281b0186b8
commit ceded8b925
5 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.in
View File

@@ -870,6 +870,13 @@ SAMPLES_DIST: ALL_GUI_DIST
cp $(SAMPDIR)/ipc/*.h $(DISTDIR)/samples/ipc cp $(SAMPDIR)/ipc/*.h $(DISTDIR)/samples/ipc
cp $(SAMPDIR)/ipc/*.xpm $(DISTDIR)/samples/ipc cp $(SAMPDIR)/ipc/*.xpm $(DISTDIR)/samples/ipc
mkdir $(DISTDIR)/samples/joytest
cp $(SAMPDIR)/joytest/Makefile.in $(DISTDIR)/samples/joytest
cp $(SAMPDIR)/joytest/makefile.unx $(DISTDIR)/samples/joytest
cp $(SAMPDIR)/joytest/*.cpp $(DISTDIR)/samples/joytest
cp $(SAMPDIR)/joytest/*.h $(DISTDIR)/samples/joytest
cp $(SAMPDIR)/joytest/*.wav $(DISTDIR)/samples/joytest
mkdir $(DISTDIR)/samples/layout mkdir $(DISTDIR)/samples/layout
cp $(SAMPDIR)/layout/Makefile.in $(DISTDIR)/samples/layout cp $(SAMPDIR)/layout/Makefile.in $(DISTDIR)/samples/layout
cp $(SAMPDIR)/layout/makefile.unx $(DISTDIR)/samples/layout cp $(SAMPDIR)/layout/makefile.unx $(DISTDIR)/samples/layout

10
configure vendored
View File

@@ -9281,7 +9281,7 @@ else
int main() { int main() {
/* Ultrix mips cc rejects this. */ /* Ultrix mips cc rejects this. */
typedef int charset[2]; const charset x; typedef int charset[2]; const charset x = {0,0};
/* SunOS 4.1.1 cc rejects this. */ /* SunOS 4.1.1 cc rejects this. */
char const *const *ccp; char const *const *ccp;
char **p; char **p;
@@ -9356,7 +9356,7 @@ for ac_kw in inline __inline__ __inline; do
#include "confdefs.h" #include "confdefs.h"
int main() { int main() {
} $ac_kw foo() { } int $ac_kw foo() {
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:9363: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:9363: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
@@ -12975,7 +12975,7 @@ fi
if test "$TOOLKIT" != "MSW"; then if test "$TOOLKIT" != "MSW"; then
if test "$wxUSE_JOYSTICK" = 1; then if test "$wxUSE_JOYSTICK" = "yes"; then
for ac_hdr in linux/joystick.h for ac_hdr in linux/joystick.h
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
@@ -13017,14 +13017,14 @@ fi
done done
if test "$ac_cv_header_linux_joystick_h" != "yes"; then if test "$ac_cv_header_linux_joystick_h" != "yes"; then
wxUSE_JOYSTICK=0 wxUSE_JOYSTICK=no
echo "configure: warning: Joystick not supported yb this system" 1>&2 echo "configure: warning: Joystick not supported yb this system" 1>&2
fi fi
fi fi
fi fi
if test "$wxUSE_JOYSTICK" = 1; then if test "$wxUSE_JOYSTICK" = "yes"; then
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
#define wxUSE_JOYSTICK 1 #define wxUSE_JOYSTICK 1
EOF EOF

6
configure.in
View File

@@ -3057,11 +3057,11 @@ dnl ---------------------------------------------------------------------------
dnl under MSW we always have joystick support dnl under MSW we always have joystick support
if test "$TOOLKIT" != "MSW"; then if test "$TOOLKIT" != "MSW"; then
if test "$wxUSE_JOYSTICK" = 1; then if test "$wxUSE_JOYSTICK" = "yes"; then
dnl joystick support is only for Linux 2.1.x or greater dnl joystick support is only for Linux 2.1.x or greater
AC_CHECK_HEADERS(linux/joystick.h) AC_CHECK_HEADERS(linux/joystick.h)
if test "$ac_cv_header_linux_joystick_h" != "yes"; then if test "$ac_cv_header_linux_joystick_h" != "yes"; then
wxUSE_JOYSTICK=0 wxUSE_JOYSTICK=no
AC_MSG_WARN(Joystick not supported yb this system, disabled) AC_MSG_WARN(Joystick not supported yb this system, disabled)
fi fi
fi fi
@@ -3069,7 +3069,7 @@ fi
fi fi
dnl if !MSW dnl if !MSW
if test "$wxUSE_JOYSTICK" = 1; then if test "$wxUSE_JOYSTICK" = "yes"; then
AC_DEFINE(wxUSE_JOYSTICK) AC_DEFINE(wxUSE_JOYSTICK)
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest" SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest"
fi fi

2
samples/configure vendored
View File

@@ -669,6 +669,7 @@ trap 'rm -fr `echo "
image/Makefile image/Makefile
internat/Makefile internat/Makefile
ipc/Makefile ipc/Makefile
joytest/Makefile
layout/Makefile layout/Makefile
listctrl/Makefile listctrl/Makefile
mdi/Makefile mdi/Makefile
@@ -811,6 +812,7 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
image/Makefile image/Makefile
internat/Makefile internat/Makefile
ipc/Makefile ipc/Makefile
joytest/Makefile
layout/Makefile layout/Makefile
listctrl/Makefile listctrl/Makefile
mdi/Makefile mdi/Makefile

1
samples/configure.in
View File

@@ -37,6 +37,7 @@ AC_OUTPUT([
image/Makefile image/Makefile
internat/Makefile internat/Makefile
ipc/Makefile ipc/Makefile
joytest/Makefile
layout/Makefile layout/Makefile
listctrl/Makefile listctrl/Makefile
mdi/Makefile mdi/Makefile