[Opalvoip-svn] SF.net SVN: opalvoip:[20788] ptlib/trunk

[<cso...@us...>]

Revision: 20788
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=20788&view=rev
Author:   csoutheren
Date:     2008-08-31 05:08:49 +0000 (Sun, 31 Aug 2008)

Log Message:
-----------
Some MS SDK installations (i.e. mine) appear to have DirectX and/or DirectSound installed
but are missing ddraw.h. So, make sure these systems can still compile ptlib

Modified Paths:
--------------
    ptlib/trunk/configure.ac
    ptlib/trunk/include/ptbuildopts.h.in
    ptlib/trunk/include/ptlib/msos/ptlib/sound_directsound.h
    ptlib/trunk/include/ptlib/msos/ptlib/vidinput_directx.h
    ptlib/trunk/src/ptlib/msos/vidinput_directx.cxx

Modified: ptlib/trunk/configure.ac
===================================================================
--- ptlib/trunk/configure.ac	2008-08-31 05:07:05 UTC (rev 20787)
+++ ptlib/trunk/configure.ac	2008-08-31 05:08:49 UTC (rev 20788)
@@ -1633,6 +1633,7 @@
 dnl MSWIN_CHECK_DIR  dshow,\Program Files\Microsoft Visual Studio 8\VC\PlatformSDK\
 dnl MSWIN_CHECK_DIR  dshow,\Program Files\Microsoft Visual Studio .NET 2003\VC7\PlatformSDK\
 dnl MSWIN_CHECK_DIR  dshow,\Program Files\Microsoft SDK\
+dnl MSWIN_FIND_FILE  dshow,P_DIRECTSHOW_DDRAW_H,ddraw.h,include
 dnl MSWIN_CHECK_DIR  dshow,\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\
 
 

Modified: ptlib/trunk/include/ptbuildopts.h.in
===================================================================
--- ptlib/trunk/include/ptbuildopts.h.in	2008-08-31 05:07:05 UTC (rev 20787)
+++ ptlib/trunk/include/ptbuildopts.h.in	2008-08-31 05:08:49 UTC (rev 20788)
@@ -598,7 +598,7 @@
 
   #if defined(_MSC_VER)
 
-    #if defined(P_DIRECTSOUND) && !defined(P_DIRECTSOUND_WINCE)
+    #if defined(P_DIRECTSOUND) && !defined(P_DIRECTSOUND_WINCE) && defined(P_DIRECTSHOW_DDRAW_H)
 
       #pragma include_alias(<dsound.h>, <@DIRECTX_DIR@/include/dsound.h>)
       #pragma include_alias(<ddraw.h>, <@DIRECTX_DIR@/include/ddraw.h>)

Modified: ptlib/trunk/include/ptlib/msos/ptlib/sound_directsound.h
===================================================================
--- ptlib/trunk/include/ptlib/msos/ptlib/sound_directsound.h	2008-08-31 05:07:05 UTC (rev 20787)
+++ ptlib/trunk/include/ptlib/msos/ptlib/sound_directsound.h	2008-08-31 05:08:49 UTC (rev 20788)
@@ -36,7 +36,7 @@
 #include <ptlib.h>
 #include <ptbuildopts.h>
 
-#if defined(P_DIRECTSOUND) && ! defined(P_DIRECTSOUND_WINCE)
+#if defined(P_DIRECTSOUND) && ! defined(P_DIRECTSOUND_WINCE) 
 
 #include <ptlib/sound.h>
 

Modified: ptlib/trunk/include/ptlib/msos/ptlib/vidinput_directx.h
===================================================================
--- ptlib/trunk/include/ptlib/msos/ptlib/vidinput_directx.h	2008-08-31 05:07:05 UTC (rev 20787)
+++ ptlib/trunk/include/ptlib/msos/ptlib/vidinput_directx.h	2008-08-31 05:08:49 UTC (rev 20788)
@@ -31,7 +31,7 @@
 #include <ptlib.h>
 #include <ptbuildopts.h>
 
-#if defined(P_DIRECTSHOW) && defined(P_DIRECTSOUND)
+#if defined(P_DIRECTSHOW) && defined(P_DIRECTSOUND) && defined(P_DIRECTSHOW_DDRAW_H)
 #include <ptlib/videoio.h>
 #include <ptlib/vconvert.h>
 #include <ptlib/pluginmgr.h>

Modified: ptlib/trunk/src/ptlib/msos/vidinput_directx.cxx
===================================================================
--- ptlib/trunk/src/ptlib/msos/vidinput_directx.cxx	2008-08-31 05:07:05 UTC (rev 20787)
+++ ptlib/trunk/src/ptlib/msos/vidinput_directx.cxx	2008-08-31 05:08:49 UTC (rev 20788)
@@ -30,7 +30,7 @@
 
 #include <ptlib.h>
 
-#if defined(P_DIRECTSHOW) && defined(P_DIRECTSOUND)
+#if defined(P_DIRECTSHOW) && defined(P_DIRECTSOUND) && defined(P_DIRECTSHOW_DDRAW_H)
 
 #include "ptlib/msos/ptlib/vidinput_directx.h"
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.