procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lib/makefile.w32-in (PRAGMA_SYSTEM_HEADER): Move to platform

Browse source 
specific makefiles to support getopt_.h generation with MSVC.

* nt/gmake.defs (PRAGMA_SYSTEM_HEADER): Add for GCC.

* nt/nmake.defs (PRAGMA_SYSTEM_HEADER): Add, but ignore with MSVC.
This commit is contained in:
Christoph Scholtes 2012-02-05 13:40:36 -07:00
parent d452256dd8
commit 7519763363
5 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2012-02-05 Christoph Scholtes <cschol2112@googlemail.com>
* lib/makefile.w32-in (PRAGMA_SYSTEM_HEADER): Move to platform
specific makefiles to support getopt_.h generation with MSVC.
2012-02-04 Glenn Morris <rgm@gnu.org>
* Makefile.in (uninstall):

1
lib/makefile.w32-in
View file

@ -213,7 +213,6 @@ getopt_.h-SH: doit
HAVE_GETOPT_H = HAVE_GETOPT_H
INCLUDE_NEXT = include_next
PRAGMA_SYSTEM_HEADER = \#pragma GCC system_header
PRAGMA_COLUMNS =
NEXT_GETOPT_H = <getopt.h>
ARG_NONNULL_H = ../build-aux/snippet/arg-nonnull.h

4
nt/ChangeLog
View file

@ -1,5 +1,9 @@
2012-02-05 Christoph Scholtes <cschol2112@googlemail.com>
* gmake.defs (PRAGMA_SYSTEM_HEADER): Add for GCC.
* nmake.defs (PRAGMA_SYSTEM_HEADER): Add, but ignore with MSVC.
* makefile.w32-in (maybe-copy-distfiles)
(maybe-copy-distfiles-CMD, maybe-copy-distfiles-SH)
(create-tmp-dist-dir): Added to make --distfiles optional.

2
nt/gmake.defs
View file

@ -289,6 +289,8 @@ ifdef USER_LIBS
USER_LIBS := $(patsubst %,-l%,$(USER_LIBS))
endif
PRAGMA_SYSTEM_HEADER = \#pragma GCC system_header
ifeq "$(ARCH)" "i386"
ifdef NOOPT
ARCH_CFLAGS = -c $(DEBUG_FLAG) $(NOCYGWIN)

3
nt/nmake.defs
View file

@ -203,6 +203,9 @@ DEBUG_LINK = -debug
D = d
!endif
# gcc-specific pragma (ignore for MSVC)
PRAGMA_SYSTEM_HEADER =
!if "$(ARCH)" == "i386"
!ifdef NOOPT
#ARCH_CFLAGS = -nologo -c -Zel -W2 -H63 -Od -G3d -Zp8 $(DEBUG_FLAG)