make crosstest fails

[Robert Reif]

Stefan Leichter wrote:

>Hello,
>
>building cross tests of current cvs fails for me with:
>
>i386-mingw32-gcc capture.cross.o ds3d.cross.o dsound.cross.o propset.cross.o  
>testlist.cross.o -o dsound_crosstest.exe -ldsound -lole32 -luser32 -lkernel32 
>-ldxguid -luuid -ldxerr8
>/usr/local/lib/gcc-lib/i386-mingw32/3.2.3/../../../../i386-mingw32/lib/
>libdxguid.a(dxguid.o)(.text+0x570):/usr/src/packages/BUILD/mingw-3.2/
>w32api-2.5/lib/directx/dxguid.c: multiple definition of 
>`CLSID_DirectSoundPrivate'
>propset.cross.o(.text+0x0):propset.c: first defined here
>/usr/local/lib/gcc-lib/i386-mingw32/3.2.3/../../../../i386-mingw32/lib/
>libdxguid.a(dxguid.o)(.text+0x580):/usr/src/packages/BUILD/mingw-3.2/
>w32api-2.5/lib/directx/dxguid.c: multiple definition of 
>`DSPROPSETID_DirectSoundDevice'
>propset.cross.o(.text+0x10):propset.c: first defined here
>make[3]: *** [dsound_crosstest.exe] Fehler 1
>make[3]: Leaving directory `/usr/src/wine/wine-mingw/dlls/dsound/tests'
>make[2]: *** [tests/__crosstest__] Fehler 2
>make[2]: Leaving directory `/usr/src/wine/wine-mingw/dlls/dsound'
>make[1]: *** [dsound/__crosstest__] Fehler 2
>make[1]: Leaving directory `/usr/src/wine/wine-mingw/dlls'
>make: *** [dlls/__crosstest__] Fehler 2
>
>Bye Stefan
>
>
>  
>
Wine dxguid used to include those IIDs but windows doesn't so I removed
them and fixed the files that used them to define the IIDs directly.  Looks
like the same fix needs to be done to mingw or maybe recompile your 
dxguid.lib.