aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristoph Scholtes2011-11-05 16:55:08 -0600
committerChristoph Scholtes2011-11-05 16:55:08 -0600
commit1f05cd82d2e3c79ecede95aef578d1f395549b22 (patch)
tree03d378bc4765fcc33730abeda454a5ed7b154b06 /src
parentc4c32b976a2b7b4e84c56fa2fff06e255b016372 (diff)
downloademacs-1f05cd82d2e3c79ecede95aef578d1f395549b22.tar.gz
emacs-1f05cd82d2e3c79ecede95aef578d1f395549b22.zip
* src/makefile.w32-in ($(TEMACS), (gl-stamp)): Use $(THISDIR) to
support MSVC.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/makefile.w32-in4
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index c14eb42983e..eaa94529bdf 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12011-11-05 Christoph Scholtes <cschol2112@googlemail.com>
2
3 * makefile.w32-in ($(TEMACS), (gl-stamp)): Use $(THISDIR) to
4 support MSVC.
5
12011-11-05 Jason Rumney <jasonr@gnu.org> 62011-11-05 Jason Rumney <jasonr@gnu.org>
2 7
3 * w32font.c (font_matches_spec): Filter out non-Japanese kana fonts. 8 * w32font.c (font_matches_spec): Filter out non-Japanese kana fonts.
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index bee857694e2..e97f7f3aca4 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -177,7 +177,7 @@ temacs: stamp_BLD $(TEMACS)
177$(TEMACS): $(TLIB0) $(TLIB1) $(TLIB2) $(TLASTLIB) $(TOBJ) $(TRES) \ 177$(TEMACS): $(TLIB0) $(TLIB1) $(TLIB2) $(TLASTLIB) $(TOBJ) $(TRES) \
178 ../nt/$(BLD)/addsection.exe $(GNULIB) 178 ../nt/$(BLD)/addsection.exe $(GNULIB)
179 $(LINK) $(LINK_OUT)$(TEMACS_TMP) $(FULL_LINK_FLAGS) $(TOBJ) $(TRES) $(LIBS) 179 $(LINK) $(LINK_OUT)$(TEMACS_TMP) $(FULL_LINK_FLAGS) $(TOBJ) $(TRES) $(LIBS)
180 "../nt/$(BLD)/addsection" "$(TEMACS_TMP)" "$(TEMACS)" EMHEAP 21 180 "$(THISDIR)/../nt/$(BLD)/addsection" "$(TEMACS_TMP)" "$(TEMACS)" EMHEAP 21
181 181
182# These omit firstfile.${O}, but there's no documentation in there 182# These omit firstfile.${O}, but there's no documentation in there
183# anyways. 183# anyways.
@@ -232,7 +232,7 @@ globals.h: gl-stamp
232 232
233gl-stamp: ../lib-src/$(BLD)/make-docfile.exe $(GLOBAL_SOURCES) 233gl-stamp: ../lib-src/$(BLD)/make-docfile.exe $(GLOBAL_SOURCES)
234 - $(DEL) gl-tmp 234 - $(DEL) gl-tmp
235 "../lib-src/$(BLD)/make-docfile" -d . -g $(SOME_MACHINE_OBJECTS) $(obj) > gl-tmp 235 "$(THISDIR)/../lib-src/$(BLD)/make-docfile" -d . -g $(SOME_MACHINE_OBJECTS) $(obj) > gl-tmp
236 cmd /c "fc /b gl-tmp globals.h >nul 2>&1 || $(CP) gl-tmp globals.h" 236 cmd /c "fc /b gl-tmp globals.h >nul 2>&1 || $(CP) gl-tmp globals.h"
237 - $(DEL) gl-tmp 237 - $(DEL) gl-tmp
238 echo timestamp > $@ 238 echo timestamp > $@