JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* lib/vfw32.def: Remove, replacing with ...

Browse Source 
* lib/msvfw32.def: New file.
	* lib/avicap32.def: New file.
	* lib/avifil32.def: New file.
	* lib/vfw32.mri: New file.
	* Makefile.in: (MRI_FILES, MIMPLIBS): New vars for
	import libs with multiple dll's.
	(LIBS): Add MIMPLIBS.
	(DISTFILES): Add MRI_FILES.
	(libvfw32.a): Build using mri script.
This commit is contained in:
Danny Smith 2003-11-27 02:14:37 +00:00
parent 1d88f8cea2
commit d799adc46f
6 changed files with 91 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
winsup/w32api/ChangeLog
View File

@ -1,3 +1,16 @@
2003-11-27 Danny Smith <dannysmith@users.sourceforge.net>
* lib/vfw32.def: Remove, replacing with ...
* lib/msvfw32.def: New file.
* lib/avicap32.def: New file.
* lib/avifil32.def: New file.
* lib/vfw32.mri: New file.
* Makefile.in: (MRI_FILES, MIMPLIBS): New vars for
import libs with multiple dll's.
(LIBS): Add MIMPLIBS.
(DISTFILES): Add MRI_FILES.
(libvfw32.a): Build using mri script.
2003-11-23 Danny Smith <dannysmith@users.sourceforge.net>
* include/winnt.h (PAGE_*): Group defines together. Change

15
winsup/w32api/lib/Makefile.in
View File

@ -110,9 +110,11 @@ GL_HEADERS = $(notdir $(wildcard $(srcdir)/../include/GL/*.h))
# libraries
DEF_FILES = $(notdir $(wildcard $(srcdir)/*.def))
MRI_FILES = $(notdir $(wildcard $(srcdir)/*.mri))
IMPLIBS = $(addprefix lib,$(subst .def,.a,$(DEF_FILES)))
MIMPLIBS = $(addprefix lib,$(subst .mri,.a,$(MRI_FILES)))
EXTRA_LIBS=libuuid.a libscrnsave.a libscrnsavw.a libdxguid.a liblargeint.a
LIBS = $(IMPLIBS) $(EXTRA_LIBS)
LIBS = $(IMPLIBS) $(MIMPLIBS) $(EXTRA_LIBS)
UUID_OBJS = uuid.o mshtml-uuid.o
EXTRA_OBJS = shell32.o dxguid.o scrnsave.o scrnsavw.o largeint.o \
$(UUID_OBJS) dinput.o kernel32.o
@ -120,7 +122,7 @@ UUID_SOURCES = uuid.c mshtml-uuid.c
SOURCES = scrnsave.c shell32.c largeint.c dinput.c $(UUID_SOURCES)\
dxguid.c res.rc test.c kernel32.c
DISTFILES = Makefile.in $(DEF_FILES) $(SOURCES)
DISTFILES = Makefile.in $(DEF_FILES) $(MRI_FILES) $(SOURCES)
.NOTPARALLEL:
@ -166,6 +168,15 @@ libuuid.a : $(UUID_OBJS)
$(AR) rc $@ $(UUID_OBJS)
$(RANLIB) $@
# 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.
libvfw32.a : libmsvfw32.a libavifil32.a libavicap32.a vfw32.mri
rm -f $@
$(AR) -M < vfw32.mri
$(RANLIB) $@
lib%.a : %.def %.o
$(DLLTOOL) $(DLLTOOL_FLAGS) --output-lib $@ --def $(srcdir)/$*.def
$(AR) r $@ $*.o

8
winsup/w32api/lib/avicap32.def Normal file
View File

@ -0,0 +1,8 @@
LIBRARY AVICAP32.DLL
EXPORTS
videoThunk32@20
capGetDriverDescriptionW@20
capGetDriverDescriptionA@20
capCreateCaptureWindowW@32
capCreateCaptureWindowA@32
AppCleanup@4

58
winsup/w32api/lib/vfw32.def → winsup/w32api/lib/avifil32.def
View File

@ -1,52 +1,5 @@
LIBRARY MSVFW32.DLL
LIBRARY AVIFIL32.DLL
EXPORTS
VideoForWindowsVersion@0
StretchDIB@48
MCIWndRegisterClass
MCIWndCreateW
MCIWndCreateA
MCIWndCreate
ICSeqCompressFrameStart@8
ICSeqCompressFrameEnd@4
ICSeqCompressFrame@20
ICSendMessage@16
ICRemove@12
ICOpenFunction@16
ICOpen@12
ICMThunk32@20
ICLocate@20
ICInstall@20
ICInfo@12
ICImageDecompress@20
ICImageCompress@28
ICGetInfo@12
ICGetDisplayFormat@24
ICDrawBegin
ICDraw
ICDecompress
ICCompressorFree@4
ICCompressorChoose@24
ICCompress
ICClose@4
GetSaveFileNamePreviewW@4
GetSaveFileNamePreviewA@4
GetOpenFileNamePreviewW@4
GetOpenFileNamePreviewA@4
GetOpenFileNamePreview@4
DrawDibTime@8
DrawDibStop@4
DrawDibStart@8
DrawDibSetPalette@8
DrawDibRealize@12
DrawDibProfileDisplay@4
DrawDibOpen@0
DrawDibGetPalette@4
DrawDibGetBuffer@16
DrawDibEnd@4
DrawDibDraw@52
DrawDibClose@4
DrawDibChangePalette@16
DrawDibBegin@32
IID_IGetFrame
IID_IAVIStream
IID_IAVIFile
@ -61,8 +14,6 @@ EditStreamPaste@24
EditStreamCut@16
EditStreamCopy@16
EditStreamClone@8
DllGetClassObject@12
DllCanUnloadNow@0
CreateEditableStream@8
AVIStreamWriteData@16
AVIStreamWrite@32
@ -123,9 +74,4 @@ AVIClearClipboard@0
AVIBuildFilterW@12
AVIBuildFilterA@12
AVIBuildFilter@12
videoThunk32@20
capGetDriverDescriptionW@20
capGetDriverDescriptionA@20
capCreateCaptureWindowW@32
capCreateCaptureWindowA@32
AppCleanup@4

49
winsup/w32api/lib/msvfw32.def Normal file
View File

@ -0,0 +1,49 @@
LIBRARY MSVFW32.DLL
EXPORTS
VideoForWindowsVersion@0
StretchDIB@48
MCIWndRegisterClass
MCIWndCreateW
MCIWndCreateA
MCIWndCreate
ICSeqCompressFrameStart@8
ICSeqCompressFrameEnd@4
ICSeqCompressFrame@20
ICSendMessage@16
ICRemove@12
ICOpenFunction@16
ICOpen@12
ICMThunk32@20
ICLocate@20
ICInstall@20
ICInfo@12
ICImageDecompress@20
ICImageCompress@28
ICGetInfo@12
ICGetDisplayFormat@24
ICDrawBegin
ICDraw
ICDecompress
ICCompressorFree@4
ICCompressorChoose@24
ICCompress
ICClose@4
GetSaveFileNamePreviewW@4
GetSaveFileNamePreviewA@4
GetOpenFileNamePreviewW@4
GetOpenFileNamePreviewA@4
GetOpenFileNamePreview@4
DrawDibTime@8
DrawDibStop@4
DrawDibStart@8
DrawDibSetPalette@8
DrawDibRealize@12
DrawDibProfileDisplay@4
DrawDibOpen@0
DrawDibGetPalette@4
DrawDibGetBuffer@16
DrawDibEnd@4
DrawDibDraw@52
DrawDibClose@4
DrawDibChangePalette@16
DrawDibBegin@32

6
winsup/w32api/lib/vfw32.mri Normal file
View File

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