wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Avoid duplicate wined3d specfile by adding PARENTSPEC Makefile argument.

Browse Source
This commit is contained in:
Sebastian Lackner
2014-12-17 04:27:10 +01:00
parent f3e96bb902
commit 12af26a582
5 changed files with 75 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
patches/makedep-PARENTSPEC/0001-makedep-Add-support-for-PARENTSPEC-Makefile-variable.patch Normal file
View File

@@ -0,0 +1,47 @@
From 0ca9f8bf78340991e99d8f020c5f04d2029a4177 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Wed, 17 Dec 2014 04:11:58 +0100
Subject: makedep: Add support for PARENTSPEC Makefile variable.
---
tools/makedep.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/tools/makedep.c b/tools/makedep.c
index 54aab45..d68bc03 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -161,6 +161,7 @@ struct makefile
const char *top_src_dir;
const char *top_obj_dir;
const char *parent_dir;
+ const char *parent_spec;
const char *module;
const char *testdll;
const char *staticlib;
@@ -2081,7 +2082,13 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t
char *spec_file = NULL;
if (!make->appmode.count)
- spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" ));
+ {
+ if (!make->parent_spec)
+ spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" ));
+ else
+ spec_file = src_dir_path( make, make->parent_spec );
+ }
+
for (i = 0; i < make->delayimports.count; i++)
strarray_add( &all_libs, strmake( "-l%s", make->delayimports.str[i] ));
for (i = 0; i < make->imports.count; i++)
@@ -2597,6 +2604,7 @@ static void update_makefile( const char *path )
strarray_set_value( &make->vars, "srcdir", src_dir_path( make, "" ));
make->parent_dir = get_expanded_make_variable( make, "PARENTSRC" );
+ make->parent_spec = get_expanded_make_variable( make, "PARENTSPEC" );
make->module = get_expanded_make_variable( make, "MODULE" );
make->testdll = get_expanded_make_variable( make, "TESTDLL" );
make->staticlib = get_expanded_make_variable( make, "STATICLIB" );
--
2.1.3