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

[<rjo...@us...>]

Revision: 20793
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=20793&view=rev
Author:   rjongbloed
Date:     2008-08-31 07:10:58 +0000 (Sun, 31 Aug 2008)

Log Message:
-----------
Fixed ddraw.h search in windows configure for different set up (i.e. mine). Round and around the circle we go!

Modified Paths:
--------------
    ptlib/trunk/configure.ac
    ptlib/trunk/include/ptbuildopts.h.in
    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 06:25:47 UTC (rev 20792)
+++ ptlib/trunk/configure.ac	2008-08-31 07:10:58 UTC (rev 20793)
@@ -1616,11 +1616,12 @@
 dnl MSWIN_FIND_FILE  dsound,P_DIRECTSOUND_LIB64,dsound.lib,lib/x64
 dnl MSWIN_FIND_FILE  dsound,P_DIRECTSOUND_LIB32,dsound.lib,lib/x86
 dnl MSWIN_FIND_FILE  dsound,P_DIRECTSOUND_LIB32,dsound.lib,lib
-dnl MSWIN_CHECK_DIR  dsound,\Program Files\Microsoft DirectX SDK\
+dnl MSWIN_FIND_FILE  dsound,P_DIRECTX_DDRAW_H,ddraw.h,include
+dnl MSWIN_CHECK_DIR  dsound,\Program Files\Microsoft SDK\
 dnl MSWIN_CHECK_DIR  dsound,\Program Files\Microsoft Visual Studio 8\VC\PlatformSDK\
 dnl MSWIN_CHECK_DIR  dsound,\Program Files\Microsoft Visual Studio .NET 2003\VC7\PlatformSDK\
-dnl MSWIN_CHECK_DIR  dsound,\Program Files\Microsoft SDK\
 dnl MSWIN_CHECK_DIR  dsound,\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\
+dnl MSWIN_CHECK_DIR  dsound,\Program Files\Microsoft DirectX SDK\
 
 
 dnl ########################################################################
@@ -1628,12 +1629,12 @@
 
 dnl MSWIN_DISPLAY    dshow,Direct Show Support
 dnl MSWIN_CHECK_FILE dshow,include\dshow.h,P_DIRECTSHOW=1
+dnl MSWIN_FIND_FILE  dshow,P_DIRECTSHOW_DDRAW_H,ddraw.h,include
 dnl MSWIN_DIR_SYMBOL dshow,DIRECTSHOW_DIR
 dnl MSWIN_CHECK_DIR  dshow,\Program Files\Microsoft SDKs\Windows\v6.*
+dnl MSWIN_CHECK_DIR  dshow,\Program Files\Microsoft SDK\
 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 06:25:47 UTC (rev 20792)
+++ ptlib/trunk/include/ptbuildopts.h.in	2008-08-31 07:10:58 UTC (rev 20793)
@@ -591,17 +591,20 @@
 #else
 
   #undef P_DIRECTSOUND
-  #undef P_VFW_CAPTURE
-  #undef P_DIRECTSHOW
-
   #undef P_DIRECTSOUND_WINCE
 
+  #undef P_DIRECTX_DDRAW_H
+  #undef P_DIRECTSHOW_DDRAW_H
+
+  #if defined(P_DIRECTX_DDRAW_H) || defined(P_DIRECTSHOW_DDRAW_H)
+    #undef P_DIRECTSHOW
+  #endif
+
   #if defined(_MSC_VER)
 
-    #if defined(P_DIRECTSOUND) && !defined(P_DIRECTSOUND_WINCE) && defined(P_DIRECTSHOW_DDRAW_H)
+    #if defined(P_DIRECTSOUND) && !defined(P_DIRECTSOUND_WINCE)
 
       #pragma include_alias(<dsound.h>, <@DIRECTX_DIR@/include/dsound.h>)
-      #pragma include_alias(<ddraw.h>, <@DIRECTX_DIR@/include/ddraw.h>)
 
       #undef P_DIRECTSOUND_LIB64
       #undef P_DIRECTSOUND_LIB32
@@ -616,7 +619,11 @@
 
     #if defined(P_DIRECTSHOW)
 
-      #undef P_DIRECTDRAW_H
+      #ifdef P_DIRECTSHOW_DDRAW_H
+        #pragma include_alias(<ddraw.h>, <@DIRECTSHOW_DIR@/include/ddraw.h>)
+      #else
+        #pragma include_alias(<ddraw.h>, <@DIRECTX_DIR@/include/ddraw.h>)
+      #endif
 
       #pragma include_alias(<dshow.h>, <@DIRECTSHOW_DIR@/include/dshow.h>)
       #pragma include_alias(<amvideo.h>, <@DIRECTSHOW_DIR@/include/amvideo.h>)

Modified: ptlib/trunk/include/ptlib/msos/ptlib/vidinput_directx.h
===================================================================
--- ptlib/trunk/include/ptlib/msos/ptlib/vidinput_directx.h	2008-08-31 06:25:47 UTC (rev 20792)
+++ ptlib/trunk/include/ptlib/msos/ptlib/vidinput_directx.h	2008-08-31 07:10:58 UTC (rev 20793)
@@ -31,7 +31,7 @@
 #include <ptlib.h>
 #include <ptbuildopts.h>
 
-#if defined(P_DIRECTSHOW) && defined(P_DIRECTSOUND) && defined(P_DIRECTSHOW_DDRAW_H)
+#if defined(P_DIRECTSHOW)
 #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 06:25:47 UTC (rev 20792)
+++ ptlib/trunk/src/ptlib/msos/vidinput_directx.cxx	2008-08-31 07:10:58 UTC (rev 20793)
@@ -30,7 +30,7 @@
 
 #include <ptlib.h>
 
-#if defined(P_DIRECTSHOW) && defined(P_DIRECTSOUND) && defined(P_DIRECTSHOW_DDRAW_H)
+#if defined(P_DIRECTSHOW)
 
 #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.