May 2019 - Wine-Commits - list.winehq.org

Paul Gofman : ddraw: Fix setting current viewport for ddraw1.
by Alexandre Julliard May 16, 2019

May 16, 2019

Module: wine Branch: master Commit: 8bc7139b6fe27ba8fe80ae3414dee436d5b92f6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bc7139b6fe27ba8fe80ae34… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed May 15 18:06:48 2019 +0300 ddraw: Fix setting current viewport for ddraw1. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/device.c | 6 +++++- dlls/ddraw/executebuffer.c | 13 +------------ 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 19f21a8..7137f78 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -555,7 +555,7 @@ struct d3d_execute_buffer *unsafe_impl_from_IDirect3DExecuteBuffer(IDirect3DExec /* The execute function */ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *execute_buffer, - struct d3d_device *device, struct d3d_viewport *viewport) DECLSPEC_HIDDEN; + struct d3d_device *device) DECLSPEC_HIDDEN; /***************************************************************************** * IDirect3DVertexBuffer diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 18e5854..ade56bb 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -712,9 +712,13 @@ static HRESULT WINAPI d3d_device1_Execute(IDirect3DDevice *iface, if(!buffer) return DDERR_INVALIDPARAMS; + if (FAILED(hr = IDirect3DDevice3_SetCurrentViewport + (&device->IDirect3DDevice3_iface, &viewport_impl->IDirect3DViewport3_iface))) + return hr; + /* Execute... */ wined3d_mutex_lock(); - hr = d3d_execute_buffer_execute(buffer, device, viewport_impl); + hr = d3d_execute_buffer_execute(buffer, device); wined3d_mutex_unlock(); return hr; diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index f9082dc..637c2bd 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -48,8 +48,7 @@ static void _dump_D3DEXECUTEBUFFERDESC(const D3DEXECUTEBUFFERDESC *lpDesc) { TRACE("lpData : %p\n", lpDesc->lpData); } -HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, - struct d3d_device *device, struct d3d_viewport *viewport) +HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct d3d_device *device) { DWORD is = buffer->data.dwInstructionOffset; char *instr = (char *)buffer->desc.lpData + is; @@ -58,16 +57,6 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct wined3d_box box = {0}; HRESULT hr; - if (viewport->active_device != device) - { - WARN("Viewport %p active device is %p.\n", - viewport, viewport->active_device); - return DDERR_INVALIDPARAMS; - } - - /* Activate the viewport */ - viewport_activate(viewport, FALSE); - TRACE("ExecuteData :\n"); if (TRACE_ON(ddraw)) _dump_executedata(&(buffer->data));

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_destroy_fbo_entry().
by Alexandre Julliard May 16, 2019

May 16, 2019

Module: wine Branch: master Commit: d93689334fb6219b4eb2917371e4c9e249a75a0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d93689334fb6219b4eb29173… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 16 17:52:58 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_destroy_fbo_entry(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2670b41..62927a3 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -561,14 +561,14 @@ static void wined3d_context_gl_reuse_fbo_entry(struct wined3d_context_gl *contex } /* Context activation is done by the caller. */ -static void context_destroy_fbo_entry(struct wined3d_context *context, struct fbo_entry *entry) +static void wined3d_context_gl_destroy_fbo_entry(struct wined3d_context_gl *context_gl, struct fbo_entry *entry) { if (entry->id) { TRACE("Destroy FBO %u.\n", entry->id); - wined3d_context_gl_destroy_fbo(wined3d_context_gl(context), entry->id); + wined3d_context_gl_destroy_fbo(context_gl, entry->id); } - --context->fbo_entry_count; + --context_gl->c.fbo_entry_count; list_remove(&entry->entry); heap_free(entry); } @@ -767,7 +767,7 @@ static void context_apply_fbo_state(struct wined3d_context *context, GLenum targ LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context->fbo_destroy_list, struct fbo_entry, entry) { - context_destroy_fbo_entry(context, entry); + wined3d_context_gl_destroy_fbo_entry(context_gl, entry); } if (context->rebind_fbo) @@ -1341,13 +1341,13 @@ void wined3d_context_cleanup(struct wined3d_context *context) LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context->fbo_destroy_list, struct fbo_entry, entry) { if (!context->valid) entry->id = 0; - context_destroy_fbo_entry(context, entry); + wined3d_context_gl_destroy_fbo_entry(wined3d_context_gl(context), entry); } LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context->fbo_list, struct fbo_entry, entry) { if (!context->valid) entry->id = 0; - context_destroy_fbo_entry(context, entry); + wined3d_context_gl_destroy_fbo_entry(wined3d_context_gl(context), entry); } context_restore_pixel_format(context);

1 0

Alexandre Julliard : msvcrt40: Use the standard -mno-cygwin build flag.
by Alexandre Julliard May 16, 2019

May 16, 2019

Module: wine Branch: master Commit: 4b541b1eb8c9290a931ce33caa5dcb016b08d042 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b541b1eb8c9290a931ce33c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 14:54:42 2019 +0200 msvcrt40: Use the standard -mno-cygwin build flag. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt40/Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt40/Makefile.in b/dlls/msvcrt40/Makefile.in index 57bca5b..aab9e21 100644 --- a/dlls/msvcrt40/Makefile.in +++ b/dlls/msvcrt40/Makefile.in @@ -1,6 +1,7 @@ EXTRADEFS = -DUSE_MSVCRT_PREFIX MODULE = msvcrt40.dll -IMPORTS = msvcrt + +EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ msvcrt40.c

1 0

Alexandre Julliard : msvcrt20: Use the standard -mno-cygwin build flag.
by Alexandre Julliard May 16, 2019

May 16, 2019

Module: wine Branch: master Commit: 73bf5fdb1a9211eef88fb77a8d16d5439bde9c0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=73bf5fdb1a9211eef88fb77a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 14:54:36 2019 +0200 msvcrt20: Use the standard -mno-cygwin build flag. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt20/Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt20/Makefile.in b/dlls/msvcrt20/Makefile.in index 17861a6..0b80514 100644 --- a/dlls/msvcrt20/Makefile.in +++ b/dlls/msvcrt20/Makefile.in @@ -1,5 +1,6 @@ EXTRADEFS = -DUSE_MSVCRT_PREFIX MODULE = msvcrt20.dll -IMPORTS = msvcrt + +EXTRADLLFLAGS = -mno-cygwin C_SRCS = msvcrt20.c

1 0

Matteo Bruni : wined3d: Always report support for ZBIAS and MIPMAPLODBIAS raster caps in the Vulkan backend.
by Alexandre Julliard May 16, 2019

May 16, 2019

Module: wine Branch: master Commit: 0f209a930112ea3a3e3f7fc3292072ac8fab9446 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f209a930112ea3a3e3f7fc3… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed May 15 23:39:31 2019 +0200 wined3d: Always report support for ZBIAS and MIPMAPLODBIAS raster caps in the Vulkan backend. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index b8d94a0..57235bb 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -337,11 +337,11 @@ static void adapter_vk_get_wined3d_caps(const struct wined3d_adapter *adapter, s | WINED3DPMISCCAPS_INDEPENDENTWRITEMASKS | WINED3DPMISCCAPS_POSTBLENDSRGBCONVERT; + caps->RasterCaps |= WINED3DPRASTERCAPS_ZBIAS | WINED3DPRASTERCAPS_MIPMAPLODBIAS; + if (sampler_anisotropy) { - caps->RasterCaps |= WINED3DPRASTERCAPS_ANISOTROPY - | WINED3DPRASTERCAPS_ZBIAS - | WINED3DPRASTERCAPS_MIPMAPLODBIAS; + caps->RasterCaps |= WINED3DPRASTERCAPS_ANISOTROPY; caps->TextureFilterCaps |= WINED3DPTFILTERCAPS_MAGFANISOTROPIC | WINED3DPTFILTERCAPS_MINFANISOTROPIC;

1 0

Paul Gofman : wined3d: Move validate_material_colour_source() to wined3d_private.h.
by Alexandre Julliard May 16, 2019

May 16, 2019

Module: wine Branch: master Commit: 0d79d3625ed31df62294c6ae78e63c47991d6c89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d79d3625ed31df62294c6ae… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed May 15 18:06:50 2019 +0300 wined3d: Move validate_material_colour_source() to wined3d_private.h. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 10 ---------- dlls/wined3d/wined3d_private.h | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 669c8cb..06ff97c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6378,16 +6378,6 @@ int wined3d_ffp_frag_program_key_compare(const void *key, const struct wine_rb_e return memcmp(ka, kb, sizeof(*ka)); } -static enum wined3d_material_color_source validate_material_colour_source(WORD use_map, - enum wined3d_material_color_source source) -{ - if (source == WINED3D_MCS_COLOR1 && use_map & (1u << WINED3D_FFP_DIFFUSE)) - return source; - if (source == WINED3D_MCS_COLOR2 && use_map & (1u << WINED3D_FFP_SPECULAR)) - return source; - return WINED3D_MCS_MATERIAL; -} - void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, const struct wined3d_state *state, struct wined3d_ffp_vs_settings *settings) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2525fca..0a629dd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4840,6 +4840,16 @@ static inline void wined3d_not_from_cs(struct wined3d_cs *cs) assert(cs->thread_id != GetCurrentThreadId()); } +static inline enum wined3d_material_color_source validate_material_colour_source(WORD use_map, + enum wined3d_material_color_source source) +{ + if (source == WINED3D_MCS_COLOR1 && use_map & (1u << WINED3D_FFP_DIFFUSE)) + return source; + if (source == WINED3D_MCS_COLOR2 && use_map & (1u << WINED3D_FFP_SPECULAR)) + return source; + return WINED3D_MCS_MATERIAL; +} + /* The WNDCLASS-Name for the fake window which we use to retrieve the GL capabilities */ #define WINED3D_OPENGL_WINDOW_CLASS_NAME "WineD3D_OpenGL"

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_find_fbo_entry().
by Alexandre Julliard May 16, 2019

May 16, 2019

Module: wine Branch: master Commit: 0fdce94258c91b9eb85bb21de738f4380139fa23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fdce94258c91b9eb85bb21d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 16 17:52:59 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_find_fbo_entry(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 62927a3..38a4462 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -574,13 +574,12 @@ static void wined3d_context_gl_destroy_fbo_entry(struct wined3d_context_gl *cont } /* Context activation is done by the caller. */ -static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context, GLenum target, +static struct fbo_entry *wined3d_context_gl_find_fbo_entry(struct wined3d_context_gl *context_gl, GLenum target, const struct wined3d_rendertarget_info *render_targets, const struct wined3d_rendertarget_info *depth_stencil, DWORD color_location, DWORD ds_location) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); static const struct wined3d_rendertarget_info ds_null = {{0}}; - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_texture *rt_texture, *ds_texture; struct wined3d_fbo_entry_key fbo_key; unsigned int i, ds_level, rt_level; @@ -614,11 +613,11 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context, else if (depth_stencil->resource->type == WINED3D_RTYPE_TEXTURE_2D) { wined3d_texture_gl_set_compatible_renderbuffer(wined3d_texture_gl(ds_texture), - context, ds_level, &render_targets[0]); + &context_gl->c, ds_level, &render_targets[0]); } } - context_generate_fbo_key(context, &fbo_key, render_targets, depth_stencil, color_location, ds_location); + context_generate_fbo_key(&context_gl->c, &fbo_key, render_targets, depth_stencil, color_location, ds_location); if (TRACE_ON(d3d)) { @@ -676,29 +675,29 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context, } } - LIST_FOR_EACH_ENTRY(entry, &context->fbo_list, struct fbo_entry, entry) + LIST_FOR_EACH_ENTRY(entry, &context_gl->c.fbo_list, struct fbo_entry, entry) { if (memcmp(&fbo_key, &entry->key, sizeof(fbo_key))) continue; list_remove(&entry->entry); - list_add_head(&context->fbo_list, &entry->entry); + list_add_head(&context_gl->c.fbo_list, &entry->entry); return entry; } - if (context->fbo_entry_count < WINED3D_MAX_FBO_ENTRIES) + if (context_gl->c.fbo_entry_count < WINED3D_MAX_FBO_ENTRIES) { - entry = context_create_fbo_entry(context, render_targets, depth_stencil, color_location, ds_location); - list_add_head(&context->fbo_list, &entry->entry); - ++context->fbo_entry_count; + entry = context_create_fbo_entry(&context_gl->c, render_targets, depth_stencil, color_location, ds_location); + list_add_head(&context_gl->c.fbo_list, &entry->entry); + ++context_gl->c.fbo_entry_count; } else { - entry = LIST_ENTRY(list_tail(&context->fbo_list), struct fbo_entry, entry); + entry = LIST_ENTRY(list_tail(&context_gl->c.fbo_list), struct fbo_entry, entry); wined3d_context_gl_reuse_fbo_entry(context_gl, target, render_targets, depth_stencil, color_location, ds_location, entry); list_remove(&entry->entry); - list_add_head(&context->fbo_list, &entry->entry); + list_add_head(&context_gl->c.fbo_list, &entry->entry); } return entry; @@ -783,7 +782,7 @@ static void context_apply_fbo_state(struct wined3d_context *context, GLenum targ } else { - context->current_fbo = context_find_fbo_entry(context, target, + context->current_fbo = wined3d_context_gl_find_fbo_entry(context_gl, target, render_targets, depth_stencil, color_location, ds_location); context_apply_fbo_entry(context, target, context->current_fbo); }

1 0

Alexandre Julliard : makefiles: Remove the check for msvcr* imports.
by Alexandre Julliard May 16, 2019

May 16, 2019

Module: wine Branch: master Commit: c959a18cad150e674852e6b29bd1928dc5656a33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c959a18cad150e674852e6b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 14:57:24 2019 +0200 makefiles: Remove the check for msvcr* imports. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 97017d7..24def39 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2202,7 +2202,7 @@ static struct strarray get_default_imports( const struct makefile *make ) struct strarray ret = empty_strarray; if (strarray_exists( &make->extradllflags, "-nodefaultlibs" )) return ret; - if (strarray_exists( &make->extradllflags, "-mno-cygwin" )) strarray_add( &ret, "msvcrt" ); + if (make->use_msvcrt) strarray_add( &ret, "msvcrt" ); strarray_add( &ret, "winecrt0" ); if (make->is_win16) strarray_add( &ret, "kernel" ); strarray_add( &ret, "kernel32" ); @@ -4119,10 +4119,6 @@ static void load_sources( struct makefile *make ) make->is_exe = strarray_exists( &make->extradllflags, "-mconsole" ) || strarray_exists( &make->extradllflags, "-mwindows" ); - for (i = 0; i < make->imports.count && !make->use_msvcrt; i++) - make->use_msvcrt = !strncmp( make->imports.str[i], "msvcr", 5 ) || - !strcmp( make->imports.str[i], "ucrtbase" ); - if (make->module && !make->install_lib.count && !make->install_dev.count) { if (make->importlib) strarray_add( &make->install_dev, make->importlib ); @@ -4171,18 +4167,13 @@ static void load_sources( struct makefile *make ) LIST_FOR_EACH_ENTRY( file, &make->sources, struct incl_file, entry ) get_dependencies( file, file ); if (crosstarget && !make->is_win16 && !strarray_exists( &make->imports, "kernel" )) - { - make->is_cross = (make->testdll || - strarray_exists( &make->extradllflags, "-mno-cygwin" ) || - !has_object_file( make )); - } + make->is_cross = (make->testdll || make->use_msvcrt || !has_object_file( make )); if (make->is_cross) { for (i = 0; i < make->imports.count; i++) strarray_add_uniq( &cross_import_libs, make->imports.str[i] ); - if (strarray_exists( &make->extradllflags, "-mno-cygwin" )) - strarray_add_uniq( &cross_import_libs, "msvcrt" ); + if (make->use_msvcrt) strarray_add_uniq( &cross_import_libs, "msvcrt" ); strarray_add_uniq( &cross_import_libs, "winecrt0" ); strarray_add_uniq( &cross_import_libs, "kernel32" ); strarray_add_uniq( &cross_import_libs, "ntdll" );

1 0

Alexandre Julliard : msvcirt: Use the standard -mno-cygwin build flag.
by Alexandre Julliard May 16, 2019

May 16, 2019

Module: wine Branch: master Commit: 0598c706082893b8e05e002ce9fda1a36736f76e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0598c706082893b8e05e002c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 14:54:25 2019 +0200 msvcirt: Use the standard -mno-cygwin build flag. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/Makefile.in | 3 ++- dlls/msvcirt/msvcirt.c | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/Makefile.in b/dlls/msvcirt/Makefile.in index acaf495..65be072 100644 --- a/dlls/msvcirt/Makefile.in +++ b/dlls/msvcirt/Makefile.in @@ -1,8 +1,9 @@ MODULE = msvcirt.dll -IMPORTS = msvcrt EXTRADEFS = -D_MSVCIRT PARENTSRC = ../msvcp90 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ exception.c \ msvcirt.c diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index fa0bbb5..797b0b1 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -17,7 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <errno.h> #include <fcntl.h>

1 0

Alexandre Julliard : msvcp70: Use the standard -mno-cygwin build flag.
by Alexandre Julliard May 16, 2019

May 16, 2019

Module: wine Branch: master Commit: eaff3d9da650a11ef1e288c78a777ad4da6bd6b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eaff3d9da650a11ef1e288c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 14:52:44 2019 +0200 msvcp70: Use the standard -mno-cygwin build flag. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp70/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msvcp70/Makefile.in b/dlls/msvcp70/Makefile.in index 36ba70b..a023d1b 100644 --- a/dlls/msvcp70/Makefile.in +++ b/dlls/msvcp70/Makefile.in @@ -3,6 +3,8 @@ IMPORTS = msvcr70 EXTRADEFS = -D_MSVCP_VER=70 PARENTSRC = ../msvcp90 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ exception.c \ ios.c \

1 0