summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2016-08-06 08:01:03 -0700
committerKaz Kylheku <kaz@kylheku.com>2016-08-06 08:01:03 -0700
commit13de4bc708ed1a2cb05c21b43701925564a7daaf (patch)
treeffb93303810372cc46a461fbbfff39a79452ced8
parent7d5fc582b3d811662ca0ff45157f596db2f8dc1a (diff)
downloadtxr-13de4bc708ed1a2cb05c21b43701925564a7daaf.tar.gz
txr-13de4bc708ed1a2cb05c21b43701925564a7daaf.tar.bz2
txr-13de4bc708ed1a2cb05c21b43701925564a7daaf.zip
Fix multi-arch build issue for txr.res.
When building in a separate directory, we can't just symlink the win directory, because the txr.res output file is architecture dependent and cannot be shared between 32 and 64 bit builds. * Makefile (%.res): Convert .rc -> .res rule to use the top_srcdir pattern, so the prerequisite will be found without the aid of the win/ directory symlink. * configure: Do not create win -> $source_dir/win symlink in the build directory.
-rw-r--r--Makefile2
-rwxr-xr-xconfigure2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 8f907219..31d6294c 100644
--- a/Makefile
+++ b/Makefile
@@ -152,7 +152,7 @@ dbg/%-win.o: $(top_srcdir)%.c
opt/%-win.o: $(top_srcdir)%.c
$(call COMPILE_C_WITH_DEPS,-DCONFIG_WIN_MAIN=1 $(OPT_FLAGS))
-%.res: %.rc
+win/%.res: $(top_srcdir)win/%.rc
$(call WINDRES)
# The following pattern rule is used for test targets built by configure
diff --git a/configure b/configure
index b1f338a2..71941503 100755
--- a/configure
+++ b/configure
@@ -589,7 +589,7 @@ case "$top_srcdir" in
esac
if [ "$source_dir" != "." ] ; then
- for x in Makefile share tests win; do
+ for x in Makefile share tests; do
printf "Symlinking %s -> $source_dir/%s\n" $x $x
ln -sf "$source_dir/$x" .
done