From: Karsten Ballüder Date: Wed, 9 Jun 1999 14:49:50 +0000 (+0000) Subject: Added --with-wave/--without-wave for conditional wxWave support. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/2749089a332d27b5bad583e4f4cb213651040e4f Added --with-wave/--without-wave for conditional wxWave support. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/configure.in b/configure.in index 26cf142505..10f34f4c2f 100644 --- a/configure.in +++ b/configure.in @@ -247,6 +247,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_FILE=no DEFAULT_wxUSE_TEXTFILE=no DEFAULT_wxUSE_TIMEDATE=no + DEFAULT_wxUSE_WAVE=no DEFAULT_wxUSE_INTL=no DEFAULT_wxUSE_CONFIG=no DEFAULT_wxUSE_STREAMS=no @@ -337,6 +338,7 @@ else DEFAULT_wxUSE_FILE=yes DEFAULT_wxUSE_TEXTFILE=yes DEFAULT_wxUSE_TIMEDATE=yes + DEFAULT_wxUSE_WAVE=no DEFAULT_wxUSE_INTL=yes DEFAULT_wxUSE_CONFIG=yes DEFAULT_wxUSE_STREAMS=yes @@ -488,6 +490,7 @@ WX_ARG_ENABLE(sockets, [ --enable-sockets use socket/network classes WX_ARG_ENABLE(ipc, [ --enable-ipc use interprocess communication (wxSocket etc.)], wxUSE_IPC) WX_ARG_ENABLE(apple_ieee, [ --enable-apple_ieee use the Apple IEEE codec], wxUSE_APPLE_IEEE) WX_ARG_ENABLE(timedate, [ --enable-timedate use date/time classes], wxUSE_TIMEDATE) +WX_ARG_ENABLE(wave, [ --enable-wave use wxWave class], wxUSE_WAVE) WX_ARG_ENABLE(fraction, [ --enable-fraction use wxFraction class], wxUSE_FRACTION) WX_ARG_ENABLE(dynlib, [ --enable-dynlib use wxLibrary class for DLL loading], wxUSE_DYNLIB_CLASS) WX_ARG_ENABLE(longlong, [ --enable-longlong use wxLongLong class], wxUSE_LONGLONG) @@ -1442,6 +1445,10 @@ if test "$wxUSE_TIMEDATE" = "yes"; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest" fi +if test "$wxUSE_WAVE" = "yes"; then + AC_DEFINE(wxUSE_WAVE) +fi + if test "$wxUSE_FILE" = "yes"; then AC_DEFINE(wxUSE_FILE) fi diff --git a/include/wx/gtk/wave.h b/include/wx/gtk/wave.h index 14bdf11293..c75f264084 100644 --- a/include/wx/gtk/wave.h +++ b/include/wx/gtk/wave.h @@ -12,6 +12,8 @@ #ifndef _WX_WAVE_H_ #define _WX_WAVE_H_ +#if wxUSE_WAVE + #ifdef __GNUG__ #pragma interface "wave.h" #endif @@ -57,3 +59,5 @@ private: #endif +#endif + diff --git a/include/wx/gtk1/wave.h b/include/wx/gtk1/wave.h index 14bdf11293..c75f264084 100644 --- a/include/wx/gtk1/wave.h +++ b/include/wx/gtk1/wave.h @@ -12,6 +12,8 @@ #ifndef _WX_WAVE_H_ #define _WX_WAVE_H_ +#if wxUSE_WAVE + #ifdef __GNUG__ #pragma interface "wave.h" #endif @@ -57,3 +59,5 @@ private: #endif +#endif + diff --git a/src/gtk/wave.cpp b/src/gtk/wave.cpp index ee85956bed..80a679ebb8 100644 --- a/src/gtk/wave.cpp +++ b/src/gtk/wave.cpp @@ -13,6 +13,10 @@ #pragma implementation "wave.h" #endif +#include + +#if wxUSE_WAVE + // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -221,4 +225,5 @@ bool wxWave::InitDSP(int dev, int iDataBits, int iChannel,unsigned long ulSampli return TRUE; } +#endif diff --git a/src/gtk1/wave.cpp b/src/gtk1/wave.cpp index ee85956bed..80a679ebb8 100644 --- a/src/gtk1/wave.cpp +++ b/src/gtk1/wave.cpp @@ -13,6 +13,10 @@ #pragma implementation "wave.h" #endif +#include + +#if wxUSE_WAVE + // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -221,4 +225,5 @@ bool wxWave::InitDSP(int dev, int iDataBits, int iChannel,unsigned long ulSampli return TRUE; } +#endif