SHARE
TWEET

cygwin/mingw library names patch for xvidcore

a guest Sep 16th, 2011 55 Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. Index: platform.inc.in
  2. ===================================================================
  3. --- platform.inc.in     (revision 2036)
  4. +++ platform.inc.in     (working copy)
  5. @@ -81,3 +81,4 @@
  6.  STATIC_LIB=@STATIC_LIB@
  7.  SHARED_LIB=@SHARED_LIB@
  8.  PRE_SHARED_LIB=@PRE_SHARED_LIB@
  9. +IMPORT_LIB=@IMPORT_LIB@
  10. Index: configure.in
  11. ===================================================================
  12. --- configure.in        (revision 2035)
  13. +++ configure.in        (working copy)
  14. @@ -286,6 +286,7 @@
  15.  SPECIFIC_CFLAGS=""
  16.  ALTIVEC_CFLAGS=""
  17.  PRE_SHARED_LIB=""
  18. +IMPORT_LIB=""
  19.  case "$target_os" in
  20.       linux*|solaris*|gnu*)
  21.         AC_MSG_RESULT([ok])
  22. @@ -301,13 +302,22 @@
  23.         SPECIFIC_LDFLAGS="-Wl,-soname,libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -shared -lc -lm"
  24.         SPECIFIC_CFLAGS="-fPIC"
  25.         ;;
  26. -     [[cC]][[yY]][[gG]][[wW]][[iI]][[nN]]*|mingw32*|mks*)
  27. +     [[cC]][[yY]][[gG]][[wW]][[iI]][[nN]]*)
  28.         AC_MSG_RESULT([ok])
  29.         STATIC_LIB="xvidcore.\$(STATIC_EXTENSION)"
  30. -       SHARED_LIB="xvidcore.\$(SHARED_EXTENSION)"
  31. +       SHARED_LIB="cygxvidcore.\$(SHARED_EXTENSION)"
  32. +       IMPORT_LIB="libxvidcore.\$(SHARED_EXTENSION).\$(STATIC_EXTENSION)"
  33.         SPECIFIC_LDFLAGS="-shared -Wl,--dll,--out-implib,\$@.a libxvidcore.def"
  34.         SPECIFIC_CFLAGS=""
  35.         ;;
  36. +     mingw32*|mks*)
  37. +        AC_MSG_RESULT([ok])
  38. +        STATIC_LIB="xvidcore.\$(STATIC_EXTENSION)"
  39. +        SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION)"
  40. +        IMPORT_LIB="libxvidcore.\$(SHARED_EXTENSION).\$(STATIC_EXTENSION)"
  41. +        SPECIFIC_LDFLAGS="-shared -Wl,--dll,--out-implib,\$@.a libxvidcore.def"
  42. +        SPECIFIC_CFLAGS=""
  43. +        ;;
  44.       darwin*|raphsody*)
  45.         STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
  46.         SPECIFIC_CFLAGS="-fPIC -fno-common -no-cpp-precomp"
  47. @@ -342,6 +352,10 @@
  48.    PRE_SHARED_LIB=$SHARED_LIB
  49.  fi
  50.  
  51. +if test x"$IMPORT_LIB" = x; then
  52. +  IMPORT_LIB=$SHARED_LIB
  53. +fi
  54. +
  55.  dnl ==========================================================================
  56.  dnl
  57.  dnl Assembler stuff
  58. @@ -715,6 +729,7 @@
  59.  AC_SUBST(API_MINOR)
  60.  AC_SUBST(STATIC_LIB)
  61.  AC_SUBST(PRE_SHARED_LIB)
  62. +AC_SUBST(IMPORT_LIB)
  63.  AC_SUBST(SHARED_LIB)
  64.  AC_SUBST(ALTIVEC_CFLAGS)
  65.  
  66. Index: Makefile
  67. ===================================================================
  68. --- Makefile    (revision 2036)
  69. +++ Makefile    (working copy)
  70. @@ -150,8 +150,8 @@
  71.         @echo "  I: $(libdir)/$(STATIC_LIB)"
  72.         @$(INSTALL) -m 644 $(BUILD_DIR)/$(STATIC_LIB) $(DESTDIR)$(libdir)/$(STATIC_LIB)
  73.  ifeq ($(SHARED_EXTENSION),dll)
  74. -       @echo "  I: $(libdir)/$(SHARED_LIB).a"
  75. -       @$(INSTALL) -m 644 $(BUILD_DIR)/$(SHARED_LIB).a $(DESTDIR)$(libdir)/$(SHARED_LIB).a
  76. +       @echo "  I: $(libdir)/$(IMPORT_LIB)"
  77. +       @$(INSTALL) -m 644 $(BUILD_DIR)/$(SHARED_LIB).a $(DESTDIR)$(libdir)/$(IMPORT_LIB)
  78.         @echo "  D: $(bindir)"
  79.         @$(INSTALL) -d $(DESTDIR)$(bindir)
  80.         @echo "  I: $(bindir)/$(SHARED_LIB)"
RAW Paste Data
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy. OK, I Understand
 
Top