libs/vkd3d-utils: Add library.

This commit is contained in:
Józef Kucia 2016-10-07 13:26:39 +02:00
parent 49cac8005c
commit 12ea3309f0
4 changed files with 69 additions and 9 deletions

View File

@ -22,7 +22,8 @@ noinst_LTLIBRARIES = libvkd3d-common.la
libvkd3d_common_la_SOURCES = \
libs/vkd3d-common/debug.c
lib_LTLIBRARIES = libvkd3d.la
lib_LTLIBRARIES = libvkd3d.la libvkd3d-utils.la
libvkd3d_la_SOURCES = \
libs/vkd3d/command.c \
libs/vkd3d/device.c \
@ -32,11 +33,15 @@ libvkd3d_la_SOURCES = \
libs/vkd3d/vkd3d_main.c
libvkd3d_la_LIBADD = libvkd3d-common.la @PTHREAD_LIBS@
libvkd3d_utils_la_SOURCES = \
libs/vkd3d-utils/vkd3d_utils_main.c
libvkd3d_utils_la_LIBADD = libvkd3d-common.la libvkd3d.la
pkgconfigdir = $(libdir)/pkgconfig
pkginclude_HEADERS = $(vkd3d_public_headers)
nodist_pkgconfig_DATA = libvkd3d.pc
LDADD = libvkd3d.la
LDADD = libvkd3d-utils.la
check_PROGRAMS = $(vkd3d_tests)
AM_DEFAULT_SOURCE_EXT = .c
TESTS = $(vkd3d_tests)

View File

@ -0,0 +1,30 @@
/*
* Copyright 2016 Józef Kucia for CodeWeavers
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*/
#include "vkd3d_utils_private.h"
HRESULT WINAPI D3D12GetDebugInterface(REFIID riid, void **debug)
{
FIXME("riid %s, debug %p stub!\n", debugstr_guid(riid), debug);
return E_NOTIMPL;
}

View File

@ -0,0 +1,32 @@
/*
* Copyright 2016 Józef Kucia for CodeWeavers
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*/
#ifndef __VKD3D_UTILS_PRIVATE_H
#define __VKD3D_UTILS_PRIVATE_H
#define COBJMACROS
#define NONAMELESSUNION
#include "vkd3d_debug.h"
#include "d3d12.h"
#endif /* __VKD3D_UTILS_PRIVATE_H */

View File

@ -55,13 +55,6 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_fe
riid, device);
}
HRESULT WINAPI D3D12GetDebugInterface(REFIID riid, void **debug)
{
FIXME("riid %s, debug %p stub!\n", debugstr_guid(riid), debug);
return E_NOTIMPL;
}
/* Events */
HANDLE WINAPI VKD3DCreateEvent(void)
{