November 2015 - Wine-commits

Józef Kucia : d3d11: Implement d3d11_immediate_context_VSGetShaderResources().
by Alexandre Julliard 12 Nov '15

12 Nov '15

Module: wine Branch: master Commit: a6aabcbc3718c6aafab31a545280d63ed59883cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6aabcbc3718c6aafab31a545… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 11 03:40:56 2015 +0100 d3d11: Implement d3d11_immediate_context_VSGetShaderResources(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 9261ce8..b86c6c7 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1203,7 +1203,28 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_IAGetPrimitiveTopology(ID3 static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetShaderResources(ID3D11DeviceContext *iface, UINT start_slot, UINT view_count, ID3D11ShaderResourceView **views) { - FIXME("iface %p, start_slot %u, view_count %u, views %p stub!\n", iface, start_slot, view_count, views); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", iface, start_slot, view_count, views); + + wined3d_mutex_lock(); + for (i = 0; i < view_count; ++i) + { + struct wined3d_shader_resource_view *wined3d_view; + struct d3d_shader_resource_view *view_impl; + + if (!(wined3d_view = wined3d_device_get_vs_resource_view(device->wined3d_device, start_slot + i))) + { + views[i] = NULL; + continue; + } + + view_impl = wined3d_shader_resource_view_get_parent(wined3d_view); + views[i] = &view_impl->ID3D11ShaderResourceView_iface; + ID3D11ShaderResourceView_AddRef(views[i]); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetSamplers(ID3D11DeviceContext *iface,

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_PSGetShaderResources().
by Alexandre Julliard 12 Nov '15

12 Nov '15

Module: wine Branch: master Commit: fe4ba036f683662c226f06827b19e60303a66cae URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe4ba036f683662c226f06827… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 11 03:40:57 2015 +0100 d3d11: Implement d3d11_immediate_context_PSGetShaderResources(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index b86c6c7..2e086f8 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1024,8 +1024,29 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetConstantBuffers(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetShaderResources(ID3D11DeviceContext *iface, UINT start_slot, UINT view_count, ID3D11ShaderResourceView **views) { - FIXME("iface %p, start_slot %u, view_count %u, views %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", iface, start_slot, view_count, views); + + wined3d_mutex_lock(); + for (i = 0; i < view_count; ++i) + { + struct wined3d_shader_resource_view *wined3d_view; + struct d3d_shader_resource_view *view_impl; + + if (!(wined3d_view = wined3d_device_get_ps_resource_view(device->wined3d_device, start_slot + i))) + { + views[i] = NULL; + continue; + } + + view_impl = wined3d_shader_resource_view_get_parent(wined3d_view); + views[i] = &view_impl->ID3D11ShaderResourceView_iface; + ID3D11ShaderResourceView_AddRef(views[i]); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetShader(ID3D11DeviceContext *iface,

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_PSGetShader().
by Alexandre Julliard 12 Nov '15

12 Nov '15

Module: wine Branch: master Commit: 8f212a21ed1f3f354bdd8d02c09e5e56d38cf8bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f212a21ed1f3f354bdd8d02c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 11 03:40:58 2015 +0100 d3d11: Implement d3d11_immediate_context_PSGetShader(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 2e086f8..7127a23 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1052,8 +1052,28 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetShaderResources(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetShader(ID3D11DeviceContext *iface, ID3D11PixelShader **shader, ID3D11ClassInstance **class_instances, UINT *class_instance_count) { - FIXME("iface %p, shader %p, class_instances %p, class_instance_count %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct wined3d_shader *wined3d_shader; + struct d3d_pixel_shader *shader_impl; + + TRACE("iface %p, shader %p, class_instances %p, class_instance_count %p.\n", iface, shader, class_instances, class_instance_count); + + if (class_instances || class_instance_count) + FIXME("Dynamic linking not implemented yet.\n"); + + wined3d_mutex_lock(); + if (!(wined3d_shader = wined3d_device_get_pixel_shader(device->wined3d_device))) + { + wined3d_mutex_unlock(); + *shader = NULL; + return; + } + + shader_impl = wined3d_shader_get_parent(wined3d_shader); + wined3d_mutex_unlock(); + *shader = &shader_impl->ID3D11PixelShader_iface; + ID3D11PixelShader_AddRef(*shader); } static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetSamplers(ID3D11DeviceContext *iface,

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_PSGetConstantBuffers().
by Alexandre Julliard 12 Nov '15

12 Nov '15

Module: wine Branch: master Commit: cf2c41e873f18b1e473a67ef9bac93c67481822c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf2c41e873f18b1e473a67ef9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 11 03:40:59 2015 +0100 d3d11: Implement d3d11_immediate_context_PSGetConstantBuffers(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 7127a23..4a7b25c 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1134,8 +1134,29 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetShader(ID3D11DeviceCo static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetConstantBuffers(ID3D11DeviceContext *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer **buffers) { - FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", iface, start_slot, buffer_count, buffers); + + wined3d_mutex_lock(); + for (i = 0; i < buffer_count; ++i) + { + struct wined3d_buffer *wined3d_buffer; + struct d3d_buffer *buffer_impl; + + if (!(wined3d_buffer = wined3d_device_get_ps_cb(device->wined3d_device, start_slot + i))) + { + buffers[i] = NULL; + continue; + } + + buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); + buffers[i] = &buffer_impl->ID3D11Buffer_iface; + ID3D11Buffer_AddRef(buffers[i]); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_IAGetInputLayout(ID3D11DeviceContext *iface,

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_SOSetTargets().
by Alexandre Julliard 12 Nov '15

12 Nov '15

Module: wine Branch: master Commit: 4b281147e1c85f793a531514b33255b7f59873d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b281147e1c85f793a531514b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 11 03:41:00 2015 +0100 d3d11: Implement d3d11_immediate_context_SOSetTargets(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 4a7b25c..259d73b 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -645,7 +645,25 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetDepthStencilState(ID3 static void STDMETHODCALLTYPE d3d11_immediate_context_SOSetTargets(ID3D11DeviceContext *iface, UINT buffer_count, ID3D11Buffer *const *buffers, const UINT *offsets) { - FIXME("iface %p, buffer_count %u, buffers %p, offsets %p stub!\n", iface, buffer_count, buffers, offsets); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int count, i; + + TRACE("iface %p, buffer_count %u, buffers %p, offsets %p.\n", iface, buffer_count, buffers, offsets); + + count = min(buffer_count, D3D11_SO_BUFFER_SLOT_COUNT); + wined3d_mutex_lock(); + for (i = 0; i < count; ++i) + { + struct d3d_buffer *buffer = unsafe_impl_from_ID3D11Buffer(buffers[i]); + + wined3d_device_set_stream_output(device->wined3d_device, i, + buffer ? buffer->wined3d_buffer : NULL, offsets[i]); + } + for (; i < D3D11_SO_BUFFER_SLOT_COUNT; ++i) + { + wined3d_device_set_stream_output(device->wined3d_device, i, NULL, 0); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_DrawAuto(ID3D11DeviceContext *iface)

1 0

Józef Kucia : wined3d: Make offset parameter optional in wined3d_device_get_stream_output().
by Alexandre Julliard 12 Nov '15

12 Nov '15

Module: wine Branch: master Commit: 578601955c16725375147b05c85745e25e68a524 URL: http://source.winehq.org/git/wine.git/?a=commit;h=578601955c16725375147b05c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 11 03:41:01 2015 +0100 wined3d: Make offset parameter optional in wined3d_device_get_stream_output(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2960e08..170536d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1234,7 +1234,8 @@ struct wined3d_buffer * CDECL wined3d_device_get_stream_output(struct wined3d_de return NULL; } - *offset = device->state.stream_output[idx].offset; + if (offset) + *offset = device->state.stream_output[idx].offset; return device->state.stream_output[idx].buffer; }

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_SOGetTargets().
by Alexandre Julliard 12 Nov '15

12 Nov '15

Module: wine Branch: master Commit: efbd056e35e8a4fe01a7f338997d15c3464590ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=efbd056e35e8a4fe01a7f3389… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 11 03:41:02 2015 +0100 d3d11: Implement d3d11_immediate_context_SOGetTargets(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 259d73b..5683621 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1451,8 +1451,28 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetDepthStencilState(ID3 static void STDMETHODCALLTYPE d3d11_immediate_context_SOGetTargets(ID3D11DeviceContext *iface, UINT buffer_count, ID3D11Buffer **buffers) { - FIXME("iface %p, buffer_count %u, buffers %p stub!\n", iface, buffer_count, buffers); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, buffer_count %u, buffers %p.\n", iface, buffer_count, buffers); + + wined3d_mutex_lock(); + for (i = 0; i < buffer_count; ++i) + { + struct wined3d_buffer *wined3d_buffer; + struct d3d_buffer *buffer_impl; + if (!(wined3d_buffer = wined3d_device_get_stream_output(device->wined3d_device, i, NULL))) + { + buffers[i] = NULL; + continue; + } + + buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); + buffers[i] = &buffer_impl->ID3D11Buffer_iface; + ID3D11Buffer_AddRef(buffers[i]); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetState(ID3D11DeviceContext *iface,

1 0

Alexandre Julliard : makefiles: Group uninstall files in a single command.
by Alexandre Julliard 12 Nov '15

12 Nov '15

Module: wine Branch: master Commit: 1db55d441ea90808fd328c32732aa2ebc5e00110 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1db55d441ea90808fd328c327… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 12 22:43:02 2015 +0900 makefiles: Group uninstall files in a single command. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 79b2426..38f7999 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1901,14 +1901,15 @@ static const char *get_include_install_path( const char *name ) * Rules are stored as a (file,dest) pair of values. * The first char of dest indicates the type of install. */ -static void output_install_rules( const struct makefile *make, struct strarray files, - const char *target, struct strarray *phony_targets ) +static struct strarray output_install_rules( const struct makefile *make, struct strarray files, + const char *target, struct strarray *phony_targets ) { unsigned int i; char *install_sh; + struct strarray uninstall = empty_strarray; struct strarray targets = empty_strarray; - if (!files.count) return; + if (!files.count) return uninstall; for (i = 0; i < files.count; i += 2) if (strchr( "dps", files.str[i + 1][0] )) /* only for files copied from object dir */ @@ -1954,14 +1955,12 @@ static void output_install_rules( const struct makefile *make, struct strarray f } } - output( "uninstall::\n" ); - output( "\trm -f" ); - for (i = 0; i < files.count; i += 2) output_filename( strmake( "$(DESTDIR)%s", files.str[i + 1] + 1 )); - output( "\n" ); + for (i = 0; i < files.count; i += 2) + strarray_add( &uninstall, strmake( "$(DESTDIR)%s", files.str[i + 1] + 1 )); - strarray_add( phony_targets, "install" ); - strarray_add( phony_targets, target ); - strarray_add( phony_targets, "uninstall" ); + strarray_add_uniq( phony_targets, "install" ); + strarray_add_uniq( phony_targets, target ); + return uninstall; } @@ -1976,6 +1975,7 @@ static struct strarray output_sources( const struct makefile *make, struct strar struct strarray crossobj_files = empty_strarray; struct strarray res_files = empty_strarray; struct strarray clean_files = empty_strarray; + struct strarray uninstall_files = empty_strarray; struct strarray po_files = empty_strarray; struct strarray mo_files = empty_strarray; struct strarray mc_files = empty_strarray; @@ -2703,8 +2703,18 @@ static struct strarray output_sources( const struct makefile *make, struct strar output( "\n" ); } - output_install_rules( make, install_rules[INSTALL_LIB], "install-lib", &phony_targets ); - output_install_rules( make, install_rules[INSTALL_DEV], "install-dev", &phony_targets ); + strarray_addall( &uninstall_files, output_install_rules( make, install_rules[INSTALL_LIB], + "install-lib", &phony_targets )); + strarray_addall( &uninstall_files, output_install_rules( make, install_rules[INSTALL_DEV], + "install-dev", &phony_targets )); + if (uninstall_files.count) + { + output( "uninstall::\n" ); + output( "\trm -f" ); + output_filenames( uninstall_files ); + output( "\n" ); + strarray_add_uniq( &phony_targets, "uninstall" ); + } strarray_addall( &clean_files, object_files ); strarray_addall( &clean_files, crossobj_files );

1 0

Alexandre Julliard : makefiles: Generate rules for building libwine.
by Alexandre Julliard 12 Nov '15

12 Nov '15

Module: wine Branch: master Commit: 4c208c4664a7919f5804e300b0e70c9834bbaa35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c208c4664a7919f5804e300b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 12 22:08:03 2015 +0900 makefiles: Generate rules for building libwine. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 64 +++++++++++++++-------------------------------------- configure.ac | 64 +++++++++++++++-------------------------------------- tools/makedep.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 104 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c208c4664a7919f5804e…

1 0

Alexandre Julliard : makefiles: Generate rules for installing libwine.
by Alexandre Julliard 12 Nov '15

12 Nov '15

Module: wine Branch: master Commit: fd88ff95a4810602c9c13476f7a5178e587b1b3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd88ff95a4810602c9c13476f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 12 23:01:28 2015 +0900 makefiles: Generate rules for installing libwine. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 37 +++++++------------------------------ configure.ac | 37 +++++++------------------------------ tools/makedep.c | 4 ++++ 3 files changed, 18 insertions(+), 60 deletions(-) diff --git a/configure b/configure index 1e0d0a3..e83ca7b 100755 --- a/configure +++ b/configure @@ -7986,6 +7986,7 @@ fi LIBWINE_RULES=" SHAREDLIB = libwine.dll +INSTALL_LIB = libwine.dll libwine_LDFLAGS = -shared \$(srcdir)/wine.def EXTRA_TARGETS = libwine.a @@ -7997,14 +7998,11 @@ libwine.a: \$(srcdir)/wine.def libwine.dll: \$(srcdir)/wine.def -install install-lib:: libwine.dll - \$(INSTALL_DATA) libwine.dll \$(DESTDIR)\$(libdir)/libwine.dll - install install-dev:: libwine.a \$(INSTALL_DATA) libwine.a \$(DESTDIR)\$(libdir)/libwine.a uninstall:: - -cd \$(DESTDIR)\$(libdir) && \$(RM) libwine.a libwine.dll + \$(RM) \$(DESTDIR)\$(libdir)/libwine.a " ;; @@ -8244,17 +8242,9 @@ fi LIBWINE_RULES=" SHAREDLIB = libwine.$libwine_version.dylib +INSTALL_LIB = libwine.$libwine_version.dylib libwine.$libwine_soversion.dylib +INSTALL_DEV = libwine.dylib libwine_LDFLAGS = -dynamiclib -install_name @rpath/libwine.$libwine_soversion.dylib -Wl,-rpath,@loader_path/ -compatibility_version $libwine_soversion -current_version $libwine_version - -install install-lib:: libwine.$libwine_version.dylib - \$(INSTALL_PROGRAM) libwine.$libwine_version.dylib \$(DESTDIR)\$(libdir)/libwine.$libwine_version.dylib - cd \$(DESTDIR)\$(libdir) && \$(RM) libwine.$libwine_soversion.dylib && \$(LN_S) libwine.$libwine_version.dylib libwine.$libwine_soversion.dylib - -install install-dev:: - cd \$(DESTDIR)\$(libdir) && \$(RM) libwine.dylib && \$(LN_S) libwine.$libwine_version.dylib libwine.dylib - -uninstall:: - -cd \$(DESTDIR)\$(libdir) && \$(RM) libwine.dylib libwine.$libwine_soversion.dylib libwine.$libwine_version.dylib " @@ -8410,13 +8400,8 @@ fi LIBWINE_RULES=" SHAREDLIB = libwine.so +INSTALL_LIB = libwine.so libwine_LDFLAGS = -shared - -install install-lib:: libwine.so - \$(INSTALL_PROGRAM) libwine.so \$(DESTDIR)\$(libdir)/libwine.so - -uninstall:: - \$(RM) \$(DESTDIR)\$(libdir)/libwine.so " @@ -8779,19 +8764,11 @@ $as_echo "$ac_cv_c_dll_unixware" >&6; } fi LIBWINE_RULES=" SHAREDLIB = libwine.so.$libwine_version +INSTALL_LIB = libwine.so.$libwine_version libwine.so.$libwine_soversion +INSTALL_DEV = libwine.so libwine_LDFLAGS = $shared_ldflags libwine.so.$libwine_version: \$(srcdir)/wine.map - -install install-lib:: libwine.so.$libwine_version - \$(INSTALL_PROGRAM) libwine.so.$libwine_version \$(DESTDIR)\$(libdir)/libwine.so.$libwine_version - cd \$(DESTDIR)\$(libdir) && \$(RM) libwine.so.$libwine_soversion && \$(LN_S) libwine.so.$libwine_version libwine.so.$libwine_soversion - -install install-dev:: - cd \$(DESTDIR)\$(libdir) && \$(RM) libwine.so && \$(LN_S) libwine.so.$libwine_version libwine.so - -uninstall:: - -cd \$(DESTDIR)\$(libdir) && \$(RM) libwine.so libwine.so.$libwine_soversion libwine.so.$libwine_version " diff --git a/configure.ac b/configure.ac index 6779d30..372d06e 100644 --- a/configure.ac +++ b/configure.ac @@ -719,6 +719,7 @@ case $host_os in AC_SUBST(LIBWINE_RULES,[" SHAREDLIB = libwine.dll +INSTALL_LIB = libwine.dll libwine_LDFLAGS = -shared \$(srcdir)/wine.def EXTRA_TARGETS = libwine.a @@ -730,14 +731,11 @@ libwine.a: \$(srcdir)/wine.def libwine.dll: \$(srcdir)/wine.def -install install-lib:: libwine.dll - \$(INSTALL_DATA) libwine.dll \$(DESTDIR)\$(libdir)/libwine.dll - install install-dev:: libwine.a \$(INSTALL_DATA) libwine.a \$(DESTDIR)\$(libdir)/libwine.a uninstall:: - -cd \$(DESTDIR)\$(libdir) && \$(RM) libwine.a libwine.dll + \$(RM) \$(DESTDIR)\$(libdir)/libwine.a "]) ;; @@ -858,17 +856,9 @@ uninstall:: AC_SUBST(LIBWINE_RULES,[" SHAREDLIB = libwine.$libwine_version.dylib +INSTALL_LIB = libwine.$libwine_version.dylib libwine.$libwine_soversion.dylib +INSTALL_DEV = libwine.dylib libwine_LDFLAGS = -dynamiclib -install_name @rpath/libwine.$libwine_soversion.dylib -Wl,-rpath,@loader_path/ -compatibility_version $libwine_soversion -current_version $libwine_version - -install install-lib:: libwine.$libwine_version.dylib - \$(INSTALL_PROGRAM) libwine.$libwine_version.dylib \$(DESTDIR)\$(libdir)/libwine.$libwine_version.dylib - cd \$(DESTDIR)\$(libdir) && \$(RM) libwine.$libwine_soversion.dylib && \$(LN_S) libwine.$libwine_version.dylib libwine.$libwine_soversion.dylib - -install install-dev:: - cd \$(DESTDIR)\$(libdir) && \$(RM) libwine.dylib && \$(LN_S) libwine.$libwine_version.dylib libwine.dylib - -uninstall:: - -cd \$(DESTDIR)\$(libdir) && \$(RM) libwine.dylib libwine.$libwine_soversion.dylib libwine.$libwine_version.dylib "]) AS_VAR_APPEND([LOADER_RULES],[" @@ -903,13 +893,8 @@ $wine_binary $wine_binary-installed: wine_info.plist AC_SUBST(LIBWINE_RULES,[" SHAREDLIB = libwine.so +INSTALL_LIB = libwine.so libwine_LDFLAGS = -shared - -install install-lib:: libwine.so - \$(INSTALL_PROGRAM) libwine.so \$(DESTDIR)\$(libdir)/libwine.so - -uninstall:: - \$(RM) \$(DESTDIR)\$(libdir)/libwine.so "]) AS_VAR_APPEND([LOADER_RULES],[" @@ -978,19 +963,11 @@ ${wine_binary}_LDFLAGS = $LDEXECFLAGS -lwine \$(PTHREAD_LIBS) fi AC_SUBST(LIBWINE_RULES,[" SHAREDLIB = libwine.so.$libwine_version +INSTALL_LIB = libwine.so.$libwine_version libwine.so.$libwine_soversion +INSTALL_DEV = libwine.so libwine_LDFLAGS = $shared_ldflags libwine.so.$libwine_version: \$(srcdir)/wine.map - -install install-lib:: libwine.so.$libwine_version - \$(INSTALL_PROGRAM) libwine.so.$libwine_version \$(DESTDIR)\$(libdir)/libwine.so.$libwine_version - cd \$(DESTDIR)\$(libdir) && \$(RM) libwine.so.$libwine_soversion && \$(LN_S) libwine.so.$libwine_version libwine.so.$libwine_soversion - -install install-dev:: - cd \$(DESTDIR)\$(libdir) && \$(RM) libwine.so && \$(LN_S) libwine.so.$libwine_version libwine.so - -uninstall:: - -cd \$(DESTDIR)\$(libdir) && \$(RM) libwine.so libwine.so.$libwine_soversion libwine.so.$libwine_version "]) AS_VAR_APPEND([LOADER_RULES],[" diff --git a/tools/makedep.c b/tools/makedep.c index c73204c2..f037d6b 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2600,10 +2600,14 @@ static struct strarray output_sources( const struct makefile *make, struct strar output_filenames( all_libs ); output_filename( "$(LDFLAGS)" ); output( "\n" ); + add_install_rule( make, install_rules, make->sharedlib, make->sharedlib, + strmake( "p$(libdir)/%s", make->sharedlib )); for (i = 1; i < names.count; i++) { output( "%s: %s\n", obj_dir_path( make, names.str[i] ), obj_dir_path( make, names.str[i-1] )); output( "\trm -f $@ && $(LN_S) %s $@\n", names.str[i-1] ); + add_install_rule( make, install_rules, names.str[i], names.str[i-1], + strmake( "y$(libdir)/%s", names.str[i] )); } strarray_addall( &all_targets, names ); }

1 0