Alexandre Julliard : configure: Create a few symlinks needed for running in Wow64 mode inside the build tree .

Alexandre Julliard julliard at winehq.org
Tue Mar 30 10:39:43 CDT 2010


Module: wine
Branch: master
Commit: e5c585e4a4d2162f4c45a0e6f909bf8524e2610c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e5c585e4a4d2162f4c45a0e6f909bf8524e2610c

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Mar 29 17:54:55 2010 +0200

configure: Create a few symlinks needed for running in Wow64 mode inside the build tree.

---

 configure    |   12 ++++++++++++
 configure.ac |   13 +++++++++++++
 2 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/configure b/configure
index b02fe65..f133705 100755
--- a/configure
+++ b/configure
@@ -14713,6 +14713,18 @@ ac_config_commands="$ac_config_commands Makefile"
 ac_config_files="$ac_config_files Make.tmp:Makefile.in"
 
 
+
+if test -n "$with_wine64"
+then
+wine_fn_append_rule ALL_MAKEFILE_DEPENDS "all: fonts server $with_wine64/loader/wine32
+fonts server:
+	\$(RM) \$@ && \$(LN_S) $with_wine64/\$@ \$@
+$with_wine64/loader/wine32:
+	\$(RM) \$@ && \$(LN_S) $ac_pwd/loader/wine32 \$@
+clean::
+	\$(RM) fonts server $with_wine64/loader/wine32"
+fi
+
 wine_fn_append_rule ALL_MAKEFILE_DEPENDS "uninstall::
 	-rmdir \$(DESTDIR)\$(datadir)/wine \$(DESTDIR)\$(fakedlldir) \$(DESTDIR)\$(dlldir)"
 
diff --git a/configure.ac b/configure.ac
index 25a1313..349a25a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2713,6 +2713,19 @@ _WINE_EOF
 AC_CONFIG_FILES([Make.tmp:Makefile.in])
 
 dnl Some final makefile rules
+
+if test -n "$with_wine64"
+then
+WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS],
+[all: fonts server $with_wine64/loader/wine32
+fonts server:
+	\$(RM) \$[@] && \$(LN_S) $with_wine64/\$[@] \$[@]
+$with_wine64/loader/wine32:
+	\$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine32 \$[@]
+clean::
+	\$(RM) fonts server $with_wine64/loader/wine32])
+fi
+
 WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS],
 [uninstall::
 	-rmdir \$(DESTDIR)\$(datadir)/wine \$(DESTDIR)\$(fakedlldir) \$(DESTDIR)\$(dlldir)])




More information about the wine-cvs mailing list