[D3D8]
authorAmine Khaldi <amine.khaldi@reactos.org>
Sun, 19 Jan 2014 10:45:19 +0000 (10:45 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Sun, 19 Jan 2014 10:45:19 +0000 (10:45 +0000)
* Improve the GUIDs situation.
CORE-7716

svn path=/trunk/; revision=61703

reactos/dll/directx/wine/d3d8/CMakeLists.txt
reactos/dll/directx/wine/d3d8/d3d8_private.h
reactos/dll/directx/wine/d3d8/guid.c [new file with mode: 0644]

index 2dc5cf9..437f393 100644 (file)
@@ -18,12 +18,13 @@ list(APPEND SOURCE
     texture.c
     vertexdeclaration.c
     volume.c
+    guid.c
     version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/d3d8.def)
 
 add_library(d3d8 SHARED ${SOURCE})
 set_module_type(d3d8 win32dll UNICODE)
-target_link_libraries(d3d8 wine)
+target_link_libraries(d3d8 uuid wine)
 add_importlibs(d3d8 wined3d msvcrt kernel32 ntdll)
 add_pch(d3d8 d3d8_private.h)
 add_cd_file(TARGET d3d8 DESTINATION reactos/system32 FOR all)
index 073c0f6..6fb7296 100644 (file)
 
 #include <config.h>
 
+#include <assert.h>
+#include <stdarg.h>
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
 
-#include <assert.h>
-#include <stdarg.h>
-
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
 #define COBJMACROS
+
 #include <windef.h>
 #include <winbase.h>
 #include <wingdi.h>
@@ -42,7 +43,6 @@
 #include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(d3d8);
 
-#include <initguid.h>
 #include <d3d8.h>
 #include <wine/wined3d.h>
 
diff --git a/reactos/dll/directx/wine/d3d8/guid.c b/reactos/dll/directx/wine/d3d8/guid.c
new file mode 100644 (file)
index 0000000..9218008
--- /dev/null
@@ -0,0 +1,15 @@
+/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
+
+#include <stdarg.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#include <windef.h>
+#include <winbase.h>
+#include <wingdi.h>
+#include <initguid.h>
+#include <d3d8.h>
+
+/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */