Split DirectX GUIDs to separate files to avoid header conflicts.

ole/Makefile.in

@@ -6,15 +6,17 @@ VPATH     = @srcdir@
 MODULE    = none
 
 C_SRCS = \
+	dx8guid.c \
+	dxguid.c \
 	uuid.c
 
 all: libwine_uuid.a
 
 @MAKE_RULES@
 
-libwine_uuid.a: uuid.o
+libwine_uuid.a: $(OBJS)
 	$(RM) $@
-	$(AR) $@ uuid.o
+	$(AR) $@ $(OBJS)
 	$(RANLIB) $@
 
 install:: libwine_uuid.a

ole/dx8guid.c

+/*
+ * DirectX 8 GUID definitions
+ *
+ * Copyright 2000 Alexandre Julliard
+ * Copyright 2000 Francois Gouget
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * 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.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+
+#include "objbase.h"
+#include "olectl.h"
+#include "initguid.h"
+
+#include "d3d8.h"
+#include "d3dx8core.h"

ole/dxguid.c

+/*
+ * DirectX GUID definitions
+ *
+ * Copyright 2000 Alexandre Julliard
+ * Copyright 2000 Francois Gouget
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * 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.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+
+#include "objbase.h"
+#include "olectl.h"
+#include "initguid.h"
+
+#include "d3d.h"
+#include "ddraw.h"
+#include "dsound.h"
+#include "dplay.h"
+#include "dplobby.h"
+#include "dinput.h"
+#include "ddrawi.h"

ole/uuid.c

@@ -52,19 +52,6 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
 
 /* FIXME: cguids declares GUIDs but does not define their values */
 
-
-
-/* GUIDs defined in dxguid.lib */
-
-#include "d3d.h"
-#include "ddraw.h"
-#include "dsound.h"
-#include "dplay.h"
-#include "dplobby.h"
-#include "dinput.h"
-
-#include "ddrawi.h"
-
 /* other GUIDs */
 
 #include "wine/obj_webbrowser.h"