1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-24 10:38:38 +00:00
Commit Graph

48 Commits

Author SHA1 Message Date
Eli Zaretskii
0652336413 Fix bug #11405 with MSVC build of emacsclientw.
lib-src/makefile.w32-in ($(BLD)/emacsclientw.exe): Use $(MWINDOWS)
 instead of a literal -mwindows, which is not supported by MSVC.
 nt/nmake.defs (MWINDOWS): Define as "-subsystem:windows -entry:mainCRTStartup".
 Suggested by Fabrice Popineau <fabrice.popineau@supelec.fr>.
 nt/gmake.defs (MWINDOWS): Define as "-mwindows".
2012-05-29 19:15:12 +03:00
Eli Zaretskii
e5a69fd00a Fix parallel "make install" on MS-Windows.
nt/makefile.w32-in (install-bin): Don't copy addpm.exe here.  Use
 $(DIRNAME)_same-dir.tst instead of same-dir.tst, to avoid stepping
 on other (parallel) Make job's toes.
 (install-other-dirs-nmake, install-other-dirs-gmake): Depend on `all'.
 (install-shortcuts): Depend on $(INSTALL_DIR)/bin.  Copy addpm.exe
 here.
 (maybe-copy-distfiles-CMD, maybe-copy-distfiles-SH, dist): Depend
 on create-tmp-dist-dir.
 nt/nmake.defs (DIRNAME): New variable.
 (IFNOTSAMEDIR): Use $(DIRNAME)_same-dir.tst instead of
 same-dir.tst.
 nt/gmake.defs (DIRNAME): New variable.
 (IFNOTSAMEDIR): Use $(DIRNAME)_same-dir.tst instead of
 same-dir.tst, to avoid conflicts between several (parallel) Make
 jobs.
 lisp/makefile.w32-in (install): Use $(DIRNAME)_same-dir.tst instead
 of same-dir.tst, to avoid stepping on other (parallel) Make job's
 toes.
 leim/makefile.w32-in (install): Use $(DIRNAME)_same-dir.tst instead
 of same-dir.tst, to avoid stepping on other (parallel) Make job's
 toes.
2012-03-25 20:17:46 +02:00
Christoph Scholtes
7519763363 * lib/makefile.w32-in (PRAGMA_SYSTEM_HEADER): Move to platform
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.
2012-02-05 13:40:36 -07:00
Glenn Morris
acaf905b11 Add 2012 to FSF copyright years for Emacs files 2012-01-05 01:46:05 -08:00
Eli Zaretskii
a6fc3b5c53 Support MSVC build with newer versions of Visual Studio.
Small portions of the changes by Fabrice Popineau <fabrice.popineau@supelec.fr>.

 src/makefile.w32-in (TAGS-gmake): Don't use $(patsubst ...), as
 Nmake barfs on that.  Use $(OBJ*_c) variables instead, defined on
 nt/gmake.defs.
 src/lisp.h (ENUM_BF): New macro, for enumerated types in bitfields,
 which are not supported by MSVC.
 (Lisp_Symbol, Lisp_Misc_Any, Lisp_Marker, Lisp_Misc_Overlay)
 (Lisp_Save_Value, Lisp_Free): Use ENUM_BF for enumerated types in
 bitfields.
 (Lisp_Object) [USE_LISP_UNION_TYPE]: Use ENUM_BF for enumerated
 types in bitfields.
 (DEFUN) [_MSC_VER]: Define in a different way for MSVC.
 src/w32fns.c [_MSC_VER]: DECLARE_HANDLE for any MSVC version.
 src/w32.c: Don't include w32api.h for MSVC.
 (init_environment) [_MSC_VER]: Call sys_access, not _access.
 src/s/ms-w32.h <sigset_t, ssize_t> [_MSC_VER]: Typedefs for MSVC.
 [_MSC_VER]: Include sys/timeb.h, sys/stat.h, and signal.h.
 (fstat, stat, utime) [_MSC_VER]: Redirect to their sys_* cousins.
 (malloc, free, realloc, calloc) [_MSC_VER]: Always redirect to the
 e_* cousins.
 (alloca) [_MSC_VER]: Define to _alloca.
 src/lisp.h (DECL_ALIGN) [_MSC_VER]: Define for MSVC.
 src/regex.c <re_char> [_MSC_VER]: A separate definition for MSVC.
 nt/makefile.w32-in (clean-other-dirs-nmake)
 (distclean-other-dirs-nmake, maintainer-clean-other-dirs-nmake):
 Update for current structure of doc/ subdirectories.
 nt/gmake.defs (OBJ0_c, OBJ1_c, OBJ2_c): New variables.
 nt/INSTALL: Update for newer versions of MSVC.
 lib/makefile.w32-in (FRC): New dummy target.
 (TAGS): Depend on FRC.

Fixes: debbugs:9960
2011-11-05 13:34:56 +02:00
Ben Key
4d3fcc8e60 * nt/configure.bat: Renamed the fusercflags variable to escusercflags
so that the variable name better matches its purpose, to be identical
to usercflags with the exception that all quotes are escaped by the \
character.

Renamed the fuserldflags variable to escuserldflags so that the
variable name better matches its purpose, to be identical to
userldflags with the exception that all quotes are escaped by the \
character.

A new ESC_USER_CFLAGS variable is written to config.settings.  This
variable has the same value as the escusercflags variable.

* nt/gmake.defs, nt/nmake.defs: Added the variable ESC_CFLAGS.  This
variable is identical to the CFLAGS variable except that it includes
the new ESC_USER_CFLAGS variable instead of USER_CFLAGS.

* src/makefile.w32-in: The bootstrap-temacs rule now makes use of one
of two shell specific rules, either bootstrap-temacs-CMD or
bootstrap-temacs-SH.  The bootstrap-temacs-SH rule is identical to the
previous implementation of the bootstrap-temacs rule.  The
bootstrap-temacs-CMD rule is similar to the previous implementation of
the bootstrap-temacs rule except that it makes use of the ESC_CFLAGS
variable instead of the CFLAGS variable.


These changes are required to extend my earlier fix to add support for
--cflags and --ldflags options that include quotes so that it works
whether make uses cmd or sh as the shell.
2011-05-06 23:00:12 -05:00
Glenn Morris
73b0cd5003 Convert consecutive FSF copyright years to ranges. 2011-01-24 20:08:28 -08:00
Glenn Morris
0d9f702fd0 Nuke arch-tags. 2011-01-15 15:16:57 -08:00
Stefan Monnier
77ab81d054 Merge from emacs-23 2011-01-14 12:18:41 -05:00
Glenn Morris
5df4f04cd3 Add 2011 to FSF/AIST copyright years. 2011-01-02 15:50:46 -08:00
Juanma Barranquero
7d0170c8c7 * configure.bat: New option --enable-checking.
* gmake.defs, nmake.defs (CHECKING_CFLAGS): New define.
  (CFLAGS): Include it.
2010-07-18 11:41:48 +02:00
Glenn Morris
114f9c9679 Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
Jason Rumney
f4c45b4fb6 (UUID): New library for COM/OLE lookups. 2009-01-15 15:18:43 +00:00
Glenn Morris
f5d0ac07d6 Add 2009 to copyright years. 2009-01-08 03:38:51 +00:00
Juanma Barranquero
43db14bbd8 Remove unneeded -Defines in the compiler command line (MinGW and MSVC).
* nt/nmake.defs:
* nt/gmake.defs (FONT_CFLAGS): Remove.
(EMACS_EXTRA_C_FLAGS): Don't include FONT_CFLAGS.
(CFLAGS): Don't include WIN32_LEAN_AND_MEAN, _WIN32_WINNT, -D$(ARCH)
and _CRTAPI1.
(ARCH_FLAGS): Don't include _X86_.

* nt/config.nt (_WIN32_WINNT, WIN32_LEAN_AND_MEAN): Define.

* src/makefile.w32-in (LOCAL_FLAGS):
Don't include WINDOWSNT, DOS_NT and _UCHAR_T.

* src/sysdep.c (_spawnlp, _getpid):
Declare with explicit _cdecl instead of _CRTAPI1.

* src/editfns.c (Fget_internal_run_time):
Check for WINDOWSNT with #ifdef, not #if.
2008-06-26 22:33:33 +00:00
Glenn Morris
eef0be9e86 Switch to recommended form of GPLv3 permissions notice. 2008-05-09 05:14:16 +00:00
Jason Rumney
b7612703dc (UNISCRIBE): New variable. 2008-04-03 12:24:31 +00:00
Jason Rumney
12cc4d8f41 (FONT_CFLAGS): New optional compiler flag.
(EMACS_EXTRA_C_FLAGS): Include it.
2008-03-04 18:00:52 +00:00
Glenn Morris
6d344054d1 Add 2008 to copyright years. 2008-01-07 08:15:16 +00:00
Jason Rumney
fc2554aaaf (COMCTL32): New system library. 2007-09-27 22:07:47 +00:00
Glenn Morris
4a9f99bdfb Switch license to GPLv3 or later. 2007-07-25 05:08:27 +00:00
Jason Rumney
a71f59c1fa (OLE32): New library to link. 2007-07-11 14:41:22 +00:00
Glenn Morris
4e6835dbc4 Add 2007 to copyright years. 2007-01-21 04:57:37 +00:00
Jason Rumney
53b9fd7735 (TEMACS_EXTRA_LINK): Remove duplicated flags from DEBUG_LINK.
(DEBUG_LINK): Remove -debugtype:both
2006-12-29 16:47:44 +00:00
Eli Zaretskii
596cbf7ea9 (stamp_BLD): Rename from $(BLD). Create a file stamp_BLD after creating
the $(BLD) directory.
2006-12-22 18:22:37 +00:00
Thien-Thi Nguyen
ceb4c4d303 Update years in copyright notice; nfc. 2006-02-06 12:31:40 +00:00
Thien-Thi Nguyen
b65d8176e6 Update years in copyright notice; nfc. 2005-08-10 15:40:54 +00:00
Lute Kamstra
364c38d3af Update FSF's address. 2005-07-04 15:47:28 +00:00
Juanma Barranquero
33d786f9ee Add quote in comment to resync font-locking. 2004-06-06 01:22:53 +00:00
Jason Rumney
238add5e58 Remove files related to old msvc only windows build. 2004-05-03 14:19:40 +00:00
Juanma Barranquero
bd6766d34d Add "-*- makefile -*-" mode tag. 2004-04-23 00:24:35 +00:00
Jason Rumney
0e664bca59 gmake.defs, nmake.defs: Add linking to ``winspool.lib''. 2004-01-28 23:20:02 +00:00
Miles Bader
a2fcf0296f Fix some DOS line-ending inconsistencies introduced with arch-tag: 2003-09-02 19:14:00 +00:00
Miles Bader
ab5796a9f9 Add arch taglines 2003-09-01 15:45:59 +00:00
Juanma Barranquero
177c0ea743 Trailing whitespace deleted. 2003-02-04 14:56:31 +00:00
Ben Key
f60ae425e9 Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME. 2002-11-17 22:35:26 +00:00
Andrew Innes
98cf1bb563 (CFLAGS): Define _WIN32_WINNT as 0x0400, in order to
pick up relevant bits of the Windows API definitions.
2002-01-04 14:05:10 +00:00
Jason Rumney
635330084d (SYS_LDFLAGS): Add setargv.obj for wildcard
expansion.  From Juanma Barranquero <lektu@terra.es>.
2001-11-17 01:00:48 +00:00
Andrew Innes
039f725c72 (EMACSLOADPATH): Ensure EMACSLOADPATH is defined in
the environment.
2001-04-18 14:07:15 +00:00
Andrew Innes
0f6465a643 (DEBUG_LINK): New macro.
(LINK_FLAGS): Use it.
2001-03-18 16:56:08 +00:00
Andrew Innes
41eca17b1d Add copyright notice. 2001-02-24 22:00:47 +00:00
Andrew Innes
277277b7eb (THISDIR): New definition. 2001-02-05 16:55:05 +00:00
Andrew Innes
6da21b33f5 (EMACS_ICON_PATH): Delete definition.
(COMPILER_TEMP_FILES): New definition.
(MAKETYPE): New definition.
2001-01-06 21:18:05 +00:00
Andrew Innes
a62e863522 (CURDIR): New define. 2000-12-06 14:55:40 +00:00
Andrew Innes
9e6fd35da9 Revert to Unix line endings. 2000-09-17 21:00:02 +00:00
Andrew Innes
12563abbfa (SHELLTYPE): New define. 2000-09-14 21:45:45 +00:00
Andrew Innes
32bc732bed (CFLAGS): No need for -D_ANONYMOUS_UNION
-D_ANONYMOUS_STRUCT on compile line.
(FOREACH, FORVAR, FORDO, ENDFOR): New definitions.
(ARGQUOTE, DQUOTE): New defines.
2000-09-03 17:36:34 +00:00
Andrew Innes
280d77218f New file. 2000-08-24 11:05:18 +00:00