Merged the NAS driver written by Nicolas
Escuder <n.escuder@alineanet.com>.
This commit is contained in:
Alexandre Julliard
parent
72a7369ebc
commit
04b5a86c46
|
|
@ -9255,6 +9255,233 @@ fi
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
NASLIBS=""
|
||||||
|
|
||||||
|
|
||||||
|
for ac_header in audio/audiolib.h
|
||||||
|
do
|
||||||
|
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||||||
|
if eval "test \"\${$as_ac_Header+set}\" = set"; then
|
||||||
|
echo "$as_me:$LINENO: checking for $ac_header" >&5
|
||||||
|
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
|
||||||
|
if eval "test \"\${$as_ac_Header+set}\" = set"; then
|
||||||
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||||
|
fi
|
||||||
|
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
|
||||||
|
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
|
||||||
|
else
|
||||||
|
# Is the header compilable?
|
||||||
|
echo "$as_me:$LINENO: checking $ac_header usability" >&5
|
||||||
|
echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
|
||||||
|
cat >conftest.$ac_ext <<_ACEOF
|
||||||
|
#line $LINENO "configure"
|
||||||
|
#include "confdefs.h"
|
||||||
|
$ac_includes_default
|
||||||
|
#include <$ac_header>
|
||||||
|
_ACEOF
|
||||||
|
rm -f conftest.$ac_objext
|
||||||
|
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||||
|
(eval $ac_compile) 2>&5
|
||||||
|
ac_status=$?
|
||||||
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||||
|
(exit $ac_status); } &&
|
||||||
|
{ ac_try='test -s conftest.$ac_objext'
|
||||||
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||||
|
(eval $ac_try) 2>&5
|
||||||
|
ac_status=$?
|
||||||
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||||
|
(exit $ac_status); }; }; then
|
||||||
|
ac_header_compiler=yes
|
||||||
|
else
|
||||||
|
echo "$as_me: failed program was:" >&5
|
||||||
|
cat conftest.$ac_ext >&5
|
||||||
|
ac_header_compiler=no
|
||||||
|
fi
|
||||||
|
rm -f conftest.$ac_objext conftest.$ac_ext
|
||||||
|
echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
||||||
|
echo "${ECHO_T}$ac_header_compiler" >&6
|
||||||
|
|
||||||
|
# Is the header present?
|
||||||
|
echo "$as_me:$LINENO: checking $ac_header presence" >&5
|
||||||
|
echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
|
||||||
|
cat >conftest.$ac_ext <<_ACEOF
|
||||||
|
#line $LINENO "configure"
|
||||||
|
#include "confdefs.h"
|
||||||
|
#include <$ac_header>
|
||||||
|
_ACEOF
|
||||||
|
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
|
||||||
|
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
|
||||||
|
ac_status=$?
|
||||||
|
egrep -v '^ *\+' conftest.er1 >conftest.err
|
||||||
|
rm -f conftest.er1
|
||||||
|
cat conftest.err >&5
|
||||||
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||||
|
(exit $ac_status); } >/dev/null; then
|
||||||
|
if test -s conftest.err; then
|
||||||
|
ac_cpp_err=$ac_c_preproc_warn_flag
|
||||||
|
else
|
||||||
|
ac_cpp_err=
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
ac_cpp_err=yes
|
||||||
|
fi
|
||||||
|
if test -z "$ac_cpp_err"; then
|
||||||
|
ac_header_preproc=yes
|
||||||
|
else
|
||||||
|
echo "$as_me: failed program was:" >&5
|
||||||
|
cat conftest.$ac_ext >&5
|
||||||
|
ac_header_preproc=no
|
||||||
|
fi
|
||||||
|
rm -f conftest.err conftest.$ac_ext
|
||||||
|
echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
||||||
|
echo "${ECHO_T}$ac_header_preproc" >&6
|
||||||
|
|
||||||
|
# So? What about this header?
|
||||||
|
case $ac_header_compiler:$ac_header_preproc in
|
||||||
|
yes:no )
|
||||||
|
{ echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
|
||||||
|
echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
||||||
|
{ echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
|
||||||
|
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
|
||||||
|
no:yes )
|
||||||
|
{ echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
|
||||||
|
echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
|
||||||
|
{ echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
|
||||||
|
echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
|
||||||
|
{ echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
|
||||||
|
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
|
||||||
|
esac
|
||||||
|
echo "$as_me:$LINENO: checking for $ac_header" >&5
|
||||||
|
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
|
||||||
|
if eval "test \"\${$as_ac_Header+set}\" = set"; then
|
||||||
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||||
|
else
|
||||||
|
eval "$as_ac_Header=$ac_header_preproc"
|
||||||
|
fi
|
||||||
|
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
|
||||||
|
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
|
||||||
|
|
||||||
|
fi
|
||||||
|
if test `eval echo '${'$as_ac_Header'}'` = yes; then
|
||||||
|
cat >>confdefs.h <<_ACEOF
|
||||||
|
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
||||||
|
_ACEOF
|
||||||
|
|
||||||
|
for ac_header in audio/soundlib.h
|
||||||
|
do
|
||||||
|
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||||||
|
echo "$as_me:$LINENO: checking for $ac_header" >&5
|
||||||
|
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
|
||||||
|
if eval "test \"\${$as_ac_Header+set}\" = set"; then
|
||||||
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||||
|
else
|
||||||
|
cat >conftest.$ac_ext <<_ACEOF
|
||||||
|
#line $LINENO "configure"
|
||||||
|
#include "confdefs.h"
|
||||||
|
#include <audio/audiolib.h>
|
||||||
|
|
||||||
|
#include <$ac_header>
|
||||||
|
_ACEOF
|
||||||
|
rm -f conftest.$ac_objext
|
||||||
|
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||||
|
(eval $ac_compile) 2>&5
|
||||||
|
ac_status=$?
|
||||||
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||||
|
(exit $ac_status); } &&
|
||||||
|
{ ac_try='test -s conftest.$ac_objext'
|
||||||
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||||
|
(eval $ac_try) 2>&5
|
||||||
|
ac_status=$?
|
||||||
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||||
|
(exit $ac_status); }; }; then
|
||||||
|
eval "$as_ac_Header=yes"
|
||||||
|
else
|
||||||
|
echo "$as_me: failed program was:" >&5
|
||||||
|
cat conftest.$ac_ext >&5
|
||||||
|
eval "$as_ac_Header=no"
|
||||||
|
fi
|
||||||
|
rm -f conftest.$ac_objext conftest.$ac_ext
|
||||||
|
fi
|
||||||
|
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
|
||||||
|
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
|
||||||
|
if test `eval echo '${'$as_ac_Header'}'` = yes; then
|
||||||
|
cat >>confdefs.h <<_ACEOF
|
||||||
|
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
||||||
|
_ACEOF
|
||||||
|
|
||||||
|
fi
|
||||||
|
|
||||||
|
done
|
||||||
|
|
||||||
|
echo "$as_me:$LINENO: checking for AuCreateFlow in -laudio" >&5
|
||||||
|
echo $ECHO_N "checking for AuCreateFlow in -laudio... $ECHO_C" >&6
|
||||||
|
if test "${ac_cv_lib_audio_AuCreateFlow+set}" = set; then
|
||||||
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||||
|
else
|
||||||
|
ac_check_lib_save_LIBS=$LIBS
|
||||||
|
LIBS="-laudio -lXt $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
|
||||||
|
cat >conftest.$ac_ext <<_ACEOF
|
||||||
|
#line $LINENO "configure"
|
||||||
|
#include "confdefs.h"
|
||||||
|
|
||||||
|
/* Override any gcc2 internal prototype to avoid an error. */
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C"
|
||||||
|
#endif
|
||||||
|
/* We use char because int might match the return type of a gcc2
|
||||||
|
builtin and then its argument prototype would still apply. */
|
||||||
|
char AuCreateFlow ();
|
||||||
|
#ifdef F77_DUMMY_MAIN
|
||||||
|
# ifdef __cplusplus
|
||||||
|
extern "C"
|
||||||
|
# endif
|
||||||
|
int F77_DUMMY_MAIN() { return 1; }
|
||||||
|
#endif
|
||||||
|
int
|
||||||
|
main ()
|
||||||
|
{
|
||||||
|
AuCreateFlow ();
|
||||||
|
;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
_ACEOF
|
||||||
|
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||||
|
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||||||
|
(eval $ac_link) 2>&5
|
||||||
|
ac_status=$?
|
||||||
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||||
|
(exit $ac_status); } &&
|
||||||
|
{ ac_try='test -s conftest$ac_exeext'
|
||||||
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||||
|
(eval $ac_try) 2>&5
|
||||||
|
ac_status=$?
|
||||||
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||||
|
(exit $ac_status); }; }; then
|
||||||
|
ac_cv_lib_audio_AuCreateFlow=yes
|
||||||
|
else
|
||||||
|
echo "$as_me: failed program was:" >&5
|
||||||
|
cat conftest.$ac_ext >&5
|
||||||
|
ac_cv_lib_audio_AuCreateFlow=no
|
||||||
|
fi
|
||||||
|
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
|
||||||
|
LIBS=$ac_check_lib_save_LIBS
|
||||||
|
fi
|
||||||
|
echo "$as_me:$LINENO: result: $ac_cv_lib_audio_AuCreateFlow" >&5
|
||||||
|
echo "${ECHO_T}$ac_cv_lib_audio_AuCreateFlow" >&6
|
||||||
|
if test $ac_cv_lib_audio_AuCreateFlow = yes; then
|
||||||
|
|
||||||
|
cat >>confdefs.h <<\_ACEOF
|
||||||
|
#define HAVE_NAS 1
|
||||||
|
_ACEOF
|
||||||
|
|
||||||
|
NASLIBS="-laudio -lXt \$(X_LIBS) \$(XLIB)"
|
||||||
|
fi
|
||||||
|
|
||||||
|
fi
|
||||||
|
|
||||||
|
done
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
echo "$as_me:$LINENO: checking whether mmap64 works defined as mmap" >&5
|
echo "$as_me:$LINENO: checking whether mmap64 works defined as mmap" >&5
|
||||||
echo $ECHO_N "checking whether mmap64 works defined as mmap... $ECHO_C" >&6
|
echo $ECHO_N "checking whether mmap64 works defined as mmap... $ECHO_C" >&6
|
||||||
|
|
@ -13583,7 +13810,7 @@ MAKE_DLL_RULES=dlls/Makedll.rules
|
||||||
MAKE_PROG_RULES=programs/Makeprog.rules
|
MAKE_PROG_RULES=programs/Makeprog.rules
|
||||||
|
|
||||||
|
|
||||||
ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules programs/Makeprog.rules Makefile debugger/Makefile dlls/Makefile dlls/advapi32/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/comcat/Makefile dlls/comctl32/Makefile dlls/commdlg/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/d3d8/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput8/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dsound/Makefile dlls/gdi/Makefile dlls/glu32/Makefile dlls/icmp/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/kernel/Makefile dlls/lzexpand/Makefile dlls/mapi32/Makefile dlls/mpr/Makefile dlls/msacm/Makefile dlls/msacm/imaadp32/Makefile dlls/msacm/msadp32/Makefile dlls/msacm/msg711/Makefile dlls/msacm/winemp3/Makefile dlls/msdmo/Makefile dlls/msimg32/Makefile dlls/msisys/Makefile dlls/msnet32/Makefile dlls/msrle32/Makefile dlls/msvcrt/Makefile dlls/msvcrt20/Makefile dlls/msvideo/Makefile dlls/netapi32/Makefile dlls/ntdll/Makefile dlls/odbc32/Makefile dlls/ole32/Makefile dlls/oleaut32/Makefile dlls/olecli/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr/Makefile dlls/opengl32/Makefile dlls/psapi/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/rasapi32/Makefile dlls/richedit/Makefile dlls/rpcrt4/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/shdocvw/Makefile dlls/shell32/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/snmpapi/Makefile dlls/sti/Makefile dlls/tapi32/Makefile dlls/ttydrv/Makefile dlls/twain/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/user/Makefile dlls/version/Makefile dlls/win32s/Makefile dlls/winaspi/Makefile dlls/winedos/Makefile dlls/wineps/Makefile dlls/wininet/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/mcianim/Makefile dlls/winmm/mciavi/Makefile dlls/winmm/mcicda/Makefile dlls/winmm/mciseq/Makefile dlls/winmm/mciwave/Makefile dlls/winmm/midimap/Makefile dlls/winmm/wavemap/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineoss/Makefile dlls/winnls/Makefile dlls/winsock/Makefile dlls/winspool/Makefile dlls/wintrust/Makefile dlls/wow32/Makefile dlls/wsock32/Makefile dlls/x11drv/Makefile documentation/Makefile include/Makefile library/Makefile miscemu/Makefile ole/Makefile programs/Makefile programs/avitools/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/expand/Makefile programs/notepad/Makefile programs/osversioncheck/Makefile programs/progman/Makefile programs/regapi/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/regtest/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wcmd/Makefile programs/wineconsole/Makefile programs/winefile/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winetest/Makefile programs/winhelp/Makefile programs/winver/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winapi/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/wmc/Makefile tools/wpp/Makefile tools/wrc/Makefile tsx11/Makefile unicode/Makefile"
|
ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules programs/Makeprog.rules Makefile debugger/Makefile dlls/Makefile dlls/advapi32/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/comcat/Makefile dlls/comctl32/Makefile dlls/commdlg/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/d3d8/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput8/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dsound/Makefile dlls/gdi/Makefile dlls/glu32/Makefile dlls/icmp/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/kernel/Makefile dlls/lzexpand/Makefile dlls/mapi32/Makefile dlls/mpr/Makefile dlls/msacm/Makefile dlls/msacm/imaadp32/Makefile dlls/msacm/msadp32/Makefile dlls/msacm/msg711/Makefile dlls/msacm/winemp3/Makefile dlls/msdmo/Makefile dlls/msimg32/Makefile dlls/msisys/Makefile dlls/msnet32/Makefile dlls/msrle32/Makefile dlls/msvcrt/Makefile dlls/msvcrt20/Makefile dlls/msvideo/Makefile dlls/netapi32/Makefile dlls/ntdll/Makefile dlls/odbc32/Makefile dlls/ole32/Makefile dlls/oleaut32/Makefile dlls/olecli/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr/Makefile dlls/opengl32/Makefile dlls/psapi/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/rasapi32/Makefile dlls/richedit/Makefile dlls/rpcrt4/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/shdocvw/Makefile dlls/shell32/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/snmpapi/Makefile dlls/sti/Makefile dlls/tapi32/Makefile dlls/ttydrv/Makefile dlls/twain/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/user/Makefile dlls/version/Makefile dlls/win32s/Makefile dlls/winaspi/Makefile dlls/winedos/Makefile dlls/wineps/Makefile dlls/wininet/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/mcianim/Makefile dlls/winmm/mciavi/Makefile dlls/winmm/mcicda/Makefile dlls/winmm/mciseq/Makefile dlls/winmm/mciwave/Makefile dlls/winmm/midimap/Makefile dlls/winmm/wavemap/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winenas/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineoss/Makefile dlls/winnls/Makefile dlls/winsock/Makefile dlls/winspool/Makefile dlls/wintrust/Makefile dlls/wow32/Makefile dlls/wsock32/Makefile dlls/x11drv/Makefile documentation/Makefile include/Makefile library/Makefile miscemu/Makefile ole/Makefile programs/Makefile programs/avitools/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/expand/Makefile programs/notepad/Makefile programs/osversioncheck/Makefile programs/progman/Makefile programs/regapi/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/regtest/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wcmd/Makefile programs/wineconsole/Makefile programs/winefile/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winetest/Makefile programs/winhelp/Makefile programs/winver/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winapi/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/wmc/Makefile tools/wpp/Makefile tools/wrc/Makefile tsx11/Makefile unicode/Makefile"
|
||||||
|
|
||||||
|
|
||||||
cat >confcache <<\_ACEOF
|
cat >confcache <<\_ACEOF
|
||||||
|
|
@ -14151,6 +14378,7 @@ do
|
||||||
"dlls/winmm/midimap/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/midimap/Makefile" ;;
|
"dlls/winmm/midimap/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/midimap/Makefile" ;;
|
||||||
"dlls/winmm/wavemap/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/wavemap/Makefile" ;;
|
"dlls/winmm/wavemap/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/wavemap/Makefile" ;;
|
||||||
"dlls/winmm/winealsa/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/winealsa/Makefile" ;;
|
"dlls/winmm/winealsa/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/winealsa/Makefile" ;;
|
||||||
|
"dlls/winmm/winenas/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/winenas/Makefile" ;;
|
||||||
"dlls/winmm/winearts/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/winearts/Makefile" ;;
|
"dlls/winmm/winearts/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/winearts/Makefile" ;;
|
||||||
"dlls/winmm/wineoss/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/wineoss/Makefile" ;;
|
"dlls/winmm/wineoss/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/wineoss/Makefile" ;;
|
||||||
"dlls/winnls/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winnls/Makefile" ;;
|
"dlls/winnls/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winnls/Makefile" ;;
|
||||||
|
|
@ -14389,6 +14617,7 @@ s,@ARTSCCONFIG@,$ARTSCCONFIG,;t t
|
||||||
s,@ARTSLIBS@,$ARTSLIBS,;t t
|
s,@ARTSLIBS@,$ARTSLIBS,;t t
|
||||||
s,@ARTSINCL@,$ARTSINCL,;t t
|
s,@ARTSINCL@,$ARTSINCL,;t t
|
||||||
s,@ALSALIBS@,$ALSALIBS,;t t
|
s,@ALSALIBS@,$ALSALIBS,;t t
|
||||||
|
s,@NASLIBS@,$NASLIBS,;t t
|
||||||
s,@DLLWRAP@,$DLLWRAP,;t t
|
s,@DLLWRAP@,$DLLWRAP,;t t
|
||||||
s,@ac_ct_DLLWRAP@,$ac_ct_DLLWRAP,;t t
|
s,@ac_ct_DLLWRAP@,$ac_ct_DLLWRAP,;t t
|
||||||
s,@DLLIBS@,$DLLIBS,;t t
|
s,@DLLIBS@,$DLLIBS,;t t
|
||||||
|
|
|
||||||
10
configure.ac
10
configure.ac
|
|
@ -568,6 +568,15 @@ then
|
||||||
ALSALIBS="-lasound")
|
ALSALIBS="-lasound")
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
dnl **** Check for NAS ****
|
||||||
|
AC_SUBST(NASLIBS,"")
|
||||||
|
AC_CHECK_HEADERS(audio/audiolib.h,
|
||||||
|
[AC_CHECK_HEADERS(audio/soundlib.h,,,[#include <audio/audiolib.h>])
|
||||||
|
AC_CHECK_LIB(audio,AuCreateFlow,
|
||||||
|
[AC_DEFINE(HAVE_NAS,1,[Define if you have NAS including devel headers])
|
||||||
|
NASLIBS="-laudio -lXt \$(X_LIBS) \$(XLIB)"],,
|
||||||
|
[-lXt $X_LIBS -lXext -lX11 $X_EXTRA_LIBS])])
|
||||||
|
|
||||||
dnl **** Check for broken glibc mmap64 ****
|
dnl **** Check for broken glibc mmap64 ****
|
||||||
|
|
||||||
AC_CACHE_CHECK( [whether mmap64 works defined as mmap], ac_cv_mmap64_works,
|
AC_CACHE_CHECK( [whether mmap64 works defined as mmap], ac_cv_mmap64_works,
|
||||||
|
|
@ -1403,6 +1412,7 @@ dlls/winmm/mciwave/Makefile
|
||||||
dlls/winmm/midimap/Makefile
|
dlls/winmm/midimap/Makefile
|
||||||
dlls/winmm/wavemap/Makefile
|
dlls/winmm/wavemap/Makefile
|
||||||
dlls/winmm/winealsa/Makefile
|
dlls/winmm/winealsa/Makefile
|
||||||
|
dlls/winmm/winenas/Makefile
|
||||||
dlls/winmm/winearts/Makefile
|
dlls/winmm/winearts/Makefile
|
||||||
dlls/winmm/wineoss/Makefile
|
dlls/winmm/wineoss/Makefile
|
||||||
dlls/winnls/Makefile
|
dlls/winnls/Makefile
|
||||||
|
|
|
||||||
|
|
@ -98,6 +98,7 @@ BASEDIRS = \
|
||||||
winmm/wavemap \
|
winmm/wavemap \
|
||||||
winmm/winealsa \
|
winmm/winealsa \
|
||||||
winmm/winearts \
|
winmm/winearts \
|
||||||
|
winmm/winenas \
|
||||||
winmm/wineoss \
|
winmm/wineoss \
|
||||||
winnls \
|
winnls \
|
||||||
winsock \
|
winsock \
|
||||||
|
|
@ -242,6 +243,7 @@ all: \
|
||||||
winearts.drv$(DLLEXT) \
|
winearts.drv$(DLLEXT) \
|
||||||
winedos.dll$(DLLEXT) \
|
winedos.dll$(DLLEXT) \
|
||||||
winemp3.acm$(DLLEXT) \
|
winemp3.acm$(DLLEXT) \
|
||||||
|
winenas.drv$(DLLEXT) \
|
||||||
wineoss.drv$(DLLEXT) \
|
wineoss.drv$(DLLEXT) \
|
||||||
wineps.dll$(DLLEXT) \
|
wineps.dll$(DLLEXT) \
|
||||||
wineps16.dll$(DLLEXT) \
|
wineps16.dll$(DLLEXT) \
|
||||||
|
|
@ -513,6 +515,9 @@ winedos.dll$(DLLEXT): winedos/winedos.dll$(DLLEXT)
|
||||||
winemp3.acm$(DLLEXT): msacm/winemp3/winemp3.acm$(DLLEXT)
|
winemp3.acm$(DLLEXT): msacm/winemp3/winemp3.acm$(DLLEXT)
|
||||||
$(RM) $@ && $(LN_S) msacm/winemp3/winemp3.acm$(DLLEXT) $@
|
$(RM) $@ && $(LN_S) msacm/winemp3/winemp3.acm$(DLLEXT) $@
|
||||||
|
|
||||||
|
winenas.drv$(DLLEXT): winmm/winenas/winenas.drv$(DLLEXT)
|
||||||
|
$(RM) $@ && $(LN_S) winmm/winenas/winenas.drv$(DLLEXT) $@
|
||||||
|
|
||||||
wineoss.drv$(DLLEXT): winmm/wineoss/wineoss.drv$(DLLEXT)
|
wineoss.drv$(DLLEXT): winmm/wineoss/wineoss.drv$(DLLEXT)
|
||||||
$(RM) $@ && $(LN_S) winmm/wineoss/wineoss.drv$(DLLEXT) $@
|
$(RM) $@ && $(LN_S) winmm/wineoss/wineoss.drv$(DLLEXT) $@
|
||||||
|
|
||||||
|
|
@ -633,6 +638,7 @@ winmm/winealsa/winealsa.drv$(DLLEXT): winmm/winealsa
|
||||||
winmm/winearts/winearts.drv$(DLLEXT): winmm/winearts
|
winmm/winearts/winearts.drv$(DLLEXT): winmm/winearts
|
||||||
winedos/winedos.dll$(DLLEXT): winedos
|
winedos/winedos.dll$(DLLEXT): winedos
|
||||||
msacm/winemp3/winemp3.acm$(DLLEXT): msacm/winemp3
|
msacm/winemp3/winemp3.acm$(DLLEXT): msacm/winemp3
|
||||||
|
winmm/winenas/winenas.drv$(DLLEXT): winmm/winenas
|
||||||
winmm/wineoss/wineoss.drv$(DLLEXT): winmm/wineoss
|
winmm/wineoss/wineoss.drv$(DLLEXT): winmm/wineoss
|
||||||
wineps/wineps.dll$(DLLEXT): wineps
|
wineps/wineps.dll$(DLLEXT): wineps
|
||||||
wininet/wininet.dll$(DLLEXT): wininet
|
wininet/wininet.dll$(DLLEXT): wininet
|
||||||
|
|
@ -730,6 +736,7 @@ winmm/winealsa/__install__: winealsa.drv$(DLLEXT)
|
||||||
winmm/winearts/__install__: winearts.drv$(DLLEXT)
|
winmm/winearts/__install__: winearts.drv$(DLLEXT)
|
||||||
winedos/__install__: winedos.dll$(DLLEXT)
|
winedos/__install__: winedos.dll$(DLLEXT)
|
||||||
msacm/winemp3/__install__: winemp3.acm$(DLLEXT)
|
msacm/winemp3/__install__: winemp3.acm$(DLLEXT)
|
||||||
|
winmm/winenas/__install__: winenas.drv$(DLLEXT)
|
||||||
winmm/wineoss/__install__: wineoss.drv$(DLLEXT)
|
winmm/wineoss/__install__: wineoss.drv$(DLLEXT)
|
||||||
wineps/__install__: wineps.dll$(DLLEXT)
|
wineps/__install__: wineps.dll$(DLLEXT)
|
||||||
wininet/__install__: wininet.dll$(DLLEXT)
|
wininet/__install__: wininet.dll$(DLLEXT)
|
||||||
|
|
@ -765,7 +772,7 @@ dinput: user32.dll$(DLLEXT) kernel32.dll$(DLLEXT)
|
||||||
dplay: dplayx.dll$(DLLEXT)
|
dplay: dplayx.dll$(DLLEXT)
|
||||||
dplayx: winmm.dll$(DLLEXT) ole32.dll$(DLLEXT) user32.dll$(DLLEXT) advapi32.dll$(DLLEXT) \
|
dplayx: winmm.dll$(DLLEXT) ole32.dll$(DLLEXT) user32.dll$(DLLEXT) advapi32.dll$(DLLEXT) \
|
||||||
kernel32.dll$(DLLEXT)
|
kernel32.dll$(DLLEXT)
|
||||||
dsound: winmm.dll$(DLLEXT) advapi32.dll$(DLLEXT) kernel32.dll$(DLLEXT)
|
dsound: winmm.dll$(DLLEXT) advapi32.dll$(DLLEXT) kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
|
||||||
gdi: advapi32.dll$(DLLEXT) kernel32.dll$(DLLEXT) libkernel32.dll.$(LIBEXT) libntdll.dll.$(LIBEXT)
|
gdi: advapi32.dll$(DLLEXT) kernel32.dll$(DLLEXT) libkernel32.dll.$(LIBEXT) libntdll.dll.$(LIBEXT)
|
||||||
glu32: kernel32.dll$(DLLEXT)
|
glu32: kernel32.dll$(DLLEXT)
|
||||||
icmp: kernel32.dll$(DLLEXT)
|
icmp: kernel32.dll$(DLLEXT)
|
||||||
|
|
@ -842,6 +849,7 @@ winmm/midimap: winmm.dll$(DLLEXT) user32.dll$(DLLEXT) advapi32.dll$(DLLEXT) kern
|
||||||
winmm/wavemap: msacm32.dll$(DLLEXT) winmm.dll$(DLLEXT) user32.dll$(DLLEXT) kernel32.dll$(DLLEXT)
|
winmm/wavemap: msacm32.dll$(DLLEXT) winmm.dll$(DLLEXT) user32.dll$(DLLEXT) kernel32.dll$(DLLEXT)
|
||||||
winmm/winealsa: winmm.dll$(DLLEXT) user32.dll$(DLLEXT) kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
|
winmm/winealsa: winmm.dll$(DLLEXT) user32.dll$(DLLEXT) kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
|
||||||
winmm/winearts: winmm.dll$(DLLEXT) user32.dll$(DLLEXT) kernel32.dll$(DLLEXT)
|
winmm/winearts: winmm.dll$(DLLEXT) user32.dll$(DLLEXT) kernel32.dll$(DLLEXT)
|
||||||
|
winmm/winenas: winmm.dll$(DLLEXT) user32.dll$(DLLEXT) kernel32.dll$(DLLEXT)
|
||||||
winmm/wineoss: winmm.dll$(DLLEXT) user32.dll$(DLLEXT) kernel32.dll$(DLLEXT)
|
winmm/wineoss: winmm.dll$(DLLEXT) user32.dll$(DLLEXT) kernel32.dll$(DLLEXT)
|
||||||
winmm: user32.dll$(DLLEXT) advapi32.dll$(DLLEXT) kernel32.dll$(DLLEXT)
|
winmm: user32.dll$(DLLEXT) advapi32.dll$(DLLEXT) kernel32.dll$(DLLEXT)
|
||||||
winnls: kernel32.dll$(DLLEXT)
|
winnls: kernel32.dll$(DLLEXT)
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,3 @@
|
||||||
|
Makefile
|
||||||
|
winenas.drv.dbg.c
|
||||||
|
winenas.drv.spec.c
|
||||||
|
|
@ -0,0 +1,18 @@
|
||||||
|
TOPSRCDIR = @top_srcdir@
|
||||||
|
TOPOBJDIR = ../../..
|
||||||
|
SRCDIR = @srcdir@
|
||||||
|
VPATH = @srcdir@
|
||||||
|
MODULE = winenas.drv
|
||||||
|
IMPORTS = winmm user32 kernel32
|
||||||
|
EXTRALIBS = @NASLIBS@
|
||||||
|
|
||||||
|
LDDLLFLAGS = @LDDLLFLAGS@
|
||||||
|
SYMBOLFILE = $(MODULE).tmp.o
|
||||||
|
|
||||||
|
C_SRCS = \
|
||||||
|
audio.c \
|
||||||
|
nas.c
|
||||||
|
|
||||||
|
@MAKE_DLL_RULES@
|
||||||
|
|
||||||
|
### Dependencies:
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,93 @@
|
||||||
|
/* -*- tab-width: 8; c-basic-offset: 4 -*- */
|
||||||
|
/*
|
||||||
|
*
|
||||||
|
* Wine Driver for NAS Network Audio System
|
||||||
|
* http://radscan.com/nas.html
|
||||||
|
*
|
||||||
|
* Copyright 2002 Nicolas Escuder <n.escuder@alineanet.com>
|
||||||
|
*
|
||||||
|
* Code massively copied from Eric Pouech's OSS driver
|
||||||
|
* and Chris Morgan aRts driver
|
||||||
|
*
|
||||||
|
* This library is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU Lesser General Public
|
||||||
|
* License as published by the Free Software Foundation; either
|
||||||
|
* version 2.1 of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This library is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public
|
||||||
|
* License along with this library; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "config.h"
|
||||||
|
|
||||||
|
#include "windef.h"
|
||||||
|
#include "winbase.h"
|
||||||
|
#include "wingdi.h"
|
||||||
|
#include "winuser.h"
|
||||||
|
#include "mmddk.h"
|
||||||
|
#include "nas.h"
|
||||||
|
|
||||||
|
#ifdef HAVE_NAS
|
||||||
|
static int nas = 0;
|
||||||
|
|
||||||
|
/**************************************************************************
|
||||||
|
* NAS_drvOpen [internal]
|
||||||
|
*/
|
||||||
|
static DWORD NAS_drvOpen(LPSTR str)
|
||||||
|
{
|
||||||
|
if (nas)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
/* I know, this is ugly, but who cares... */
|
||||||
|
nas = 1;
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**************************************************************************
|
||||||
|
* NAS_drvClose [internal]
|
||||||
|
*/
|
||||||
|
static DWORD NAS_drvClose(DWORD dwDevID)
|
||||||
|
{
|
||||||
|
if (nas) {
|
||||||
|
nas = 0;
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
#endif /* #ifdef HAVE_NAS */
|
||||||
|
|
||||||
|
|
||||||
|
/**************************************************************************
|
||||||
|
* DriverProc (WINENAS.@)
|
||||||
|
*/
|
||||||
|
LONG CALLBACK NAS_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg,
|
||||||
|
DWORD dwParam1, DWORD dwParam2)
|
||||||
|
{
|
||||||
|
/* EPP TRACE("(%08lX, %04X, %08lX, %08lX, %08lX)\n", */
|
||||||
|
/* EPP dwDevID, hDriv, wMsg, dwParam1, dwParam2); */
|
||||||
|
|
||||||
|
switch(wMsg) {
|
||||||
|
#ifdef HAVE_NAS
|
||||||
|
case DRV_LOAD: NAS_WaveInit();
|
||||||
|
/* NAS_MidiInit(); FIXME: no midi */
|
||||||
|
return 1;
|
||||||
|
case DRV_FREE: return NAS_WaveClose();
|
||||||
|
case DRV_OPEN: return NAS_drvOpen((LPSTR)dwParam1);
|
||||||
|
case DRV_CLOSE: return NAS_drvClose(dwDevID);
|
||||||
|
case DRV_ENABLE: return 1;
|
||||||
|
case DRV_DISABLE: return 1;
|
||||||
|
case DRV_QUERYCONFIGURE: return 1;
|
||||||
|
case DRV_CONFIGURE: MessageBoxA(0, "NAS MultiMedia Driver !", "NAS Driver", MB_OK); return 1;
|
||||||
|
case DRV_INSTALL: return DRVCNF_RESTART;
|
||||||
|
case DRV_REMOVE: return DRVCNF_RESTART;
|
||||||
|
#endif
|
||||||
|
default:
|
||||||
|
return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,28 @@
|
||||||
|
/* Definition for NAS driver : wine multimedia system
|
||||||
|
*
|
||||||
|
* Copyright 2002 Nicolas Escuder <n.escuder@alineanet.com>
|
||||||
|
*
|
||||||
|
* This library is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU Lesser General Public
|
||||||
|
* License as published by the Free Software Foundation; either
|
||||||
|
* version 2.1 of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This library is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public
|
||||||
|
* License along with this library; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef __WINE_NAS_H
|
||||||
|
#define __WINE_NAS_H
|
||||||
|
|
||||||
|
extern LONG NAS_WaveInit(void);
|
||||||
|
extern LONG NAS_WaveClose(void);
|
||||||
|
|
||||||
|
typedef unsigned int AFormat;
|
||||||
|
|
||||||
|
#endif /* __WINE_NAS_H */
|
||||||
|
|
@ -0,0 +1,2 @@
|
||||||
|
@ stdcall DriverProc(long long long long long) NAS_DriverProc
|
||||||
|
@ stdcall wodMessage(long long long long long) NAS_wodMessage
|
||||||
|
|
@ -35,6 +35,12 @@
|
||||||
/* Define to use .string instead of .ascii */
|
/* Define to use .string instead of .ascii */
|
||||||
#undef HAVE_ASM_STRING
|
#undef HAVE_ASM_STRING
|
||||||
|
|
||||||
|
/* Define to 1 if you have the <audio/audiolib.h> header file. */
|
||||||
|
#undef HAVE_AUDIO_AUDIOLIB_H
|
||||||
|
|
||||||
|
/* Define to 1 if you have the <audio/soundlib.h> header file. */
|
||||||
|
#undef HAVE_AUDIO_SOUNDLIB_H
|
||||||
|
|
||||||
/* Define to 1 if you have the `chsize' function. */
|
/* Define to 1 if you have the `chsize' function. */
|
||||||
#undef HAVE_CHSIZE
|
#undef HAVE_CHSIZE
|
||||||
|
|
||||||
|
|
@ -302,6 +308,9 @@
|
||||||
/* Define if struct msghdr contains msg_accrights */
|
/* Define if struct msghdr contains msg_accrights */
|
||||||
#undef HAVE_MSGHDR_ACCRIGHTS
|
#undef HAVE_MSGHDR_ACCRIGHTS
|
||||||
|
|
||||||
|
/* Define if you have NAS including devel headers */
|
||||||
|
#undef HAVE_NAS
|
||||||
|
|
||||||
/* Define to 1 if you have the <ncurses.h> header file. */
|
/* Define to 1 if you have the <ncurses.h> header file. */
|
||||||
#undef HAVE_NCURSES_H
|
#undef HAVE_NCURSES_H
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue