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

[<ms3...@us...>]

Revision: 21173
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=21173&view=rev
Author:   ms30002000
Date:     2008-09-27 16:00:09 +0000 (Sat, 27 Sep 2008)

Log Message:
-----------
Check if there are plugins to be installed at all.
Add directX build variables for mingw build.

Modified Paths:
--------------
    ptlib/trunk/Makefile.in
    ptlib/trunk/include/ptbuildopts.h.in
    ptlib/trunk/make/ptbuildopts.mak.in

Modified: ptlib/trunk/Makefile.in
===================================================================
--- ptlib/trunk/Makefile.in	2008-09-27 15:57:41 UTC (rev 21172)
+++ ptlib/trunk/Makefile.in	2008-09-27 16:00:09 UTC (rev 21173)
@@ -100,14 +100,16 @@
 		ln -sf $(PTLIB_FILE).@MAJOR_VERSION@.@MINOR_VERSION@@BUILD_TYPE@@BUILD_NUMBER@ $(PTLIB_FILE) \
 	)
 ifeq (1, $(HAS_PLUGINS))
-	cd $(PT_LIBDIR)/device/ ; \
-	( for dir in ./* ;\
+	if test -e $(PT_LIBDIR)/device/; then \
+	cd $(PT_LIBDIR)/device/; \
+	(  for dir in ./* ;\
 		do mkdir -p $(DESTDIR)$(LIBDIR)/$(DEV_PLUGIN_DIR)/$$dir ; \
 		chmod 755 $(DESTDIR)$(LIBDIR)/$(DEV_PLUGIN_DIR)/$$dir ; \
 		(for fn in ./$$dir/*.so ; \
 			do $(INSTALL) -m 444 $$fn $(DESTDIR)$(LIBDIR)/$(DEV_PLUGIN_DIR)/$$dir; \
 		done ); \
-	done )
+	done ) ; \
+	fi
 endif
 	$(INSTALL) -m 444 include/ptlib.h                $(DESTDIR)$(PREFIX)/include
 	$(INSTALL) -m 444 include/ptbuildopts.h          $(DESTDIR)$(PREFIX)/include

Modified: ptlib/trunk/include/ptbuildopts.h.in
===================================================================
--- ptlib/trunk/include/ptbuildopts.h.in	2008-09-27 15:57:41 UTC (rev 21172)
+++ ptlib/trunk/include/ptbuildopts.h.in	2008-09-27 16:00:09 UTC (rev 21173)
@@ -580,6 +580,8 @@
 // DirectX Support (Windows only)
 //
 
+#if defined(_MSC_VER)
+
 #ifdef _WIN32_WCE
 
   //#define P_DIRECTSOUND 1
@@ -641,6 +643,11 @@
   #endif
 
 #endif
+#else /* defined(_MSC_VER)*/
+  #undef P_DIRECTSHOW
+  #undef P_DIRECTX
+  #undef P_VFW_CAPTURE
+#endif /* defined(_MSC_VER)*/
 
 
 /////////////////////////////////////////////////

Modified: ptlib/trunk/make/ptbuildopts.mak.in
===================================================================
--- ptlib/trunk/make/ptbuildopts.mak.in	2008-09-27 15:57:41 UTC (rev 21172)
+++ ptlib/trunk/make/ptbuildopts.mak.in	2008-09-27 16:00:09 UTC (rev 21173)
@@ -70,6 +70,8 @@
 HAS_SOCKAGG	= @HAS_SOCKAGG@
 HAS_VIDFILE	= @HAS_VIDFILE@
 HAS_ODBC        = @HAS_ODBC@
+HAS_DIRECTSHOW  = @HAS_DIRECTSHOW@
+HAS_DIRECTSOUND = @HAS_DIRECTSOUND@
 
 SHAREDLIBEXT	= @SHAREDLIBEXT@
 


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