marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3dx10: Build with msvcrt. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
stable
Alexandre Julliard 2019-05-30 09:16:24 +02:00
parent c70e8b64ab
commit 7f2be06f93
23 changed files with 24 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/d3dx10_33/Makefile.in
View File

@ -1,5 +1,7 @@
MODULE = d3dx10_33.dll MODULE = d3dx10_33.dll
EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \ C_SRCS = \
d3dx10_33_main.c d3dx10_33_main.c

3
dlls/d3dx10_33/d3dx10_33_main.c
View File

@ -19,9 +19,6 @@
* *
*/ */
#include "config.h"
#include "wine/port.h"
#include <stdarg.h> #include <stdarg.h>
#define COBJMACROS #define COBJMACROS

2
dlls/d3dx10_34/Makefile.in
View File

@ -1,5 +1,7 @@
MODULE = d3dx10_34.dll MODULE = d3dx10_34.dll
EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \ C_SRCS = \
d3dx10_34_main.c d3dx10_34_main.c

3
dlls/d3dx10_34/d3dx10_34_main.c
View File

@ -19,9 +19,6 @@
* *
*/ */
#include "config.h"
#include "wine/port.h"
#include <stdarg.h> #include <stdarg.h>
#define COBJMACROS #define COBJMACROS

2
dlls/d3dx10_35/Makefile.in
View File

@ -1,5 +1,7 @@
MODULE = d3dx10_35.dll MODULE = d3dx10_35.dll
EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \ C_SRCS = \
d3dx10_35_main.c d3dx10_35_main.c

3
dlls/d3dx10_35/d3dx10_35_main.c
View File

@ -19,9 +19,6 @@
* *
*/ */
#include "config.h"
#include "wine/port.h"
#include <stdarg.h> #include <stdarg.h>
#define COBJMACROS #define COBJMACROS

2
dlls/d3dx10_36/Makefile.in
View File

@ -1,5 +1,7 @@
MODULE = d3dx10_36.dll MODULE = d3dx10_36.dll
EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \ C_SRCS = \
d3dx10_36_main.c d3dx10_36_main.c

3
dlls/d3dx10_36/d3dx10_36_main.c
View File

@ -19,9 +19,6 @@
* *
*/ */
#include "config.h"
#include "wine/port.h"
#include <stdarg.h> #include <stdarg.h>
#define COBJMACROS #define COBJMACROS

2
dlls/d3dx10_37/Makefile.in
View File

@ -1,5 +1,7 @@
MODULE = d3dx10_37.dll MODULE = d3dx10_37.dll
EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \ C_SRCS = \
d3dx10_37_main.c d3dx10_37_main.c

3
dlls/d3dx10_37/d3dx10_37_main.c
View File

@ -19,9 +19,6 @@
* *
*/ */
#include "config.h"
#include "wine/port.h"
#include <stdarg.h> #include <stdarg.h>
#define COBJMACROS #define COBJMACROS

2
dlls/d3dx10_38/Makefile.in
View File

@ -1,5 +1,7 @@
MODULE = d3dx10_38.dll MODULE = d3dx10_38.dll
EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \ C_SRCS = \
d3dx10_38_main.c d3dx10_38_main.c

3
dlls/d3dx10_38/d3dx10_38_main.c
View File

@ -19,9 +19,6 @@
* *
*/ */
#include "config.h"
#include "wine/port.h"
#include <stdarg.h> #include <stdarg.h>
#define COBJMACROS #define COBJMACROS

2
dlls/d3dx10_39/Makefile.in
View File

@ -1,5 +1,7 @@
MODULE = d3dx10_39.dll MODULE = d3dx10_39.dll
EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \ C_SRCS = \
d3dx10_39_main.c d3dx10_39_main.c

3
dlls/d3dx10_39/d3dx10_39_main.c
View File

@ -19,9 +19,6 @@
* *
*/ */
#include "config.h"
#include "wine/port.h"
#include <stdarg.h> #include <stdarg.h>
#define COBJMACROS #define COBJMACROS

2
dlls/d3dx10_40/Makefile.in
View File

@ -1,5 +1,7 @@
MODULE = d3dx10_40.dll MODULE = d3dx10_40.dll
EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \ C_SRCS = \
d3dx10_40_main.c d3dx10_40_main.c

3
dlls/d3dx10_40/d3dx10_40_main.c
View File

@ -19,9 +19,6 @@
* *
*/ */
#include "config.h"
#include "wine/port.h"
#include <stdarg.h> #include <stdarg.h>
#define COBJMACROS #define COBJMACROS

2
dlls/d3dx10_41/Makefile.in
View File

@ -1,5 +1,7 @@
MODULE = d3dx10_41.dll MODULE = d3dx10_41.dll
EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \ C_SRCS = \
d3dx10_41_main.c d3dx10_41_main.c

3
dlls/d3dx10_41/d3dx10_41_main.c
View File

@ -19,9 +19,6 @@
* *
*/ */
#include "config.h"
#include "wine/port.h"
#include <stdarg.h> #include <stdarg.h>
#define COBJMACROS #define COBJMACROS

2
dlls/d3dx10_42/Makefile.in
View File

@ -1,5 +1,7 @@
MODULE = d3dx10_42.dll MODULE = d3dx10_42.dll
EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \ C_SRCS = \
d3dx10_42_main.c d3dx10_42_main.c

3
dlls/d3dx10_42/d3dx10_42_main.c
View File

@ -19,9 +19,6 @@
* *
*/ */
#include "config.h"
#include "wine/port.h"
#include <stdarg.h> #include <stdarg.h>
#define COBJMACROS #define COBJMACROS

2
dlls/d3dx10_43/Makefile.in
View File

@ -2,6 +2,8 @@ MODULE = d3dx10_43.dll
IMPORTLIB = d3dx10 IMPORTLIB = d3dx10
IMPORTS = d3d10_1 d3dcompiler dxguid IMPORTS = d3d10_1 d3dcompiler dxguid
EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \ C_SRCS = \
async.c \ async.c \
d3dx10_43_main.c d3dx10_43_main.c

7
dlls/d3dx10_43/async.c
View File

@ -16,14 +16,11 @@
* 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 "d3d10_1.h" #include "d3d10_1.h"
#include "d3dx10.h" #include "d3dx10.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);
@ -318,13 +315,13 @@ HRESULT WINAPI D3DX10CreateAsyncFileLoaderW(const WCHAR *filename, ID3DX10DataLo
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
object->ID3DX10DataLoader_iface.lpVtbl = &filedataloadervtbl; object->ID3DX10DataLoader_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;

3
dlls/d3dx10_43/d3dx10_43_main.c
View File

@ -19,10 +19,7 @@
* *
*/ */
#include "config.h"
#include "wine/port.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/unicode.h"
#include <stdarg.h> #include <stdarg.h>