d3dx11: Build with msvcrt.
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
7f2be06f93
commit
f277b96908
|
@ -3,6 +3,8 @@ MODULE = d3dx11_42.dll
|
||||||
IMPORTS = d3dcompiler
|
IMPORTS = d3dcompiler
|
||||||
PARENTSRC = ../d3dx11_43
|
PARENTSRC = ../d3dx11_43
|
||||||
|
|
||||||
|
EXTRADLLFLAGS = -mno-cygwin
|
||||||
|
|
||||||
C_SRCS = \
|
C_SRCS = \
|
||||||
async.c \
|
async.c \
|
||||||
main.c \
|
main.c \
|
||||||
|
|
|
@ -3,6 +3,8 @@ MODULE = d3dx11_43.dll
|
||||||
IMPORTLIB = d3dx11
|
IMPORTLIB = d3dx11
|
||||||
IMPORTS = d3dcompiler
|
IMPORTS = d3dcompiler
|
||||||
|
|
||||||
|
EXTRADLLFLAGS = -mno-cygwin
|
||||||
|
|
||||||
C_SRCS = \
|
C_SRCS = \
|
||||||
async.c \
|
async.c \
|
||||||
main.c \
|
main.c \
|
||||||
|
|
|
@ -16,13 +16,10 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "config.h"
|
|
||||||
#include "wine/port.h"
|
|
||||||
#include "d3dx11.h"
|
#include "d3dx11.h"
|
||||||
#include "d3dcompiler.h"
|
#include "d3dcompiler.h"
|
||||||
|
|
||||||
#include "wine/debug.h"
|
#include "wine/debug.h"
|
||||||
#include "wine/unicode.h"
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
|
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
|
||||||
|
|
||||||
|
@ -317,13 +314,13 @@ HRESULT WINAPI D3DX11CreateAsyncFileLoaderW(const WCHAR *filename, ID3DX11DataLo
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
|
|
||||||
object->ID3DX11DataLoader_iface.lpVtbl = &filedataloadervtbl;
|
object->ID3DX11DataLoader_iface.lpVtbl = &filedataloadervtbl;
|
||||||
object->u.file.path = HeapAlloc(GetProcessHeap(), 0, (strlenW(filename) + 1) * sizeof(WCHAR));
|
object->u.file.path = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(filename) + 1) * sizeof(WCHAR));
|
||||||
if (!object->u.file.path)
|
if (!object->u.file.path)
|
||||||
{
|
{
|
||||||
HeapFree(GetProcessHeap(), 0, object);
|
HeapFree(GetProcessHeap(), 0, object);
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
}
|
}
|
||||||
strcpyW(object->u.file.path, filename);
|
lstrcpyW(object->u.file.path, filename);
|
||||||
object->data = NULL;
|
object->data = NULL;
|
||||||
object->size = 0;
|
object->size = 0;
|
||||||
|
|
||||||
|
|
|
@ -17,8 +17,6 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "config.h"
|
|
||||||
#include "wine/port.h"
|
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
|
|
||||||
#define COBJMACROS
|
#define COBJMACROS
|
||||||
|
|
|
@ -16,8 +16,6 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "config.h"
|
|
||||||
#include "wine/port.h"
|
|
||||||
#include "d3dx11.h"
|
#include "d3dx11.h"
|
||||||
#include "d3dcompiler.h"
|
#include "d3dcompiler.h"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue