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

Compilation fix for Cygwin

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34630 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2005-06-10 14:45:39 +00:00
parent abc736fd0e
commit 69067986c1
2 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
contrib/samples/mmedia/mmbman.cpp
View File

@@ -355,9 +355,9 @@ MMBoardVideoFile::MMBoardVideoFile(const wxString& filename)
{ {
m_output_window = NULL; m_output_window = NULL;
#if defined(__UNIX__) #if defined(__UNIX__) && !defined(__CYGWIN__)
m_video_driver = new wxVideoXANIM(filename); m_video_driver = new wxVideoXANIM(filename);
#elif defined(__WINDOWS__) && !defined(__MINGW32__) && !defined(__WATCOMC__) #elif defined(__WINDOWS__) && !defined(__MINGW32__) && !defined(__WATCOMC__) && !defined(__CYGWIN__)
// versions of Open Watcom and MinGW tested against this source does not // versions of Open Watcom and MinGW tested against this source does not
// deliver "digitalv.h" required in this feature // deliver "digitalv.h" required in this feature
m_video_driver = new wxVideoWindows(filename); m_video_driver = new wxVideoWindows(filename);
@@ -510,7 +510,10 @@ DECLARE_APP(MMBoardApp)
wxSoundStream *MMBoardManager::OpenSoundStream() wxSoundStream *MMBoardManager::OpenSoundStream()
{ {
#ifdef __UNIX__ #ifdef __WIN32__
if ((wxGetApp().m_caps & MM_SOUND_WIN) != 0)
return new wxSoundStreamWin();
#elif __UNIX__
if ((wxGetApp().m_caps & MM_SOUND_ESD) != 0) if ((wxGetApp().m_caps & MM_SOUND_ESD) != 0)
return new wxSoundStreamESD(); return new wxSoundStreamESD();
@@ -518,11 +521,6 @@ wxSoundStream *MMBoardManager::OpenSoundStream()
return new wxSoundStreamOSS(); return new wxSoundStreamOSS();
#endif #endif
#ifdef __WIN32__
if ((wxGetApp().m_caps & MM_SOUND_WIN) != 0)
return new wxSoundStreamWin();
#endif
wxMessageBox(_T("You are trying to open a multimedia but you have not devices"), _T("Error"), wxOK | wxICON_ERROR, NULL); wxMessageBox(_T("You are trying to open a multimedia but you have not devices"), _T("Error"), wxOK | wxICON_ERROR, NULL);
return NULL; return NULL;

19
contrib/samples/mmedia/mmboard.cpp
View File

@@ -198,7 +198,15 @@ wxUint8 MMBoardApp::TestMultimediaCaps()
caps = 0; caps = 0;
#ifdef __UNIX__ #ifdef __WIN32__
// We test the Windows sound support.
dev = new wxSoundStreamWin();
if (dev->GetError() == wxSOUND_NOERROR)
caps |= MM_SOUND_WIN;
delete dev;
#elif defined __UNIX__
// We now test the ESD support // We now test the ESD support
dev = new wxSoundStreamESD(); dev = new wxSoundStreamESD();
@@ -221,15 +229,6 @@ wxUint8 MMBoardApp::TestMultimediaCaps()
} }
#endif #endif
#endif
#ifdef __WIN32__
// We test the Windows sound support.
dev = new wxSoundStreamWin();
if (dev->GetError() == wxSOUND_NOERROR)
caps |= MM_SOUND_WIN;
delete dev;
#endif #endif
return caps; return caps;