summaryrefslogtreecommitdiff
path: root/nt/gmake.defs
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright year to 2014 by running admin/update-copyright.Paul Eggert2014-01-011-1/+1
|
* Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.caPaul Eggert2013-01-021-1/+1
|\
| * Update copyright notices for 2013.Paul Eggert2013-01-011-1/+1
| |
* | Fix bug #12955 with building under MSYS Bash.Eli Zaretskii2012-11-231-0/+8
|/ | | | | | src/makefile.w32-in (globals.h, gl-stamp): Use $(SWITCHCHAR) instead of a literal "/". (gl-stamp): Invoke fc.exe directly, not through cmd.
* Fix warnings when compiling on MS-Windows with -std=gnu99.Eli Zaretskii2012-10-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | src/makefile.w32-in ($(BLD)/w32.$(O)): ($(BLD)/vm-limit.$(O)): ($(BLD)/term.$(O)): ($(BLD)/unexw32.$(O)): ($(BLD)/fileio.$(O)): ($(BLD)/dispnew.$(O)): Update dependencies. src/w32term.h (w32_initialize_display_info, initialize_w32_display): Add prototypes. src/w32proc.c: Include ctype.h. src/w32.h (init_environment, check_windows_init_file) (syms_of_ntproc, syms_of_ntterm, dostounix_filename) (unixtodos_filename, init_winsock, srandom, random, sys_pipe) (set_process_dir, sys_spawnve, register_child, sys_sleep, getwd) (sys_link): Add prototypes. src/w32.c: Include w32select.h. (sys_access, e_malloc, sys_select): Add prototypes. (emacs_gnutls_pull): 'timeout' is now EMACS_TIME, not struct timeval. src/vm-limit.c [WINDOWSNT]: Include w32heap.h. src/unexw32.c: Include lisp.h and w32.h. src/term.c [WINDOWSNT]: Include w32term.h. src/process.c [WINDOWSNT]: Add prototype of sys_select. src/fileio.c [WINDOWSNT]: Include w32.h. src/dispnew.c [WINDOWSNT]: Include w32.h. nt/inc/pwd.h (getuid, geteuid): Add prototypes. nt/inc/ms-w32.h (sys_wait, _getpid, gmtgime_r, localtime_r) (signal_handler, sys_signal, sigemptyset, sigfillset, sigprocmask) (pthread_sigmask, sigismember, setpgrp, sigaction, alarm) (sys_kill, getpagesize): Add prototypes for emulated functions. nt/inc/grp.h (getgid, getegid): Add prototypes. nt/gmake.defs (DEBUG_CFLAGS) [NOOPT]: Add -std=gnu99. nt/configure.bat (chkapiN): Avoid compiler warning in junk.c when compiling with -std=gnu99. nt/config.nt (CHECK_LISP_OBJECT_TYPE): Don't undef, so that it could be used via --cflags switch to configure.bat.
* Support x64 build on MS-Windows with MSVC.Fabrice Popineau2012-09-301-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | src/w32term.h (SCROLL_BAR_PACK, SCROLL_BAR_UNPACK): Define for x64. (SET_SCROLL_BAR_W32_WINDOW): Cast ID to intptr_t, for compatibility with x64. src/w32term.c (w32_draw_underwave): Don't use GCC extensions for defining an XRectangle structure. src/w32proc.c (RVA_TO_PTR, w32_executable_type): Fix pointer arithmetics for compatibility with x64. src/w32menu.c (add_menu_item): Use UINT_PTR instead of UINT, for compatibility with x64. src/w32heap.h: Adjust prototypes and declarations. src/w32heap.c (RVA_TO_PTR, allocate_heap, sbrk, init_heap) (round_heap): Use DWORD_PTR, ptrdiff_t and size_t instead of DWORD, long, and unsigned long, for compatibility with x64. (allocate_heap) [_WIN64]: Reserve 32GB of memory. (sbrk): Argument is now of type ptrdiff_t. src/w32fns.c (HMONITOR): Condition declaration on _WIN32_WINNT being less than 0x0500. (w32_msg_pump): Use WPARAM type for 'result'. src/w32.c (init_environment, get_emacs_configuration): Support AMD64 architecture. (init_ntproc): Cast arguments of _open_osfhandle to intptr_t, for compatibility with x64. src/vm-limit.c (lim_data): Now size_t. (check_memory_limits): Adjust prototypes of real_morecore and __morecore to receive argument of type ptrdiff_t. Use size_t for five_percent and data_size. src/unexw32.c: Use DWORD_PTR instead of DWORD for file-scope variables, for compatibility with x64. (rva_to_section, offset_to_section, relocate_offset) (OFFSET_TO_RVA, RVA_TO_OFFSET, RVA_TO_SECTION_OFFSET) (PTR_TO_RVA, RVA_TO_PTR, OFFSET_TO_PTR, get_section_info) (copy_executable_and_dump_data): Use DWORD_PTR instead of DWORD for compatibility with x64. src/sysdep.c (STDERR_FILENO): Define if not already defined. src/ralloc.c (real_morecore): Argument type is now ptrdiff_t. (__morecore): Argument type is now ptrdiff_t. (ROUNDUP, MEM_ROUNDUP): Use size_t instead of 'unsigned long'. (relinquish): Use ptrdiff_t type for 'excess'. (r_alloc_sbrk): Argument type is now ptrdiff_t. src/makefile.w32-in (HEAPSIZE): Get value from EMACS_HEAPSIZE. (bootstrap-temacs-CMD, bootstrap-temacs-SH): Use $(EMACS_PURESIZE) instead of a literal number. src/gmalloc.c [WINDOWSNT]: Include w32heap.h. (min): Define only if not already defined. src/frame.c (x_report_frame_params): Use EMACS_UINT for the return value of FRAME_X_WINDOW, to fit a 64-bit pointer on 64-bit Windows hosts. src/image.c (x_bitmap_pixmap): Return ptrdiff_t, not int, since 'bitmaps' is a pointer. src/dispextern.h (x_bitmap_pixmap): Adjust prototype. src/alloc.c (gdb_make_enums_visible): Now conditional on __GNUC__. nt/makefile.w32-in ($(TRES)): Use $(EMACS_MANIFEST). nt/inc/sys/socket.h: Don't map Winsock error codes to standard ones that are already defined. nt/inc/ms-w32.h (EMACS_INT, EMACS_UINT, EMACS_INT_MAX, PRIuMAX) (pI, _INTPTR) [_MSC_VER]: Fix definitions for MSVC. [_MSC_VER]: Add pragmas to suppress some MSVC warnings. nt/preprep.c (pfnCheckSumMappedFile, rva_to_section) (offset_to_section, relocate_offset, OFFSET_TO_RVA) (RVA_TO_OFFSET, RVA_TO_SECTION_OFFSET, PTR_TO_RVA) (OFFSET_TO_PTR, ROUND_UP, ROUND_DOWN) (copy_executable_and_move_sections, ADJUST_IMPORT_RVA, main): Use DWORD_PTR instead of DWORD for compatibility with x64. nt/nmake.defs: Support AMD64. (EMACS_HEAPSIZE, EMACS_PURESIZE, EMACS_MANIFEST): New macros. nt/gmake.defs: (EMACS_HEAPSIZE, EMACS_PURESIZE, EMACS_MANIFEST): New macros. nt/addsection.c (pfnCheckSumMappedFile, rva_to_section) (offset_to_section, relocate_offset, OFFSET_TO_RVA) (RVA_TO_OFFSET, RVA_TO_SECTION_OFFSET, PTR_TO_RVA) (OFFSET_TO_PTR, ROUND_UP, ROUND_DOWN) (copy_executable_and_add_section, main): Use DWORD_PTR instead of DWORD, for compatibility with x64. nt/emacs-x64.manifest: New file. nt/emacs-x86.manifest: Renamed from emacs.manifest. lib-src/ntlib.c (gettimeofday): Copy from src/w32.c. lib/gettime. needs this function.
* * nt/configure.bat (enablechecking): Enable checks through src/config.h.Juanma Barranquero2012-07-041-9/+3
| | | | | | | | | * nt/gmake.defs (DEBUG_CFLAGS): Add -fno-crossjumping. (CHECKING_CFLAGS): Remove. (CFLAGS, ESC_CFLAGS): Do not include $(CHECKING_CFLAGS). * nt/nmake.defs (CHECKING_CFLAGS): Remove. (CFLAGS, ESC_CFLAGS): Do not include $(CHECKING_CFLAGS).
* nt/nmake.defs,gmake.defs (CHECKING_FLAGS): Remove XASSERTS.Juanma Barranquero2012-06-281-1/+1
|
* Fix bug #11405 with MSVC build of emacsclientw.Eli Zaretskii2012-05-291-0/+2
| | | | | | | | 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".
* Fix parallel "make install" on MS-Windows.Eli Zaretskii2012-03-251-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* * lib/makefile.w32-in (PRAGMA_SYSTEM_HEADER): Move to platformChristoph Scholtes2012-02-051-0/+2
| | | | | | | | 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.
* Add 2012 to FSF copyright years for Emacs filesGlenn Morris2012-01-051-1/+1
|
* Spelling fixes.Paul Eggert2011-11-171-2/+1
|
* Support MSVC build with newer versions of Visual Studio.Eli Zaretskii2011-11-051-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* * nt/configure.bat: Renamed the fusercflags variable to escusercflagsBen Key2011-05-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* nt/gmake.defs (ARCH): Fix error message in case of unknown architecture.Eli Zaretskii2011-04-281-1/+1
|
* Add GnuTLS support for W32.Ted Zlatanov2011-04-241-0/+4
| | | | | | | | * nt/configure.bat: New options --without-gnutls and --lib, new build variable USER_LIBS, automatically detect GnuTLS. Copies the PNG library setup with trivial modifications. * nt/INSTALL: Add instructions for GnuTLS support. * nt/gmake.defs: Prefix USER_LIBS with -l.
* Convert consecutive FSF copyright years to ranges.Glenn Morris2011-01-241-2/+1
|
* Nuke arch-tags.Glenn Morris2011-01-151-1/+0
|
* Merge from emacs-23Stefan Monnier2011-01-141-1/+1
|\
| * Add 2011 to FSF/AIST copyright years.Glenn Morris2011-01-021-1/+1
| |
* | Fix bug #7102.Eli Zaretskii2010-10-011-0/+1
| | | | | | | | gmake.defs: Add a comment with a single quote to fix fontification.
* | * gmake.defs (CHECKING_CFLAGS) [ENABLECHECKS]: Add -fno-crossjumping.Juanma Barranquero2010-07-201-1/+1
| |
* | * configure.bat: New option --enable-checking.Juanma Barranquero2010-07-181-1/+8
|/ | | | | * gmake.defs, nmake.defs (CHECKING_CFLAGS): New define. (CFLAGS): Include it.
* Add 2010 to copyright years.Glenn Morris2010-01-131-1/+1
|
* (UUID): New library for COM/OLE lookups.Jason Rumney2009-01-151-0/+1
|
* Add 2009 to copyright years.Glenn Morris2009-01-081-1/+1
|
* * configure.bat: New option --profile.Jason Rumney2008-07-231-2/+11
| | | | * gmake.defs: Set cflags and ldflags for profiling when specified.
* Remove unneeded -Defines in the compiler command line (MinGW and MSVC).Juanma Barranquero2008-06-261-12/+4
| | | | | | | | | | | | | | | | | | | | * 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.
* * gmake.defs (DEBUG_FLAG, DEBUG_LINK) [!NODEBUG]:Juanma Barranquero2008-06-231-2/+2
| | | | | | | | Don't hardcode -gstabs+, use DEBUG_INFO. * configure.bat (gccdebug): Check for DWARF-2 support in GCC. Default to stabs if the compiler does not support DWARF-2. (genmakefiles): Write new variable DEBUG_INFO to config.settings.
* Switch to recommended form of GPLv3 permissions notice.Glenn Morris2008-05-091-17/+17
|
* (UNISCRIBE): New variable.Jason Rumney2008-04-031-0/+1
|
* (FONT_CFLAGS): New optional compiler flag.Jason Rumney2008-03-041-3/+9
| | | | (EMACS_EXTRA_C_FLAGS): Include it.
* (CYGWIN) [USING_SH]: Disable mapping of file permissions to NTFS ACLs.Jason Rumney2008-01-201-0/+10
|
* Add 2008 to copyright years.Glenn Morris2008-01-071-1/+1
|
* (COMCTL32): New system library.Jason Rumney2007-09-271-0/+1
|
* Switch license to GPLv3 or later.Glenn Morris2007-07-251-1/+1
|
* (OLE32): New library to link.Jason Rumney2007-07-111-1/+2
|
* Add 2007 to copyright years.Glenn Morris2007-01-211-1/+1
|
* Export XMFLAGS.Eli Zaretskii2006-12-231-0/+2
|
* (stamp_BLD): Rename from $(BLD). Create a file stamp_BLD after creating theEli Zaretskii2006-12-221-1/+2
| | | | $(BLD) directory.
* Update years in copyright notice; nfc.Thien-Thi Nguyen2006-02-061-2/+2
|
* (TEMACS_EXTRA_LINK): Remove redundant -g.Eli Zaretskii2005-12-241-3/+3
| | | | (DEBUG_FLAG, DEBUG_LINK): Upgrade to "-gstabs+ -g3".
* Update years in copyright notice; nfc.Thien-Thi Nguyen2005-08-101-1/+2
|
* Update FSF's address.Lute Kamstra2005-07-041-2/+2
|
* (ARCH_CFLAGS): Use $(MCPU_FLAG) instead of a literal "-mcpu=i686".Eli Zaretskii2005-06-111-1/+1
|
* Add "-*- makefile -*-" mode tag.Juanma Barranquero2004-04-231-2/+1
|
* gmake.defs, nmake.defs: Add linking to ``winspool.lib''.Jason Rumney2004-01-281-0/+1
|
* Add arch taglinesMiles Bader2003-09-011-0/+2
|
* Trailing whitespace deleted.Juanma Barranquero2003-02-041-12/+12
|
View Lorry Controller Status