[D3DCOMPILER_43]

* Move some inclusions to the main header.
* Remove inclusions that already exist in the main header.
CORE-7716

svn path=/trunk/; revision=61324
This commit is contained in:
Amine Khaldi 2013-12-21 16:44:34 +00:00
parent 6826772bca
commit 560a2a6824
10 changed files with 14 additions and 49 deletions

View file

@ -20,10 +20,6 @@
* *
*/ */
#include "config.h"
#include "wine/port.h"
#include "wine/debug.h"
#include "d3dcompiler_private.h" #include "d3dcompiler_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(asmshader); WINE_DEFAULT_DEBUG_CHANNEL(asmshader);

View file

@ -76,10 +76,6 @@
/* Line 268 of yacc.c */ /* Line 268 of yacc.c */
#line 22 "asmshader.y" #line 22 "asmshader.y"
#include "config.h"
#include "wine/port.h"
#include "wine/debug.h"
#include "d3dcompiler_private.h" #include "d3dcompiler_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(asmshader); WINE_DEFAULT_DEBUG_CHANNEL(asmshader);

View file

@ -19,9 +19,6 @@
* *
*/ */
#include "config.h"
#include "wine/port.h"
#include "d3dcompiler_private.h" #include "d3dcompiler_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3dcompiler); WINE_DEFAULT_DEBUG_CHANNEL(d3dcompiler);

View file

@ -20,12 +20,8 @@
* *
*/ */
#include "config.h"
#include "wine/port.h"
#include "wine/debug.h"
#include "d3d9types.h"
#include "d3dcompiler_private.h" #include "d3dcompiler_private.h"
#include "d3d9types.h"
WINE_DEFAULT_DEBUG_CHANNEL(bytecodewriter); WINE_DEFAULT_DEBUG_CHANNEL(bytecodewriter);

View file

@ -17,13 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define COBJMACROS
#include "config.h"
#include "wine/port.h"
#include "wine/debug.h"
#include "wine/unicode.h"
#include "d3dcompiler_private.h" #include "d3dcompiler_private.h"
#include "wine/unicode.h"
#include "wine/wpp.h" #include "wine/wpp.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3dcompiler); WINE_DEFAULT_DEBUG_CHANNEL(d3dcompiler);

View file

@ -19,13 +19,6 @@
* *
*/ */
#include "config.h"
#include <stdarg.h>
#include "windef.h"
#include "winbase.h"
#include "d3dcompiler_private.h" #include "d3dcompiler_private.h"
BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved)

View file

@ -22,16 +22,21 @@
#ifndef __WINE_D3DCOMPILER_PRIVATE_H #ifndef __WINE_D3DCOMPILER_PRIVATE_H
#define __WINE_D3DCOMPILER_PRIVATE_H #define __WINE_D3DCOMPILER_PRIVATE_H
#include "wine/debug.h" #include <config.h>
#include "wine/list.h" #include <wine/port.h>
#include "wine/rbtree.h"
#include <stdio.h>
#include <wine/debug.h>
#include <wine/list.h>
#include <wine/rbtree.h>
#define COBJMACROS #define COBJMACROS
#include "windef.h" #include <windef.h>
#include "winbase.h" #include <winbase.h>
#include "objbase.h" #include <objbase.h>
#include "d3dcompiler.h" #include <d3dcompiler.h>
#include <assert.h> #include <assert.h>

View file

@ -76,11 +76,6 @@
/* Line 268 of yacc.c */ /* Line 268 of yacc.c */
#line 21 "hlsl.y" #line 21 "hlsl.y"
#include "config.h"
#include "wine/debug.h"
#include <stdio.h>
#include "d3dcompiler_private.h" #include "d3dcompiler_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(hlsl_parser); WINE_DEFAULT_DEBUG_CHANNEL(hlsl_parser);

View file

@ -18,9 +18,6 @@
* *
*/ */
#include "config.h"
#include "wine/port.h"
#include "d3dcompiler_private.h" #include "d3dcompiler_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3dcompiler); WINE_DEFAULT_DEBUG_CHANNEL(d3dcompiler);

View file

@ -21,11 +21,6 @@
* *
*/ */
#include "config.h"
#include "wine/port.h"
#include <stdio.h>
#include "d3dcompiler_private.h" #include "d3dcompiler_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3dcompiler); WINE_DEFAULT_DEBUG_CHANNEL(d3dcompiler);