parent
e997c195b4
commit
df7bf6bd1d
1 changed files with 0 additions and 5 deletions
|
@ -43,13 +43,8 @@ index 774a95ce003..d408e77cc78 100755
|
||||||
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
diff --git a/configure.ac b/configure.ac
|
||||||
index 8c5066a3de6..01ede86df1e 100644
|
index 8c5066a3de6..01ede86df1e 100644
|
||||||
<<<<<<< HEAD
|
|
||||||
--- a/wine-7.6/configure.ac
|
|
||||||
+++ b/wine-7.6/configure.ac
|
|
||||||
=======
|
|
||||||
--- a/configure.ac
|
--- a/configure.ac
|
||||||
+++ b/configure.ac
|
+++ b/configure.ac
|
||||||
>>>>>>> 6dccb4ef9c (wine: patch into $build_wrksrc)
|
|
||||||
@@ -916,6 +916,9 @@ case $host_os in
|
@@ -916,6 +916,9 @@ case $host_os in
|
||||||
AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so.$libwine_version")
|
AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so.$libwine_version")
|
||||||
AC_SUBST(LIBWINE_DEPENDS,"wine.map")
|
AC_SUBST(LIBWINE_DEPENDS,"wine.map")
|
||||||
|
|
Loading…
Add table
Reference in a new issue