mirrors/mingw-w64
1
0
Fork 0
mirror of https://git.code.sf.net/p/mingw-w64/mingw-w64 synced 2024-11-30 13:26:10 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

* lib32/vfw32.mri: Adjust for lib32 subdirectory.

Browse Source 
* lib32/vfw64.mri: New.
* Makefile.am: Generate libvfw32.a using vfw32.mri.
* Makefile.in: Regenerate.

git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@4289 4407c894-4637-0410-b4f5-ada5f102cad1
This commit is contained in:
Ozkan Sezer 2011-07-23 09:00:17 +00:00
parent 0361d152a2
commit 570bbe1d92
5 changed files with 57 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mingw-w64-crt/ChangeLog
View File

@ -1,3 +1,10 @@
2011-07-23 Ozkan Sezer <sezeroz@gmail.com>
* lib32/vfw32.mri: Adjust for lib32 subdirectory.
* lib32/vfw64.mri: New.
* Makefile.am: Generate libvfw32.a using vfw32.mri.
* Makefile.in: Regenerate.
2011-05-31 Kai Tietz <kai.tietz@onevision.com>
* crt/pesect.c, crt/pseudo-reloc.c: Optimize pseudo-relocation

21
mingw-w64-crt/Makefile.am
View File

@ -454,7 +454,7 @@ lib32_DATA = \
lib32/libntmsapi.a lib32/libspoolss.a lib32/libsxs.a lib32/libwecapi.a \
lib32/libwevtapi.a lib32/libwevtfwd.a lib32/libfwpuclnt.a lib32/libmstask.a \
lib32/libqutil.a lib32/libconnect.a lib32/libesent.a lib32/libhttpapi.a \
lib32/libpdh.a lib32/libpdhui.a lib32/libcscapi.a \
lib32/libpdh.a lib32/libpdhui.a lib32/libcscapi.a lib32/libvfw32.a \
lib32/libndfapi.a lib32/libp2pcollab.a lib32/libp2pgraph.a lib32/libwdstptc.a \
lib32/libks.a lib32/libwsdapi.a lib32/libp2p.a lib32/librstrmgr.a \
lib32/librpchttp.a lib32/libresutil.a lib32/libqwave.a lib32/librpcdiag.a \
@ -508,6 +508,15 @@ lib32/libcrtdll.a lib32/libmsvcrt.a lib32/libmsvcr80.a: lib32/lib%.a: lib32/%.de
lib32/lib%.a: lib32/%.def
$(DTDEF32) $<
# libvfw32.a contains import stubs for 3 dll's. Using an MRI script
# seems to be the simplest way to combine them into one archive.
# NB: With older dlltool, the object file members will not have unique
# names.
lib32/libvfw32.a: lib32/vfw32.mri lib32/libmsvfw32.a lib32/libavifil32.a lib32/libavicap32.a
rm -f $@
$(AR) -M < $<
$(RANLIB) $@
lib32/libxinput.a: lib32/$(xinput).def
$(DTDEF32) $<
lib32/libxaudio.a: lib32/$(xaudio).def
@ -900,6 +909,7 @@ lib64_DATA = \
lib64/libwecapi.a lib64/libwevtapi.a lib64/libwevtfwd.a lib64/libqutil.a lib64/libconnect.a \
lib64/libfwpuclnt.a lib64/libndfapi.a lib64/libp2p.a lib64/libp2pcollab.a lib64/libp2pgraph.a \
lib64/libwdstptc.a lib64/libcscapi.a lib64/librstrmgr.a lib64/libqwave.a lib64/libwsdapi.a \
lib64/libvfw32.a \
lib64/libks.a lib64/librpcdiag.a lib64/librpchttp.a lib64/libresutil.a lib64/libslwga.a \
lib64/libslc.a lib64/libslcext.a lib64/libvsstrace.a lib64/libmsctfmonitor.a lib64/libtbs.a \
lib64/libtdh.a lib64/libtxfw32.a lib64/libwlanui.a lib64/libwlanapi.a lib64/libwlanutil.a \
@ -946,6 +956,15 @@ lib64/libcrtdll.a lib64/libmsvcrt.a lib64/libmsvcr80.a: lib64/lib%.a: lib64/%.de
lib64/lib%.a: lib64/%.def
$(DTDEF64) $<
# libvfw32.a contains import stubs for 3 dll's. Using an MRI script
# seems to be the simplest way to combine them into one archive.
# NB: With older dlltool, the object file members will not have unique
# names.
lib64/libvfw32.a: lib64/vfw32.mri lib64/libmsvfw32.a lib64/libavifil32.a lib64/libavicap32.a
rm -f $@
$(AR) -M < $<
$(RANLIB) $@
lib64/libxinput.a: lib64/$(xinput).def
$(DTDEF64) $<
lib64/libxaudio.a: lib64/$(xaudio).def

21
mingw-w64-crt/Makefile.in
View File

@ -3492,7 +3492,7 @@ src_libmingwex32 = \
@LIB32_TRUE@ lib32/libntmsapi.a lib32/libspoolss.a lib32/libsxs.a lib32/libwecapi.a \
@LIB32_TRUE@ lib32/libwevtapi.a lib32/libwevtfwd.a lib32/libfwpuclnt.a lib32/libmstask.a \
@LIB32_TRUE@ lib32/libqutil.a lib32/libconnect.a lib32/libesent.a lib32/libhttpapi.a \
@LIB32_TRUE@ lib32/libpdh.a lib32/libpdhui.a lib32/libcscapi.a \
@LIB32_TRUE@ lib32/libpdh.a lib32/libpdhui.a lib32/libcscapi.a lib32/libvfw32.a \
@LIB32_TRUE@ lib32/libndfapi.a lib32/libp2pcollab.a lib32/libp2pgraph.a lib32/libwdstptc.a \
@LIB32_TRUE@ lib32/libks.a lib32/libwsdapi.a lib32/libp2p.a lib32/librstrmgr.a \
@LIB32_TRUE@ lib32/librpchttp.a lib32/libresutil.a lib32/libqwave.a lib32/librpcdiag.a \
@ -3851,6 +3851,7 @@ src_libmingwex32 = \
@LIB64_TRUE@ lib64/libwecapi.a lib64/libwevtapi.a lib64/libwevtfwd.a lib64/libqutil.a lib64/libconnect.a \
@LIB64_TRUE@ lib64/libfwpuclnt.a lib64/libndfapi.a lib64/libp2p.a lib64/libp2pcollab.a lib64/libp2pgraph.a \
@LIB64_TRUE@ lib64/libwdstptc.a lib64/libcscapi.a lib64/librstrmgr.a lib64/libqwave.a lib64/libwsdapi.a \
@LIB64_TRUE@ lib64/libvfw32.a \
@LIB64_TRUE@ lib64/libks.a lib64/librpcdiag.a lib64/librpchttp.a lib64/libresutil.a lib64/libslwga.a \
@LIB64_TRUE@ lib64/libslc.a lib64/libslcext.a lib64/libvsstrace.a lib64/libmsctfmonitor.a lib64/libtbs.a \
@LIB64_TRUE@ lib64/libtdh.a lib64/libtxfw32.a lib64/libwlanui.a lib64/libwlanapi.a lib64/libwlanutil.a \
@ -32223,6 +32224,15 @@ _libm_dummy.c:
@LIB32_TRUE@lib32/lib%.a: lib32/%.def
@LIB32_TRUE@ $(DTDEF32) $<
# libvfw32.a contains import stubs for 3 dll's. Using an MRI script
# seems to be the simplest way to combine them into one archive.
# NB: With older dlltool, the object file members will not have unique
# names.
@LIB32_TRUE@lib32/libvfw32.a: lib32/vfw32.mri lib32/libmsvfw32.a lib32/libavifil32.a lib32/libavicap32.a
@LIB32_TRUE@ rm -f $@
@LIB32_TRUE@ $(AR) -M < $<
@LIB32_TRUE@ $(RANLIB) $@
@LIB32_TRUE@lib32/libxinput.a: lib32/$(xinput).def
@LIB32_TRUE@ $(DTDEF32) $<
@LIB32_TRUE@lib32/libxaudio.a: lib32/$(xaudio).def
@ -32272,6 +32282,15 @@ _libm_dummy.c:
@LIB64_TRUE@lib64/lib%.a: lib64/%.def
@LIB64_TRUE@ $(DTDEF64) $<
# libvfw32.a contains import stubs for 3 dll's. Using an MRI script
# seems to be the simplest way to combine them into one archive.
# NB: With older dlltool, the object file members will not have unique
# names.
@LIB64_TRUE@lib64/libvfw32.a: lib64/vfw32.mri lib64/libmsvfw32.a lib64/libavifil32.a lib64/libavicap32.a
@LIB64_TRUE@ rm -f $@
@LIB64_TRUE@ $(AR) -M < $<
@LIB64_TRUE@ $(RANLIB) $@
@LIB64_TRUE@lib64/libxinput.a: lib64/$(xinput).def
@LIB64_TRUE@ $(DTDEF64) $<
@LIB64_TRUE@lib64/libxaudio.a: lib64/$(xaudio).def

8
mingw-w64-crt/lib32/vfw32.mri
View File

@ -1,6 +1,6 @@
CREATE libvfw32.a
ADDLIB libmsvfw32.a
ADDLIB libavicap32.a
ADDLIB libavifil32.a
CREATE lib32/libvfw32.a
ADDLIB lib32/libmsvfw32.a
ADDLIB lib32/libavicap32.a
ADDLIB lib32/libavifil32.a
SAVE
END

6
mingw-w64-crt/lib64/vfw32.mri Normal file
View File

@ -0,0 +1,6 @@
CREATE lib64/libvfw32.a
ADDLIB lib64/libmsvfw32.a
ADDLIB lib64/libavicap32.a
ADDLIB lib64/libavifil32.a
SAVE
END