Hello,
I have a made another stab at the ddraw inclusion with references here
http://msdn.microsoft.com/en-us/library/aa913258.aspx
The #defines, however, are not in the ddraw.h header file. They are not
publicly displayed.
Thanks,
Ryan
>From c11517e355b40018fcedf9d49f77514b857d44c9 Mon Sep 17 00:00:00 2001
From: Ryan M. Raasch <r...@fracturecode.com>
Date: Mon, 16 Feb 2009 16:57:35 +0100
Subject: [PATCH] Added ddraw header files and appropriate Makefiles.
---
cegcc/src/w32api/ChangeLog | 9 +
cegcc/src/w32api/configure.in | 2 +-
cegcc/src/w32api/include/directx/ddraw.h | 337 ++++++++++++++++++++++++++++
cegcc/src/w32api/libce/directx/Makefile.in | 202 +++++++++++++++++
cegcc/src/w32api/libce/directx/ddraw.def | 15 ++
cegcc/src/w32api/libce/directx/dmoguids.c | 40 ++++
cegcc/src/w32api/libce/strmiids.def | 2 -
7 files changed, 604 insertions(+), 3 deletions(-)
create mode 100644 cegcc/src/w32api/include/directx/ddraw.h
create mode 100644 cegcc/src/w32api/libce/directx/Makefile.in
create mode 100644 cegcc/src/w32api/libce/directx/ddraw.def
create mode 100644 cegcc/src/w32api/libce/directx/dmoguids.c
delete mode 100644 cegcc/src/w32api/libce/strmiids.def
diff --git a/cegcc/src/w32api/ChangeLog b/cegcc/src/w32api/ChangeLog
index acd66f9..6d98a03 100644
--- a/cegcc/src/w32api/ChangeLog
+++ b/cegcc/src/w32api/ChangeLog
@@ -1,3 +1,12 @@
+2009-02-06 Ryan M. Raasch <ryan.raa...@gmail.com>
+
+ * configure.in : Enable SUBDIRS to include libce/directx.
+ * include/directx/ddraw.h : Added.
+ * libce/directx/Makefile.in : Added.
+ * libce/directx/ddraw.def : Added.
+ * libce/directx/dmoguids.c : Added.
+ * libce/strmiids.def : Removed (empty definitions).
+
2009-02-06 Linton Miller <linton.mil...@trivininc.com>
* include/wtsapi32.h (WTS_CURRENT_SESSION): Fix definition.
diff --git a/cegcc/src/w32api/configure.in b/cegcc/src/w32api/configure.in
index a016bb4..19be116 100644
--- a/cegcc/src/w32api/configure.in
+++ b/cegcc/src/w32api/configure.in
@@ -52,7 +52,7 @@ AC_SUBST(BUILDENV)
case "${host_alias}" in
*-mingw32ce* | *-cegcc*)
- SUBDIRS="libce"
+ SUBDIRS="libce libce/directx"
;;
*)
SUBDIRS="lib"
diff --git a/cegcc/src/w32api/include/directx/ddraw.h b/cegcc/src/w32api/include/directx/ddraw.h
new file mode 100644
index 0000000..9258077
--- /dev/null
+++ b/cegcc/src/w32api/include/directx/ddraw.h
@@ -0,0 +1,337 @@
+#ifndef _DDRAW_H
+#define _DDRAW_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * NOTE: DDPIXELFORMAT/DDSURFACEDESC dwFlags values cannot be determined at this time.
+ */
+
+/* Ddraw structures */
+typedef struct _DDCOLORKEY{
+ DWORD dwColorSpaceLowValue;
+ DWORD dwColorSpaceHighValue;
+} DDCOLORKEY,FAR *LPDDCOLORKEY;
+
+typedef union _DDALPHABLTFX {
+ DWORD dwSize;
+ DDARGB ddargbScaleFactors;
+ DWORD dwFillValue;
+} DDALPHABLTFX, FAR * LPDDALPHABLTFX;
+
+typedef struct _DDARGB{
+ BYTE blue;
+ BYTE green;
+ BYTE red;
+ BYTE alpha;
+} DDARGB, *LPDDARGB;
+
+typedef struct _DDBLTFX{
+ DWORD dwSize;
+ DWORD dwROP;
+ DWORD dwFillColor;
+ DDCOLORKEY ddckDestColorkey;
+ DDCOLORKEY ddckSrcColorkey;
+} DDBLTFX,FAR* LPDDBLTFX;
+
+typedef struct _DDCAPS {
+ DWORD dwSize;
+ DWORD dwCKeyCaps;
+ DWORD dwPalCaps;
+ DWORD dwBltCaps;
+ DWORD dwAlphaCaps;
+ DWORD dwOverlayCaps;
+ DWORD dwVidMemTotal;
+ DWORD dwVidMemFree;
+ DWORD dwVidMemStride;
+ DWORD dwMaxVisibleOverlays;
+ DWORD dwCurrVisibleOverlays;
+ DWORD dwNumFourCCCodes;
+ DWORD dwAlignBoundarySrc;
+ DWORD dwAlignSizeSrc;
+ DWORD dwAlignBoundaryDest;
+ DWORD dwAlignSizeDest;
+ DWORD dwRops[256];
+ DWORD dwMinOverlayStretch;
+ DWORD dwMaxOverlayStretch;
+ DWORD dwMiscCaps;
+} DDCAPS,FAR *LPDDCAPS;
+
+typedef struct _DDCOLORCONTROL {
+ DWORD dwSize;
+ DWORD dwFlags;
+ LONG lBrightness;
+ LONG lContrast;
+ LONG lHue;
+ LONG lSaturation;
+ LONG lSharpness;
+ LONG lGamma;
+ LONG lColorEnable;
+} DDCOLORCONTROL, FAR* LPDDCOLORCONTROL;
+
+/*
+ * * DDCOLORCONTROL dwFlags values. ????
+ */
+#define DDCOLOR_BRIGHTNESS
+#define DDCOLOR_CONTRAST
+#define DDCOLOR_HUE
+#define DDCOLOR_SATURATION
+#define DDCOLOR_SHARPNESS
+#define DDCOLOR_GAMMA
+#define DDCOLOR_COLORENABLE
+#define DDCOLOR_VALID
+
+
+typedef struct _DDDEVICEIDENTIFIER {
+ wchar_t szDriver[MAX_DDDEVICEID_STRING];
+ wchar_t szDescription[MAX_DDDEVICEID_STRING];
+ LARGE_INTEGER liDriverVersion;
+ DWORD dwVendorId;
+ DWORD dwDeviceId;
+ DWORD dwSubSysId;
+ DWORD dwRevision;
+ GUID guidDeviceIdentifier;
+} DDDEVICEIDENTIFIER, *LPDDDEVICEIDENTIFIER;
+
+typedef struct _DDGAMMARAMP
+{
+ WORD red[256];
+ WORD green[256];
+ WORD blue[256];
+}DDGAMMARAMP, *LPDDGAMMARAMP;
+
+typedef struct _DDOVERLAYFX{
+ DWORD dwSize;
+ DWORD dwAlphaConstBitDepth;
+ DWORD dwAlphaConst;
+ DDCOLORKEY dckDestColorkey;
+ DDCOLORKEY dckSrcColorkey;
+} DDOVERLAYFX,FAR *LPDDOVERLAYFX;
+
+typedef struct _DDPIXELFORMAT {
+ DWORD dwSize;
+ DWORD dwFlags;
+ DWORD dwFourCC;
+ union
+ {
+ DWORD dwRGBBitCount;
+ DWORD dwYUVBitCount;
+ DWORD dwAlphaBitDepth;
+ };
+ union
+ {
+ DWORD dwRBitMask;
+ DWORD dwYBitMask;
+ };
+ union
+ {
+ DWORD dwGBitMask;
+ DWORD dwUBitMask;
+ };
+ union
+ {
+ DWORD dwBBitMask;
+ DWORD dwVBitMask;
+ };
+ union
+ {
+ DWORD dwRGBAlphaBitMask;
+ };
+} DDPIXELFORMAT, FAR* LPDDPIXELFORMAT;
+
+/*
+ * DDPIXELFORMAT dwFlags values. ???
+ */
+#define DDPF_ALPHAPIXELS
+#define DDPF_ALPHA
+#define DDPF_FOURCC
+#define DDPF_PALETTEINDEXED
+#define DDPF_RGB
+#define DDPF_ALPHAPREMULT
+#define DDPF_VALID
+
+typedef struct _DDSCAPS{
+ DWORD dwCaps;
+} DDSCAPS, FAR* LPDDSCAPS;
+
+typedef struct _DDSURFACEDESC {
+ DWORD dwSize;
+ DWORD dwFlags;
+ DWORD dwHeight;
+ DWORD dwWidth;
+ LONG lPitch;
+ LONG lXPitch;
+ DWORD dwBackBufferCount;
+ DWORD dwRefreshRate;
+ LPVOID lpSurface;
+ DDCOLORKEY ddckCKDestOverlay;
+ DDCOLORKEY ddckCKDestBlt;
+ DDCOLORKEY ddckCKSrcOverlay;
+ DDCOLORKEY ddckCKSrcBlt;
+ DDPIXELFORMAT ddpfPixelFormat;
+ DDSCAPS ddsCaps;
+ DWORD dwSurfaceSize;
+} DDSURFACEDESC, FAR* LPDDSURFACEDESC;
+
+/*
+ * DDSURFACEDESC dwFlags values. ????
+ */
+#define DDSD_CAP
+#define DDSD_HEIGHT
+#define DDSD_WIDTH
+#define DDSD_PITCH
+#define DDSD_XPITCH
+#define DDSD_BACKBUFFERCOUNT
+#define DDSD_LPSURFACE
+#define DDSD_PIXELFORMAT
+#define DDSD_CKDESTOVERLAY
+#define DDSD_CKDESTBLT
+#define DDSD_CKSRCOVERLAY
+#define DDSD_CKSRCBLT
+#define DDSD_REFRESHRATE
+#define DDSD_SURFACESIZE
+#define DDSD_VALID
+#define DDSD_ENUM_VALID
+
+struct IDirectDraw;
+struct IDirectDrawSurface;
+struct IDirectDrawPalette;
+struct IDirectDrawClipper;
+struct IDirectDrawColorControl;
+struct IDirectDrawGammaControl;
+
+/* DirectDraw Callback functions */
+BOOL WINAPI DDEnumCallbackEx( GUID FAR*, LPWSTR, LPWSTR, LPVOID, HMONITOR);
+HRESULT WINAPI EnumModesCallback( LPDDSURFACEDESC, LPVOID);
+HRESULT WINAPI EnumSurfacesCallback( LPDIRECTDRAWSURFACE, LPDDSURFACEDESC, LPVOID);
+
+HRESULT WINAPI DirectDrawCreate( GUID FAR*, struct IDirectDraw**, IUnknown FAR* );
+HRESULT WINAPI DirectDrawCreateClipper( DWORD, struct IDirectDrawClipper**, IUnknown FAR*);
+HRESULT WINAPI DirectDrawEnumerateEx( LPDDENUMCALLBACKEX, LPVOID, DWORD );
+
+/*
+ * DirectDraw Interfaces
+ *
+ * All Interface IIDs located in strmiids.c
+ *
+ */
+EXTERN_C const IID IID_IDirectDraw;
+#define INTERFACE IDirectDraw
+DECLARE_INTERFACE_( IDirectDraw, IUnknown )
+{
+ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID FAR *) PURE;
+ STDMETHOD_(ULONG,AddRef) (THIS) PURE;
+ STDMETHOD_(ULONG,Release) (THIS) PURE;
+ STDMETHOD(Compact)(THIS) PURE;
+ STDMETHOD(CreateClipper)(THIS_ DWORD, LPDIRECTDRAWCLIPPER FAR*, IUnknown FAR * ) PURE;
+ STDMETHOD(CreatePalette)(THIS_ DWORD, LPPALETTEENTRY, LPDIRECTDRAWPALETTE FAR*, IUnknown FAR * ) PURE;
+ STDMETHOD(CreateSurface)(THIS_ LPDDSURFACEDESC, LPDIRECTDRAWSURFACE FAR *, IUnknown FAR *) PURE;
+ STDMETHOD(DuplicateSurface)( THIS_ LPDIRECTDRAWSURFACE, LPDIRECTDRAWSURFACE FAR * ) PURE;
+ STDMETHOD(EnumDisplayModes)( THIS_ DWORD, LPDDSURFACEDESC, LPVOID, LPDDENUMMODESCALLBACK ) PURE;
+ STDMETHOD(EnumSurfaces)(THIS_ DWORD, LPDDSURFACEDESC, LPVOID,LPDDENUMSURFACESCALLBACK ) PURE;
+ STDMETHOD(FlipToGDISurface)(THIS) PURE;
+ STDMETHOD(GetCaps)( THIS_ LPDDCAPS, LPDDCAPS) PURE;
+ STDMETHOD(GetDisplayMode)( THIS_ LPDDSURFACEDESC) PURE;
+ STDMETHOD(GetFourCCCodes)(THIS_ LPDWORD, LPDWORD ) PURE;
+ STDMETHOD(GetGDISurface)(THIS_ LPDIRECTDRAWSURFACE FAR *) PURE;
+ STDMETHOD(GetMonitorFrequency)(THIS_ LPDWORD) PURE;
+ STDMETHOD(GetScanLine)(THIS_ LPDWORD) PURE;
+ STDMETHOD(GetVerticalBlankStatus)(THIS_ LPBOOL ) PURE;
+ STDMETHOD(Initialize)(THIS_ GUID FAR *) PURE;
+ STDMETHOD(RestoreDisplayMode)(THIS) PURE;
+ STDMETHOD(SetCooperativeLevel)(THIS_ HWND, DWORD) PURE;
+ STDMETHOD(SetDisplayMode)(THIS_ DWORD, DWORD,DWORD) PURE;
+ STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD, HANDLE ) PURE;
+};
+#undef INTERFACE
+
+EXTERN_C const IID IID_IDirectDrawClipper;
+#define INTERFACE IDirectDrawClipper
+DECLARE_INTERFACE_( IDirectDrawClipper, IUnknown )
+{
+ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID FAR *) PURE;
+ STDMETHOD_(ULONG,AddRef) (THIS) PURE;
+ STDMETHOD_(ULONG,Release) (THIS) PURE;
+ STDMETHOD(GetClipList)(THIS_ LPRECT, LPRGNDATA, LPDWORD) PURE;
+ STDMETHOD(GetHWnd)(THIS_ HWND FAR *) PURE;
+ STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW, DWORD) PURE;
+ STDMETHOD(IsClipListChanged)(THIS_ BOOL FAR *) PURE;
+ STDMETHOD(SetClipList)(THIS_ LPRGNDATA,DWORD) PURE;
+ STDMETHOD(SetHWnd)(THIS_ DWORD, HWND ) PURE;
+};
+#undef INTERFACE
+
+EXTERN_C const IID IID_IDirectColorControl;
+#define INTERFACE IDirectDrawColorControl
+DECLARE_INTERFACE_( IDirectDrawColorControl, IUnknown )
+{
+ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID FAR *) PURE;
+ STDMETHOD_(ULONG,AddRef) (THIS) PURE;
+ STDMETHOD_(ULONG,Release) (THIS) PURE;
+ STDMETHOD(GetColorControls)(THIS_ LPDDCOLORCONTROL) PURE;
+ STDMETHOD(SetColorControls)(THIS_ LPDDCOLORCONTROL) PURE;
+};
+#undef INTERFACE
+
+EXTERN_C const IID IID_IDirectDrawGammaControl
+#define INTERFACE IDirectDrawGammaControl
+DECLARE_INTERFACE_( IDirectDrawGammaControl, IUnknown )
+{
+ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID FAR *) PURE;
+ STDMETHOD_(ULONG,AddRef) (THIS) PURE;
+ STDMETHOD_(ULONG,Release) (THIS) PURE;
+ STDMETHOD(GetGammaRamp)(THIS_ DWORD, LPDDGAMMARAMP) PURE;
+ STDMETHOD(SetGammaRamp)(THIS_ DWORD, LPDDGAMMARAMP) PURE;
+};
+#undef INTERFACE
+
+EXTERN_C const IID IID_IDirectDrawSurface;
+#define INTERFACE IDirectDrawSurface
+DECLARE_INTERFACE_( IDirectDrawSurface, IUnknown )
+{
+ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID FAR *) PURE;
+ STDMETHOD_(ULONG,AddRef) (THIS) PURE;
+ STDMETHOD_(ULONG,Release) (THIS) PURE;
+ STDMETHOD(AddAttachedSurface)(THIS_ LPDIRECTDRAWSURFACE) PURE;
+ STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT) PURE;
+ STDMETHOD(Blt)(THIS_ LPRECT,LPDIRECTDRAWSURFACE, LPRECT,DWORD, LPDDBLTFX) PURE;
+ STDMETHOD(BltBatch)(THIS_ LPDDBLTBATCH, DWORD, DWORD ) PURE;
+ STDMETHOD(BltFast)(THIS_ DWORD,DWORD,LPDIRECTDRAWSURFACE, LPRECT,DWORD) PURE;
+ STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD,LPDIRECTDRAWSURFACE) PURE;
+ STDMETHOD(EnumAttachedSurfaces)(THIS_ LPVOID,LPDDENUMSURFACESCALLBACK) PURE;
+ STDMETHOD(EnumOverlayZOrders)(THIS_ DWORD,LPVOID,LPDDENUMSURFACESCALLBACK) PURE;
+ STDMETHOD(Flip)(THIS_ LPDIRECTDRAWSURFACE, DWORD) PURE;
+ STDMETHOD(GetAttachedSurface)(THIS_ LPDDSCAPS, LPDIRECTDRAWSURFACE FAR *) PURE;
+ STDMETHOD(GetBltStatus)(THIS_ DWORD) PURE;
+ STDMETHOD(GetCaps)(THIS_ LPDDSCAPS) PURE;
+ STDMETHOD(GetClipper)(THIS_ LPDIRECTDRAWCLIPPER FAR*) PURE;
+ STDMETHOD(GetColorKey)(THIS_ DWORD, LPDDCOLORKEY) PURE;
+ STDMETHOD(GetDC)(THIS_ HDC FAR *) PURE;
+ STDMETHOD(GetFlipStatus)(THIS_ DWORD) PURE;
+ STDMETHOD(GetOverlayPosition)(THIS_ LPLONG, LPLONG ) PURE;
+ STDMETHOD(GetPalette)(THIS_ LPDIRECTDRAWPALETTE FAR*) PURE;
+ STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT) PURE;
+ STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC) PURE;
+ STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW, LPDDSURFACEDESC) PURE;
+ STDMETHOD(IsLost)(THIS) PURE;
+ STDMETHOD(Lock)(THIS_ LPRECT,LPDDSURFACEDESC,DWORD,HANDLE) PURE;
+ STDMETHOD(ReleaseDC)(THIS_ HDC) PURE;
+ STDMETHOD(Restore)(THIS) PURE;
+ STDMETHOD(SetClipper)(THIS_ LPDIRECTDRAWCLIPPER) PURE;
+ STDMETHOD(SetColorKey)(THIS_ DWORD, LPDDCOLORKEY) PURE;
+ STDMETHOD(SetOverlayPosition)(THIS_ LONG, LONG ) PURE;
+ STDMETHOD(SetPalette)(THIS_ LPDIRECTDRAWPALETTE) PURE;
+ STDMETHOD(Unlock)(THIS_ LPVOID) PURE;
+ STDMETHOD(UpdateOverlay)(THIS_ LPRECT, LPDIRECTDRAWSURFACE,LPRECT,DWORD, LPDDOVERLAYFX) PURE;
+ STDMETHOD(UpdateOverlayDisplay)(THIS_ DWORD) PURE;
+ STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD, LPDIRECTDRAWSURFACE) PURE;
+};
+#undef INTERFACE
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/cegcc/src/w32api/libce/directx/Makefile.in b/cegcc/src/w32api/libce/directx/Makefile.in
new file mode 100644
index 0000000..924517d
--- /dev/null
+++ b/cegcc/src/w32api/libce/directx/Makefile.in
@@ -0,0 +1,202 @@
+# Makefile.in
+#
+# This file is part of a free library building Windows NT drivers.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+
+# start config section
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+VPATH = @srcdir@
+
+host_alias = @host@
+build_alias = @build@
+target_alias = @target@
+with_cross_host = @with_cross_host@
+prefix = @prefix@
+includedir:=...@includedir@
+
+program_transform_name = @program_transform_name@
+exec_prefix = @exec_prefix@
+libdir:=...@libdir@
+bindir = @bindir@
+ifeq ($(target_alias),$(host_alias))
+ifeq ($(build_alias),$(host_alias))
+tooldir:=$(exec_prefix)
+else
+tooldir:=$(exec_prefix)/$(target_alias)
+endif
+else
+tooldir:=$(exec_prefix)/$(target_alias)
+endif
+datadir = @datadir@
+infodir = @infodir@
+ifneq (,$(findstring cygwin,$(target_alias)))
+inst_includedir:=$(tooldir)/include/w32api
+inst_libdir:=$(tooldir)/lib/w32api
+else
+ifneq (,$(with_cross_host))
+inst_includedir:=$(tooldir)/include/w32api
+inst_libdir:=$(tooldir)/lib
+else
+inst_includedir:=$(includedir)
+inst_libdir:=$(libdir)
+endif
+endif
+
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+mkinstalldirs = mkdir -p
+
+CC = @CC@
+CC_FOR_TARGET = $(CC)
+
+DLLTOOL = @DLLTOOL@
+DLLTOOL_FLAGS = --as=$(AS) -k
+AS = @AS@
+AS_FOR_TARGET = $(AS_FOR_TARGET)
+WINDRES = @WINDRES@
+
+# Depending on if we build as part of winsup or mingw we need to
+# add additional include paths in order to get the correct headers
+# from the C library.
+BUILDENV = @BUILDENV@
+
+ifeq ($(BUILDENV), cygwin)
+# winsup/include
+# winsup/../newlib/libc/include
+# winsup/../newlib/libc/sys/cygwin
+EXTRA_INCLUDES = -I$(srcdir)/../../include -I$(srcdir)/../../../newlib/libc/include -I$(srcdir)/../../../newlib/libc/sys/cygwin
+endif
+ifeq ($(BUILDENV), mingw)
+EXTRA_INCLUDES = -I$(srcdir)/../../mingw/include
+endif
+
+INCLUDES = -I$(srcdir)/../include -I$(srcdir)/../include/directx $(EXTRA_INCLUDES)
+
+CFLAGS = @CFLAGS@
+ALL_CFLAGS = $(CFLAGS) $(INCLUDES)
+
+RANLIB = @RANLIB@
+AR = @AR@
+LD = @LD@
+
+# end config section
+
+# headers
+
+HEADERS = $(notdir $(wildcard $(srcdir)/../../include/directx/*.h))
+
+# libraries
+
+DEF_FILES = $(notdir $(wildcard $(srcdir)/*.def))
+DIST_C_FILES = $(notdir $(wildcard $(srcdir)/*.c))
+DIST_H_FILES = $(notdir $(wildcard $(srcdir)/*.h))
+LIBS = libstrmiids.a libddraw.a libdmoguids.a
+
+DISTFILES = Makefile.in $(DEF_FILES) $(DIST_C_FILES) $(DIST_H_FILES)
+
+.NOTPARALLEL:
+
+# targets
+all: $(LIBS)
+
+TEST_OPTIONS = $(ALL_CFLAGS) -Wall -pedantic -Wsystem-headers -c $(srcdir)/test.c -o test.o
+.PHONY: test
+test:
+ @echo "Testing directx..."
+ @for lang in c c++ objective-c ; do \
+ echo "$$lang..."; \
+ $(CC) -x$$lang $(TEST_OPTIONS) ; \
+ echo "$$lang UNICODE..."; \
+ $(CC) -x$$lang -DUNICODE $(TEST_OPTIONS) ; \
+ done
+ @echo "windres..."
+ @$(WINDRES) --include-dir $(INCDIR) -i $(srcdir)/res.rc -o test.o
+ @echo "windres UNICODE..."
+ @$(WINDRES) --define UNICODE --include-dir $(INCDIR) -i $(srcdir)/res.rc -o test.o
+ @rm -f test.o
+
+# make rules
+
+.SUFFIXES: .c .o .def .a
+
+.c.o:
+ $(CC) -c $(ALL_CFLAGS) -o $@ $<
+
+lib%.a: %.def %.o
+ $(DLLTOOL) $(DLLTOOL_FLAGS) --output-lib $@ --def $(srcdir)/$*.def
+ $(AR) r $@ $*.o
+ $(RANLIB) $@
+
+lib%.a: %.def
+ $(DLLTOOL) $(DLLTOOL_FLAGS) --output-lib $@ --def $<
+
+lib%.a: %.o
+ $(AR) rc $@ $*.o
+ $(RANLIB) $@
+
+# install headers and libraries in a target specified directory.
+install: install-libraries install-headers
+
+install-libraries: all
+ $(mkinstalldirs) $(inst_libdir)
+ for i in $(LIBS); do \
+ $(INSTALL_DATA) $$i $(inst_libdir)/$$i ; \
+ done
+
+install-headers:
+ $(mkinstalldirs) $(inst_includedir)
+ for i in $(HEADERS); do \
+ $(INSTALL_DATA) $(srcdir)/../../include/directx/$$i $(inst_includedir)/$$i ; \
+ done
+
+# uninstall headers and libraries from a target specified directory
+uninstall: uninstall-libraries uninstall-headers
+
+uninstall-libraries:
+ @for i in $(LIBS); do \
+ rm -f $(inst_libdir)/$$i ; \
+ done
+ rmdir $(inst_libdir)
+
+uninstall-headers:
+ @for i in $(HEADERS); do \
+ rm -r $(inst_includedir)/$$i ; \
+ done
+ rmdir $(inst_includedir)
+
+
+dist:
+ mkdir $(distdir)/include/directx
+ chmod 755 $(distdir)/include/directx
+ @for i in $(HEADERS); do \
+ cp -p $(srcdir)/../../include/directx/$$i $(distdir)/include/directx/$$i ; \
+ done
+ mkdir $(distdir)/lib/directx
+ chmod 755 $(distdir)/lib/directx
+ @for i in $(DISTFILES); do \
+ cp -p $(srcdir)/$$i $(distdir)/lib/directx/$$i ; \
+ done
+
+Makefile: Makefile.in ../../config.status ../../configure
+ cd ../..; $(SHELL) config.status
+
+# clean
+
+mostlyclean:
+ rm -f *~ *.o *.s
+
+clean:
+ rm -f *.o *.a *.s *~
+
+distclean: clean
+ rm -f config.cache config.status config.log Makefile
+
+maintainer-clean: distclean
diff --git a/cegcc/src/w32api/libce/directx/ddraw.def b/cegcc/src/w32api/libce/directx/ddraw.def
new file mode 100644
index 0000000..fdf57c1
--- /dev/null
+++ b/cegcc/src/w32api/libce/directx/ddraw.def
@@ -0,0 +1,15 @@
+LIBRARY ddraw.dll
+EXPORTS
+ddgetattachedsurface...@12
+ddinternall...@8
+ddinternalunl...@4
+dsoundh...@12
+directdrawcre...@12
+directdrawcreateclip...@12
+directdrawcreat...@16
+directdrawenumera...@8
+directdrawenumerate...@12
+directdrawenumerate...@12
+directdrawenumera...@8
+getddsurfacelo...@12
+getsurfacefro...@12
diff --git a/cegcc/src/w32api/libce/directx/dmoguids.c b/cegcc/src/w32api/libce/directx/dmoguids.c
new file mode 100644
index 0000000..c9606b8
--- /dev/null
+++ b/cegcc/src/w32api/libce/directx/dmoguids.c
@@ -0,0 +1,40 @@
+/*
+
+ dmoguids.c - DirectMedia Objects GUIDs
+
+ Written by Filip Navara <xnav...@volny.cz>
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+*/
+
+#if defined(__LCC__) || defined(__GNUC__)
+#define INITGUID 1
+#include <windows.h>
+#else
+#include <basetyps.h>
+#endif
+
+DEFINE_GUID(CLSID_DMOFilterCategory,0xbcd5796c,0xbd52,0x4d30,0xab,0x76,0x70,0xf9,0x75,0xb8,0x91,0x99);
+DEFINE_GUID(CLSID_DMOWrapperFilter,0x94297043,0xbd82,0x4dfd,0xb0,0xde,0x81,0x77,0x73,0x9c,0x6d,0x20);
+DEFINE_GUID(DMOCATEGORY_ACOUSTIC_ECHO_CANCEL,0xbf963d80l,0xc559,0x11d0,0x8a,0x2b,0x00,0xa0,0xc9,0x25,0x5a,0xc1);
+DEFINE_GUID(DMOCATEGORY_AGC,0xe88c9ba0l,0xc557,0x11d0,0x8a,0x2b,0x0,0xa0,0xc9,0x25,0x5a,0xc1);
+DEFINE_GUID(DMOCATEGORY_AUDIO_CAPTURE_EFFECT,0xf665aaba,0x3e09,0x4920,0xaa,0x5f,0x21,0x98,0x11,0x14,0x8f,0x09);
+DEFINE_GUID(DMOCATEGORY_AUDIO_DECODER,0x57f2db8b,0xe6bb,0x4513,0x9d,0x43,0xdc,0xd2,0xa6,0x59,0x31,0x25);
+DEFINE_GUID(DMOCATEGORY_AUDIO_EFFECT,0xf3602b3f,0x0592,0x48df,0xa4,0xcd,0x67,0x47,0x21,0xe7,0xeb,0xeb);
+DEFINE_GUID(DMOCATEGORY_AUDIO_ENCODER,0x33d9a761,0x90c8,0x11d0,0xbd,0x43,0x0,0xa0,0xc9,0x11,0xce,0x86);
+DEFINE_GUID(DMOCATEGORY_AUDIO_NOISE_SUPPRESS,0xe07f903f,0x62fd,0x4e60,0x8c,0xdd,0xde,0xa7,0x23,0x66,0x65,0xb5);
+DEFINE_GUID(DMOCATEGORY_VIDEO_DECODER,0x4a69b442,0x28be,0x4991,0x96,0x9c,0xb5,0x00,0xad,0xf5,0xd8,0xa8);
+DEFINE_GUID(DMOCATEGORY_VIDEO_EFFECT,0xd990ee14,0x776c,0x4723,0xbe,0x46,0x3d,0xa2,0xf5,0x6f,0x10,0xb9);
+DEFINE_GUID(DMOCATEGORY_VIDEO_ENCODER,0x33d9a760,0x90c8,0x11d0,0xbd,0x43,0x0,0xa0,0xc9,0x11,0xce,0x86);
+DEFINE_GUID(IID_IDMOWrapperFilter,0x52d6f586,0x9f0f,0x4824,0x8f,0xc8,0xe3,0x2c,0xa0,0x49,0x30,0xc2);
+DEFINE_GUID(IID_IMediaParamInfo,0x6d6cbb60,0xa223,0x44aa,0x84,0x2f,0xa2,0xf0,0x67,0x50,0xbe,0x6d);
+DEFINE_GUID(IID_IMediaParams,0x6d6cbb61,0xa223,0x44aa,0x84,0x2f,0xa2,0xf0,0x67,0x50,0xbe,0x6e);
+DEFINE_GUID(IID_IDMOQualityControl,0x65abea96,0xcf36,0x453f,0xaf,0x8a,0x70,0x5e,0x98,0xf1,0x62,0x60);
+DEFINE_GUID(IID_IDMOVideoOutputOptimizations,0xbe8f4f4e,0x5b16,0x4d29,0xb3,0x50,0x7f,0x6b,0x5d,0x92,0x98,0xac);
+DEFINE_GUID(IID_IEnumDMO,0x2c3cd98a,0x2bfa,0x4a53,0x9c,0x27,0x52,0x49,0xba,0x64,0xba,0x0f);
+DEFINE_GUID(IID_IMediaBuffer,0x59eff8b9,0x938c,0x4a26,0x82,0xf2,0x95,0xcb,0x84,0xcd,0xc8,0x37);
+DEFINE_GUID(IID_IMediaObject,0xd8ad0f58,0x5494,0x4102,0x97,0xc5,0xec,0x79,0x8e,0x59,0xbc,0xf4);
+DEFINE_GUID(IID_IMediaObjectInPlace,0x651b9ad0,0x0fc7,0x4aa9,0x95,0x38,0xd8,0x99,0x31,0x01,0x07,0x41);
diff --git a/cegcc/src/w32api/libce/strmiids.def b/cegcc/src/w32api/libce/strmiids.def
deleted file mode 100644
index 306ec27..0000000
--- a/cegcc/src/w32api/libce/strmiids.def
+++ /dev/null
@@ -1,2 +0,0 @@
-LIBRARY STRMIIDS
-EXPORTS
--
1.6.0.2.GIT
------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
Cegcc-devel mailing list
Cegcc-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cegcc-devel
