openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1197222 - in /incubator/ooo/trunk/main: avmedia/source/win/makefile.mk avmedia/util/makefile.mk configure.in set_soenv.in
Date Thu, 03 Nov 2011 17:09:20 GMT
Author: jsc
Date: Thu Nov  3 17:09:19 2011
New Revision: 1197222

URL: http://svn.apache.org/viewvc?rev=1197222&view=rev
Log:
118570, apply patch, improve configure to detect latest DirectX correctly, adapt depending
modules, thanks to Andre Fischer (af)

Modified:
    incubator/ooo/trunk/main/avmedia/source/win/makefile.mk
    incubator/ooo/trunk/main/avmedia/util/makefile.mk
    incubator/ooo/trunk/main/configure.in
    incubator/ooo/trunk/main/set_soenv.in

Modified: incubator/ooo/trunk/main/avmedia/source/win/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/avmedia/source/win/makefile.mk?rev=1197222&r1=1197221&r2=1197222&view=diff
==============================================================================
--- incubator/ooo/trunk/main/avmedia/source/win/makefile.mk (original)
+++ incubator/ooo/trunk/main/avmedia/source/win/makefile.mk Thu Nov  3 17:09:19 2011
@@ -49,7 +49,7 @@ SLOFILES= \
 		$(SLO)$/window.obj      \
 		$(SLO)$/player.obj      \
 		$(SLO)$/framegrabber.obj    
-        
+
 
 EXCEPTIONSFILES= \
 		$(SLO)$/winuno.obj      \
@@ -67,13 +67,11 @@ DEF1EXPORTFILE=exports.dxp
 SHL1STDLIBS += $(OLE32LIB)
 SHL1STDLIBS += $(OLEAUT32LIB)
 SHL1STDLIBS += $(GDI32LIB)
-SHL1STDLIBS += $(DDRAWLIB)
 
 .IF "$(COM)"=="GCC"
 SHL1STDLIBS += $(PSDK_HOME)$/lib$/strmiids.lib
 .ELSE
 SHL1STDLIBS += strmiids.lib
-SHL1STDLIBS += dxguid.lib
 .ENDIF
 
 .ENDIF

Modified: incubator/ooo/trunk/main/avmedia/util/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/avmedia/util/makefile.mk?rev=1197222&r1=1197221&r2=1197222&view=diff
==============================================================================
--- incubator/ooo/trunk/main/avmedia/util/makefile.mk (original)
+++ incubator/ooo/trunk/main/avmedia/util/makefile.mk Thu Nov  3 17:09:19 2011
@@ -49,7 +49,7 @@ LIB1TARGET=$(SLB)$/$(TARGET).lib
 LIB1FILES=\
 	$(SLB)$/viewer.lib		\
 	$(SLB)$/framework.lib	
-				
+
 # ==========================================================================
 
 SHL1TARGET=$(TARGET)$(DLLPOSTFIX)

Modified: incubator/ooo/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.in?rev=1197222&r1=1197221&r2=1197222&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configure.in (original)
+++ incubator/ooo/trunk/main/configure.in Thu Nov  3 17:09:19 2011
@@ -1348,6 +1348,7 @@ AC_SUBST(WITH_BINFILTER)
 
 if test "$_os" = "WINNT"; then
    AC_MSG_CHECKING([whether to use DirectX])
+   ENABLE_DIRECT_DRAW=""
    if test "$enable_directx" = "yes" -o "$enable_directx" = "TRUE" -o "$enable_directx" =
""; then
       ENABLE_DIRECTX="TRUE"
       AC_MSG_RESULT([yes])
@@ -5453,10 +5454,16 @@ if test \( "$_os" = "WINNT" \) ; then
     DIRECTXSDK_HOME=`echo $DIRECTXSDK_HOME | $SED 's/\/$//'`
 
     if test -f "$DIRECTXSDK_HOME/Include/ddraw.h" ; then
+        HAVE_DIRECTDRAW_H="yes"
+    else
+        HAVE_DIRECTDRAW_H="no"
+    fi
+    if test -f "$DIRECTXSDK_HOME/Include/d3d9.h" ; then
         HAVE_DIRECTXSDK_H="yes"
     else
         HAVE_DIRECTXSDK_H="no"
     fi
+
     # MS changed the location of the libraries with dec 2004 directx sdk
     if test -d "$DIRECTXSDK_HOME/lib/x86" ; then
         DIRECTXSDK_LIB="$DIRECTXSDK_HOME/lib/x86"
@@ -5464,12 +5471,27 @@ if test \( "$_os" = "WINNT" \) ; then
         DIRECTXSDK_LIB="$DIRECTXSDK_HOME/lib"
     fi
     if test -f "$DIRECTXSDK_LIB/ddraw.lib" ; then
+        HAVE_DIRECTDRAW_LIB="yes"
+    else
+        HAVE_DIRECTDRAW_LIB="no"
+    fi
+    if test -f "$DIRECTXSDK_LIB/d3d9.lib" ; then
         HAVE_DIRECTXSDK_LIB="yes"
     else
         HAVE_DIRECTXSDK_LIB="no"
     fi
+
+    if test "$HAVE_DIRECTDRAW_H" = "yes" -a "$HAVE_DIRECTDRAW_LIB" = "yes" ; then
+       ENABLE_DIRECT_DRAW="TRUE"
+    fi
+    if test "$HAVE_DIRECTXSDK_H" = "yes" -a "$HAVE_DIRECTXSDK_LIB" = "yes" ; then
+       HAVE_DIRECTXSDK="yes"
+    else
+       HAVE_DIRECTXSDK="no"
+    fi
+
     if test -n "$ENABLE_DIRECTX"; then
-	    if test "$HAVE_DIRECTXSDK_H" = "yes" -a "$HAVE_DIRECTXSDK_LIB" = "yes"; then
+	    if test "$HAVE_DIRECTDRAW" = "yes" -o "$HAVE_DIRECTXSDK" = "yes" ; then
 		    AC_MSG_RESULT([found])
 	    else
 		    AC_MSG_ERROR([DirectX SDK files not found, please use --with-directx-home or --disable-directx.])
@@ -5479,6 +5501,7 @@ if test \( "$_os" = "WINNT" \) ; then
 		AC_MSG_RESULT([disabled])
     fi
 fi
+AC_SUBST(ENABLE_DIRECT_DRAW)
 AC_SUBST(DIRECTXSDK_HOME)
 AC_SUBST(DIRECTXSDK_LIB)
 

Modified: incubator/ooo/trunk/main/set_soenv.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/set_soenv.in?rev=1197222&r1=1197221&r2=1197222&view=diff
==============================================================================
--- incubator/ooo/trunk/main/set_soenv.in (original)
+++ incubator/ooo/trunk/main/set_soenv.in Thu Nov  3 17:09:19 2011
@@ -1078,12 +1078,15 @@ if ($platform =~ m/cygwin|os2/)
                         $wps.$FRAME_HOME.$LIB.
                         $wps.$COMPATH.$LIB;
       if ( '@ENABLE_DIRECTX@' ne "" ) {
-          $ILIB   .= $wps.$DIRECTXSDK_LIB;
-          if ( '@COMEX@' eq "10" ) {
-              # .NET2003 provides and compiles against DirectX 5 libraries and is
-              # hereby still Win9x compatible.
-              $ILIB .= $wps.'$COMPATH'.$ds.'PlatformSDK'.$LIB;
-              $USE_DIRECTX5 = "YES";
+          # We may have DirectX but not DirectDraw
+          if ( '@ENABLE_DIRECT_DRAW@' ne "") {
+              $ILIB   .= $wps.$DIRECTXSDK_LIB;
+              if ( '@COMEX@' eq "10" ) {
+                  # .NET2003 provides and compiles against DirectX 5 libraries and is
+                  # hereby still Win9x compatible.
+                  $ILIB .= $wps.'$COMPATH'.$ds.'PlatformSDK'.$LIB;
+                  $USE_DIRECTX5 = "YES";
+              }
           }
       }
       # ILIB needs to use '\' directory seperators;
@@ -1821,6 +1824,7 @@ ToFile( "ENABLE_CUPS",       "@ENABLE_CU
 ToFile( "ENABLE_RANDR",      "@ENABLE_RANDR@",      "e" );
 ToFile( "ENABLE_FONTCONFIG", "@ENABLE_FONTCONFIG@", "e" );
 ToFile( "ENABLE_DIRECTX",    "@ENABLE_DIRECTX@",    "e" );
+ToFile( "ENABLE_DIRECT_DRAW","@ENABLE_DIRECT_DRAW@","e" );
 ToFile( "ENABLE_LAYOUT",     "@ENABLE_LAYOUT@",     "e" );
 ToFile( "ENABLE_PCH",        "@ENABLE_PCH@",       "e" );
 ToFile( "ENABLE_GRAPHITE",   "@ENABLE_GRAPHITE@",   "e");



Mime
View raw message