Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- Index: platform.inc.in
- ===================================================================
- --- platform.inc.in (revision 2036)
- +++ platform.inc.in (working copy)
- @@ -81,3 +81,4 @@
- STATIC_LIB=@STATIC_LIB@
- SHARED_LIB=@SHARED_LIB@
- PRE_SHARED_LIB=@PRE_SHARED_LIB@
- +IMPORT_LIB=@IMPORT_LIB@
- Index: configure.in
- ===================================================================
- --- configure.in (revision 2035)
- +++ configure.in (working copy)
- @@ -286,6 +286,7 @@
- SPECIFIC_CFLAGS=""
- ALTIVEC_CFLAGS=""
- PRE_SHARED_LIB=""
- +IMPORT_LIB=""
- case "$target_os" in
- linux*|solaris*|gnu*)
- AC_MSG_RESULT([ok])
- @@ -301,13 +302,22 @@
- SPECIFIC_LDFLAGS="-Wl,-soname,libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -shared -lc -lm"
- SPECIFIC_CFLAGS="-fPIC"
- ;;
- - [[cC]][[yY]][[gG]][[wW]][[iI]][[nN]]*|mingw32*|mks*)
- + [[cC]][[yY]][[gG]][[wW]][[iI]][[nN]]*)
- AC_MSG_RESULT([ok])
- STATIC_LIB="xvidcore.\$(STATIC_EXTENSION)"
- - SHARED_LIB="xvidcore.\$(SHARED_EXTENSION)"
- + SHARED_LIB="cygxvidcore.\$(SHARED_EXTENSION)"
- + IMPORT_LIB="libxvidcore.\$(SHARED_EXTENSION).\$(STATIC_EXTENSION)"
- SPECIFIC_LDFLAGS="-shared -Wl,--dll,--out-implib,\$@.a libxvidcore.def"
- SPECIFIC_CFLAGS=""
- ;;
- + mingw32*|mks*)
- + AC_MSG_RESULT([ok])
- + STATIC_LIB="xvidcore.\$(STATIC_EXTENSION)"
- + SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION)"
- + IMPORT_LIB="libxvidcore.\$(SHARED_EXTENSION).\$(STATIC_EXTENSION)"
- + SPECIFIC_LDFLAGS="-shared -Wl,--dll,--out-implib,\$@.a libxvidcore.def"
- + SPECIFIC_CFLAGS=""
- + ;;
- darwin*|raphsody*)
- STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
- SPECIFIC_CFLAGS="-fPIC -fno-common -no-cpp-precomp"
- @@ -342,6 +352,10 @@
- PRE_SHARED_LIB=$SHARED_LIB
- fi
- +if test x"$IMPORT_LIB" = x; then
- + IMPORT_LIB=$SHARED_LIB
- +fi
- +
- dnl ==========================================================================
- dnl
- dnl Assembler stuff
- @@ -715,6 +729,7 @@
- AC_SUBST(API_MINOR)
- AC_SUBST(STATIC_LIB)
- AC_SUBST(PRE_SHARED_LIB)
- +AC_SUBST(IMPORT_LIB)
- AC_SUBST(SHARED_LIB)
- AC_SUBST(ALTIVEC_CFLAGS)
- Index: Makefile
- ===================================================================
- --- Makefile (revision 2036)
- +++ Makefile (working copy)
- @@ -150,8 +150,8 @@
- @echo " I: $(libdir)/$(STATIC_LIB)"
- @$(INSTALL) -m 644 $(BUILD_DIR)/$(STATIC_LIB) $(DESTDIR)$(libdir)/$(STATIC_LIB)
- ifeq ($(SHARED_EXTENSION),dll)
- - @echo " I: $(libdir)/$(SHARED_LIB).a"
- - @$(INSTALL) -m 644 $(BUILD_DIR)/$(SHARED_LIB).a $(DESTDIR)$(libdir)/$(SHARED_LIB).a
- + @echo " I: $(libdir)/$(IMPORT_LIB)"
- + @$(INSTALL) -m 644 $(BUILD_DIR)/$(SHARED_LIB).a $(DESTDIR)$(libdir)/$(IMPORT_LIB)
- @echo " D: $(bindir)"
- @$(INSTALL) -d $(DESTDIR)$(bindir)
- @echo " I: $(bindir)/$(SHARED_LIB)"
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement