build: Remove rpc.h and rpcndr.h includes from generated headers.

Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2018-04-13 12:37:44 +02:00 committed by Alexandre Julliard
parent ab15973e6b
commit ce9ec9a44a
4 changed files with 2 additions and 57 deletions

View File

@ -14,8 +14,6 @@ widl_headers = \
include/vkd3d_dxgitype.h
vkd3d_public_headers = \
include/dummy/rpc.h \
include/dummy/rpcndr.h \
include/vkd3d.h \
include/vkd3d_d3d12.h \
include/vkd3d_d3dcommon.h \
@ -149,6 +147,7 @@ EXTRA_DIST += $(widl_headers) $(widl_headers:.h=.idl)
$(widl_headers): %.h: %.idl
if HAVE_WIDL
$(VKD3D_V_WIDL)$(WIDL) -o $@ $<
sed -e '/#include <\(rpc.h\|rpcndr.h\)>/d' -i $@
else
echo "widl is required to generate $<"
endif

View File

@ -1,30 +0,0 @@
/*
* Copyright 2016 Józef Kucia for CodeWeavers
*
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
/* XXX: This is a dummy header required by files generated by widl. */
#ifndef __VKD3D_RPC_H__
#define __VKD3D_RPC_H__
#define __RPC_STUB
typedef struct IRpcStubBuffer IRpcStubBuffer;
typedef struct IRpcChannelBuffer IRpcChannelBuffer;
typedef struct PRPC_MESSAGE PRPC_MESSAGE;
#endif /* __VKD3D_RPC_H__ */

View File

@ -1,25 +0,0 @@
/*
* Copyright 2016 Józef Kucia for CodeWeavers
*
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
/* XXX: This is a dummy header required by files generated by widl. */
#ifndef __VKD3D_RPCNDR_H
#define __VKD3D_RPCNDR_H
#define MIDL_INTERFACE(x) struct
#endif /* __VKD3D_RPCNDR_H */

View File

@ -182,6 +182,7 @@ typedef struct SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES;
# define interface struct
# define BEGIN_INTERFACE
# define END_INTERFACE
# define MIDL_INTERFACE(x) struct
# ifdef __cplusplus
# define EXTERN_C extern "C"