Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
1f05cd82
Commit
1f05cd82
authored
Nov 05, 2011
by
Christoph Scholtes
Browse files
* src/makefile.w32-in ($(TEMACS), (gl-stamp)): Use $(THISDIR) to
support MSVC.
parent
c4c32b97
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
src/ChangeLog
src/ChangeLog
+5
-0
src/makefile.w32-in
src/makefile.w32-in
+2
-2
No files found.
src/ChangeLog
View file @
1f05cd82
2011-11-05 Christoph Scholtes <cschol2112@googlemail.com>
* makefile.w32-in ($(TEMACS), (gl-stamp)): Use $(THISDIR) to
support MSVC.
2011-11-05 Jason Rumney <jasonr@gnu.org>
* w32font.c (font_matches_spec): Filter out non-Japanese kana fonts.
...
...
src/makefile.w32-in
View file @
1f05cd82
...
...
@@ -177,7 +177,7 @@ temacs: stamp_BLD $(TEMACS)
$(TEMACS)
:
$(TLIB0) $(TLIB1) $(TLIB2) $(TLASTLIB) $(TOBJ) $(TRES)
\
../nt/$(BLD)/addsection.exe $(GNULIB)
$(LINK)
$(LINK_OUT)$(TEMACS_TMP)
$(FULL_LINK_FLAGS)
$(TOBJ)
$(TRES)
$(LIBS)
"../nt/
$(BLD)
/addsection"
"
$(TEMACS_TMP)
"
"
$(TEMACS)
"
EMHEAP 21
"
$(THISDIR)
/
../nt/
$(BLD)
/addsection"
"
$(TEMACS_TMP)
"
"
$(TEMACS)
"
EMHEAP 21
# These omit firstfile.${O}, but there's no documentation in there
# anyways.
...
...
@@ -232,7 +232,7 @@ globals.h: gl-stamp
gl-stamp
:
../lib-src/$(BLD)/make-docfile.exe $(GLOBAL_SOURCES)
-
$(DEL)
gl-tmp
"../lib-src/
$(BLD)
/make-docfile"
-d
.
-g
$(SOME_MACHINE_OBJECTS)
$(obj)
>
gl-tmp
"
$(THISDIR)
/
../lib-src/
$(BLD)
/make-docfile"
-d
.
-g
$(SOME_MACHINE_OBJECTS)
$(obj)
>
gl-tmp
cmd /c
"fc /b gl-tmp globals.h >nul 2>&1 ||
$(CP)
gl-tmp globals.h"
-
$(DEL)
gl-tmp
echo
timestamp
>
$@
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment