2004-04-23 00:24:35 +00:00
|
|
|
# -*- Makefile -*- definition file for building GNU Emacs on Windows NT.
|
2015-01-01 14:26:41 -08:00
|
|
|
# Copyright (C) 2000-2015 Free Software Foundation, Inc.
|
2008-05-09 05:14:16 +00:00
|
|
|
|
|
|
|
|
# This file is part of GNU Emacs.
|
|
|
|
|
|
|
|
|
|
# GNU Emacs is free software: you can redistribute it and/or modify
|
|
|
|
|
# it under the terms of the GNU General Public License as published by
|
|
|
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
# (at your option) any later version.
|
|
|
|
|
|
|
|
|
|
# GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
# GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
|
|
|
# along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
2000-09-17 21:00:02 +00:00
|
|
|
|
|
|
|
|
# Ensure 'all' is the default target
|
|
|
|
|
all:
|
|
|
|
|
|
|
|
|
|
# NOTES
|
2003-02-04 14:56:31 +00:00
|
|
|
#
|
2000-09-17 21:00:02 +00:00
|
|
|
# I tried to force gmake to use the native shell for simplicity, by
|
|
|
|
|
# setting SHELL as below, but this didn't work reliably because of
|
|
|
|
|
# various case sensitivity niggles. Specifically, COMSPEC (which is in
|
|
|
|
|
# fact usually spelled ComSpec on NT, to make life difficult) typically
|
|
|
|
|
# references "cmd.exe" (on NT) when the file is actually called
|
|
|
|
|
# "CMD.EXE" on disk for hysterical raisons. As a result, GNU make
|
|
|
|
|
# thinks it doesn't exist (unless compiled with a switch to ignore
|
|
|
|
|
# case), and so doesn't change which shell it will invoke to execute
|
|
|
|
|
# commands.
|
2003-02-04 14:56:31 +00:00
|
|
|
#
|
2000-09-17 21:00:02 +00:00
|
|
|
# It would be possible, though very tedious using just gmake facilities,
|
|
|
|
|
# to convert the COMSPEC value to uppercase to solve this problem, but
|
|
|
|
|
# it isn't worth it. That is partly because, even when using the native
|
|
|
|
|
# shell, gmake tends to not be happy with backslashes in command
|
|
|
|
|
# strings. The obvious solution is to use forward slashes as much as
|
|
|
|
|
# possible, which can be made to work most of the time (putting
|
|
|
|
|
# filenames in quotes often helps), but there are still some internal
|
|
|
|
|
# cmd.exe commands like `del' and `copy' that won't work with them.
|
|
|
|
|
# Although it is possible to convert slashes to backslashes when
|
|
|
|
|
# necessary, gmake requires explicitly calling its subst function, which
|
|
|
|
|
# nmake does not understand). For this reason, it is simplest to
|
|
|
|
|
# mandate that rm and cp be available, so we can use Unix-format file
|
|
|
|
|
# names everywhere. (Fortunately both MS and GNU make, and the
|
|
|
|
|
# respective compilers, are happy with Unix-format names.)
|
2003-02-04 14:56:31 +00:00
|
|
|
#
|
2000-09-17 21:00:02 +00:00
|
|
|
# Since we cannot easily force the choice of a particular shell, we must
|
|
|
|
|
# make the effort to cope with whichever shell is being used.
|
|
|
|
|
# Fortunately, the only command we need to use that is shell specific is
|
|
|
|
|
# the testing of a file's existence for the purpose of working out when
|
|
|
|
|
# we are copying files to their original location. That particular
|
|
|
|
|
# requirement is abstracted easily enough.
|
2003-02-04 14:56:31 +00:00
|
|
|
#
|
2000-09-17 21:00:02 +00:00
|
|
|
# The only other problem area was the change of directory when running
|
|
|
|
|
# temacs to dump emacs.exe (where gmake doesn't support cd foo in any
|
|
|
|
|
# useful way), but that has been resolved by modifying the Windows
|
|
|
|
|
# unexec function slightly to not require the directory change while
|
|
|
|
|
# still allowing objects and binaries to be in subdirectories.
|
|
|
|
|
|
|
|
|
|
# This doesn't work.
|
|
|
|
|
#SHELL:=$(COMSPEC)
|
|
|
|
|
|
|
|
|
|
# Determine whether make is using sh or cmd/command as shell; cmd.exe
|
|
|
|
|
# will output "ECHO is on" when echo is given by itself, while sh will
|
|
|
|
|
# not produce any output.
|
|
|
|
|
sh_output := $(shell echo)
|
|
|
|
|
ifeq "$(findstring ECHO, $(sh_output))" "ECHO"
|
|
|
|
|
THE_SHELL = $(COMSPEC)$(ComSpec)
|
|
|
|
|
SHELLTYPE=CMD
|
2012-11-23 10:47:34 +02:00
|
|
|
SWITCHCHAR=/
|
2000-09-17 21:00:02 +00:00
|
|
|
else
|
|
|
|
|
USING_SH = 1
|
|
|
|
|
THE_SHELL = $(SHELL)
|
|
|
|
|
SHELLTYPE=SH
|
2012-11-23 10:47:34 +02:00
|
|
|
# MSYS needs to double the slash in cmd-style switches to avoid
|
|
|
|
|
# interpreting /x as a Posix style file name reference
|
|
|
|
|
ifneq ($(MSYSTEM),)
|
|
|
|
|
SWITCHCHAR=//
|
|
|
|
|
else
|
|
|
|
|
SWITCHCHAR=/
|
|
|
|
|
endif
|
2000-09-17 21:00:02 +00:00
|
|
|
endif
|
|
|
|
|
|
2001-01-06 21:18:05 +00:00
|
|
|
MAKETYPE=gmake
|
|
|
|
|
|
2003-01-29 23:33:08 +00:00
|
|
|
# The following "ifeq" does not appear to DTRT, and therefore breaks
|
|
|
|
|
# the build on mingw32. Also the -m option does not exist in many
|
|
|
|
|
# (reasonably recent even) versions of Cygwin. These issues need to be
|
|
|
|
|
# remedied before putting this cygpath kludge back in.
|
|
|
|
|
|
2003-01-15 12:04:38 +00:00
|
|
|
# Convert CURDIR to native file name, if in Cygwin format
|
2003-01-29 23:33:08 +00:00
|
|
|
#ifeq "$(shell cygpath $(CURDIR))" "$(CURDIR)"
|
|
|
|
|
#CURDIR := $(shell cygpath -m $(CURDIR))
|
|
|
|
|
#endif
|
|
|
|
|
|
2001-02-05 16:55:05 +00:00
|
|
|
THISDIR = .
|
|
|
|
|
|
2000-12-06 13:40:28 +00:00
|
|
|
# Cygwin has changed quoting rules somewhat since b20, in a way that
|
|
|
|
|
# affects makefiles using sh as the command processor, so we need to
|
|
|
|
|
# detect which rules to use.
|
|
|
|
|
ifdef USING_SH
|
2001-06-01 13:18:27 +00:00
|
|
|
sh_output := $(shell echo [Please ignore a syntax error on the next line - it is intentional] 1>&2)
|
2000-12-06 13:40:28 +00:00
|
|
|
sh_output := $(shell echo foo")
|
2011-11-17 09:40:48 -08:00
|
|
|
# This single quote " is to fix fontification due to previous line
|
2000-12-06 13:40:28 +00:00
|
|
|
ifeq "$(sh_output)" ""
|
|
|
|
|
NEW_CYGWIN = 1
|
|
|
|
|
endif
|
2008-01-20 23:17:25 +00:00
|
|
|
|
|
|
|
|
# By default, newer versions of Cygwin mess with NTFS ACLs in an
|
|
|
|
|
# attempt to emulate traditional posix file permissions. This can
|
|
|
|
|
# cause bad effects, such as .exe files that are missing the
|
|
|
|
|
# FILE_EXECUTE/FILE_GENERIC_EXECUTE permissions when they are created
|
|
|
|
|
# with Cygwin commands that don't expect to be creating executable
|
|
|
|
|
# files. Then when we later use a non-Cygwin program to create the
|
|
|
|
|
# real .exe, the previous Cygwin defined ACL sticks.
|
|
|
|
|
CYGWIN=nontsec
|
|
|
|
|
export CYGWIN
|
2000-12-06 13:40:28 +00:00
|
|
|
endif
|
|
|
|
|
|
2000-09-17 21:00:02 +00:00
|
|
|
ALL_DEPS = $^
|
|
|
|
|
EMPTY =
|
|
|
|
|
SPACE = $(EMPTY) $(EMPTY)
|
|
|
|
|
|
|
|
|
|
SUBSYSTEM_WINDOWS=-Wl,-subsystem,windows
|
|
|
|
|
SUBSYSTEM_CONSOLE=-Wl,-subsystem,console
|
|
|
|
|
|
|
|
|
|
# INSTALL_DIR is the directory into which emacs will be installed.
|
|
|
|
|
#
|
|
|
|
|
ifndef INSTALL_DIR
|
2000-12-06 15:01:54 +00:00
|
|
|
INSTALL_DIR = $(CURDIR)/..
|
2000-09-17 21:00:02 +00:00
|
|
|
endif
|
|
|
|
|
|
2001-04-18 14:06:55 +00:00
|
|
|
export EMACSLOADPATH
|
|
|
|
|
|
2000-09-17 21:00:02 +00:00
|
|
|
# Determine the architecture we're running on.
|
2003-02-04 14:56:31 +00:00
|
|
|
# Define ARCH for our purposes;
|
2000-09-17 21:00:02 +00:00
|
|
|
# Define CPU for use by ntwin32.mak;
|
|
|
|
|
# Define CONFIG_H to the appropriate config.h for the system;
|
|
|
|
|
#
|
|
|
|
|
ifdef PROCESSOR_ARCHITECTURE
|
|
|
|
|
# We're on Windows NT
|
|
|
|
|
CPU = $(PROCESSOR_ARCHITECTURE)
|
|
|
|
|
CONFIG_H = config.nt
|
|
|
|
|
OS_TYPE = windowsnt
|
|
|
|
|
ifeq "$(PROCESSOR_ARCHITECTURE)" "x86"
|
|
|
|
|
ARCH = i386
|
|
|
|
|
CPU = i386
|
Support x64 build on MS-Windows with MSVC.
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.
2012-09-30 23:36:42 +02:00
|
|
|
EMACS_HEAPSIZE = 27
|
|
|
|
|
EMACS_PURESIZE = 5000000
|
|
|
|
|
EMACS_MANIFEST = emacs-x86.manifest
|
2000-09-17 21:00:02 +00:00
|
|
|
else
|
|
|
|
|
ifeq "$(PROCESSOR_ARCHITECTURE)" "MIPS"
|
|
|
|
|
ARCH = mips
|
Support x64 build on MS-Windows with MSVC.
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.
2012-09-30 23:36:42 +02:00
|
|
|
EMACS_HEAPSIZE = 27
|
|
|
|
|
EMACS_PURESIZE = 5000000
|
|
|
|
|
EMACS_MANIFEST = emacs-mips.manifest
|
2000-09-17 21:00:02 +00:00
|
|
|
else
|
|
|
|
|
ifeq "$(PROCESSOR_ARCHITECTURE)" "ALPHA"
|
|
|
|
|
ARCH = alpha
|
Support x64 build on MS-Windows with MSVC.
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.
2012-09-30 23:36:42 +02:00
|
|
|
EMACS_HEAPSIZE = 27
|
|
|
|
|
EMACS_PURESIZE = 5000000
|
|
|
|
|
EMACS_MANIFEST = emacs-alpha.manifest
|
2000-09-17 21:00:02 +00:00
|
|
|
else
|
|
|
|
|
ifeq "$(PROCESSOR_ARCHITECTURE)" "PPC"
|
|
|
|
|
ARCH = ppc
|
Support x64 build on MS-Windows with MSVC.
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.
2012-09-30 23:36:42 +02:00
|
|
|
EMACS_HEAPSIZE = 27
|
|
|
|
|
EMACS_PURESIZE = 5000000
|
|
|
|
|
EMACS_MANIFEST = emacs-ppc.manifest
|
2000-09-17 21:00:02 +00:00
|
|
|
else
|
2011-04-28 23:43:23 +03:00
|
|
|
$(error Unknown architecture type "$(PROCESSOR_ARCHITECTURE)")
|
2000-09-17 21:00:02 +00:00
|
|
|
endif
|
|
|
|
|
endif
|
|
|
|
|
endif
|
|
|
|
|
endif
|
|
|
|
|
else
|
|
|
|
|
# We're on Windows 95
|
|
|
|
|
ARCH = i386
|
|
|
|
|
CPU = i386
|
|
|
|
|
CONFIG_H = config.nt
|
|
|
|
|
OS_TYPE = windows95
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
AR = ar -rsc
|
|
|
|
|
AR_OUT =
|
|
|
|
|
CC = gcc
|
|
|
|
|
CC_OUT = -o$(SPACE)
|
|
|
|
|
LINK = gcc
|
|
|
|
|
LINK_OUT = -o$(SPACE)
|
|
|
|
|
RC = windres -O coff
|
|
|
|
|
RC_OUT = -o$(SPACE)
|
|
|
|
|
RC_INCLUDE = --include-dir$(SPACE)
|
|
|
|
|
|
2003-02-04 14:56:31 +00:00
|
|
|
libc =
|
|
|
|
|
baselibs =
|
2000-09-17 21:00:02 +00:00
|
|
|
O = o
|
|
|
|
|
A = a
|
|
|
|
|
|
|
|
|
|
BASE_LIBS = $(libc) $(baselibs)
|
|
|
|
|
|
|
|
|
|
ADVAPI32 = -ladvapi32
|
2007-09-27 22:07:47 +00:00
|
|
|
COMCTL32 = -lcomctl32
|
2000-09-17 21:00:02 +00:00
|
|
|
COMDLG32 = -lcomdlg32
|
|
|
|
|
GDI32 = -lgdi32
|
|
|
|
|
MPR = -lmpr
|
|
|
|
|
SHELL32 = -lshell32
|
|
|
|
|
USER32 = -luser32
|
|
|
|
|
WSOCK32 = -lwsock32
|
2007-07-11 14:41:22 +00:00
|
|
|
WINMM = -lwinmm
|
2004-01-28 23:20:02 +00:00
|
|
|
WINSPOOL = -lwinspool
|
2007-07-11 14:41:22 +00:00
|
|
|
OLE32 = -lole32
|
2008-04-03 12:24:31 +00:00
|
|
|
UNISCRIBE = -lusp10
|
2009-01-15 15:18:43 +00:00
|
|
|
UUID = -luuid
|
2000-09-17 21:00:02 +00:00
|
|
|
|
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
|
|
|
# Used by src/makefile.w32-in, since Nmake barfs on $(func SOMETHING)
|
|
|
|
|
OBJ0_c = $(patsubst $(BLD)%.$(O),$(CURDIR)%.c,$(OBJ0))
|
|
|
|
|
OBJ1_c = $(patsubst $(BLD)%.$(O),$(CURDIR)%.c,$(OBJ1))
|
|
|
|
|
OBJ2_c = $(patsubst $(BLD)%.$(O),$(CURDIR)%.c,$(OBJ2))
|
|
|
|
|
|
2000-09-17 21:00:02 +00:00
|
|
|
ifdef NOOPT
|
Fix warnings when compiling on MS-Windows with -std=gnu99.
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.
2012-10-17 21:02:44 +02:00
|
|
|
DEBUG_CFLAGS = -DEMACSDEBUG -fno-crossjumping -std=gnu99
|
2000-09-17 21:00:02 +00:00
|
|
|
else
|
2003-02-04 14:56:31 +00:00
|
|
|
DEBUG_CFLAGS =
|
2000-09-17 21:00:02 +00:00
|
|
|
endif
|
2010-07-18 11:41:48 +02:00
|
|
|
|
2012-05-29 19:15:12 +03:00
|
|
|
MWINDOWS = -mwindows
|
|
|
|
|
|
2012-07-04 19:17:19 +02:00
|
|
|
CFLAGS = -I. $(ARCH_CFLAGS) $(DEBUG_CFLAGS) $(PROFILE_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS)
|
|
|
|
|
ESC_CFLAGS = -I. $(ARCH_CFLAGS) $(DEBUG_CFLAGS) $(PROFILE_CFLAGS) $(ESC_USER_CFLAGS) $(LOCAL_FLAGS)
|
2008-06-26 22:33:33 +00:00
|
|
|
EMACS_EXTRA_C_FLAGS = -DUSE_CRT_DLL=1
|
2000-09-17 21:00:02 +00:00
|
|
|
|
2008-07-23 15:41:23 +00:00
|
|
|
ifdef PROFILE
|
|
|
|
|
PROFILE_CFLAGS = -pg
|
|
|
|
|
PROFILE_LDFLAGS = -pg
|
|
|
|
|
else
|
|
|
|
|
PROFILE_CFLAGS =
|
|
|
|
|
PROFILE_LDFLAGS =
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
|
2000-09-17 21:00:02 +00:00
|
|
|
# see comments in allocate_heap in w32heap.c before changing any of the
|
|
|
|
|
# -stack, -heap, or -image-base settings.
|
2005-12-24 17:30:08 +00:00
|
|
|
TEMACS_EXTRA_LINK = -Wl,-stack,0x00800000 -Wl,-heap,0x00100000 -Wl,-image-base,0x01000000 $(SUBSYSTEM_CONSOLE) -Wl,-entry,__start -Wl,-Map,$(BLD)/temacs.map
|
2000-09-17 21:00:02 +00:00
|
|
|
|
|
|
|
|
ifdef NOOPT
|
|
|
|
|
OBJDIR = oo
|
|
|
|
|
else
|
|
|
|
|
OBJDIR = oo-spd
|
|
|
|
|
endif
|
|
|
|
|
$(OBJDIR):; -mkdir "$(OBJDIR)"
|
|
|
|
|
BLD = $(OBJDIR)/$(ARCH)
|
2006-12-22 18:22:12 +00:00
|
|
|
stamp_BLD: $(OBJDIR)
|
2000-09-17 21:00:02 +00:00
|
|
|
-mkdir "$(BLD)"
|
2006-12-22 18:22:12 +00:00
|
|
|
echo $(BLD) > $@
|
2000-09-17 21:00:02 +00:00
|
|
|
|
2001-01-06 21:18:05 +00:00
|
|
|
COMPILER_TEMP_FILES =
|
|
|
|
|
|
2000-09-17 21:00:02 +00:00
|
|
|
CP = cp -f
|
|
|
|
|
CP_DIR = cp -rf
|
|
|
|
|
DEL = rm
|
|
|
|
|
DEL_TREE = rm -r
|
2000-12-06 13:40:28 +00:00
|
|
|
|
2012-03-25 20:17:46 +02:00
|
|
|
DIRNAME = $(notdir $(CURDIR))
|
|
|
|
|
|
2000-09-17 21:00:02 +00:00
|
|
|
ifdef USING_SH
|
2000-12-06 13:40:28 +00:00
|
|
|
|
2012-03-25 20:17:46 +02:00
|
|
|
IFNOTSAMEDIR = if [ ! -s ../$(DIRNAME)_same-dir.tst ] ; then
|
2000-09-17 21:00:02 +00:00
|
|
|
FOREACH = for f in
|
|
|
|
|
FORVAR = $${f}
|
|
|
|
|
FORDO = ; do
|
|
|
|
|
ENDFOR = ; done
|
|
|
|
|
ENDIF = ; fi
|
|
|
|
|
ARGQUOTE = '
|
2000-12-06 13:40:28 +00:00
|
|
|
ifdef NEW_CYGWIN
|
|
|
|
|
DQUOTE = "
|
|
|
|
|
else
|
2000-09-17 21:00:02 +00:00
|
|
|
DQUOTE = ""
|
2000-12-06 13:40:28 +00:00
|
|
|
endif
|
|
|
|
|
|
2000-09-17 21:00:02 +00:00
|
|
|
else
|
2000-12-06 13:40:28 +00:00
|
|
|
|
2012-03-25 20:17:46 +02:00
|
|
|
IFNOTSAMEDIR = if not exist ../$(DIRNAME)_same-dir.tst
|
2000-09-17 21:00:02 +00:00
|
|
|
FOREACH = for %%f in (
|
|
|
|
|
FORVAR = %%f
|
|
|
|
|
FORDO = ) do
|
|
|
|
|
ENDFOR =
|
|
|
|
|
ENDIF =
|
|
|
|
|
ARGQUOTE = "
|
|
|
|
|
DQUOTE = \"
|
2000-12-06 13:40:28 +00:00
|
|
|
|
2000-09-17 21:00:02 +00:00
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
ifdef NODEBUG
|
2003-02-04 14:56:31 +00:00
|
|
|
DEBUG_FLAG =
|
2001-03-18 16:56:08 +00:00
|
|
|
DEBUG_LINK =
|
2000-09-17 21:00:02 +00:00
|
|
|
else
|
2008-06-23 21:34:24 +00:00
|
|
|
DEBUG_FLAG = $(DEBUG_INFO)
|
|
|
|
|
DEBUG_LINK = $(DEBUG_INFO)
|
2000-09-17 21:00:02 +00:00
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
ifdef NOCYGWIN
|
|
|
|
|
NOCYGWIN = -mno-cygwin
|
|
|
|
|
endif
|
|
|
|
|
|
2011-04-24 20:29:31 -05:00
|
|
|
ifdef USER_LIBS
|
|
|
|
|
USER_LIBS := $(patsubst %,-l%,$(USER_LIBS))
|
|
|
|
|
endif
|
|
|
|
|
|
2012-02-05 13:40:36 -07:00
|
|
|
PRAGMA_SYSTEM_HEADER = \#pragma GCC system_header
|
|
|
|
|
|
2000-09-17 21:00:02 +00:00
|
|
|
ifeq "$(ARCH)" "i386"
|
|
|
|
|
ifdef NOOPT
|
2008-06-26 22:33:33 +00:00
|
|
|
ARCH_CFLAGS = -c $(DEBUG_FLAG) $(NOCYGWIN)
|
2000-09-17 21:00:02 +00:00
|
|
|
else
|
2008-06-26 22:33:33 +00:00
|
|
|
ARCH_CFLAGS = -c $(DEBUG_FLAG) $(NOCYGWIN) $(MCPU_FLAG) -O2 \
|
2000-09-17 21:00:02 +00:00
|
|
|
# -fbuiltin \
|
|
|
|
|
# -finline-functions \
|
|
|
|
|
# -fomit-frame-pointer
|
|
|
|
|
endif
|
|
|
|
|
ARCH_LDFLAGS = $(SYS_LDFLAGS)
|
|
|
|
|
else
|
|
|
|
|
ERROR Unknown architecture type "$(ARCH)".
|
|
|
|
|
endif
|
|
|
|
|
|
2008-07-23 15:41:23 +00:00
|
|
|
LINK_FLAGS = $(ARCH_LDFLAGS) $(DEBUG_LINK) $(PROFILE_LDFLAGS) $(NOCYGWIN) $(USER_LDFLAGS)
|
2000-09-17 21:00:02 +00:00
|
|
|
|
2006-12-23 10:29:46 +00:00
|
|
|
export XMFLAGS
|
|
|
|
|
|
2000-09-17 21:00:02 +00:00
|
|
|
.DEFAULT:
|
|
|
|
|
|
|
|
|
|
$(BLD)/%.o: %.c
|
|
|
|
|
$(CC) $(CFLAGS) $(CC_OUT)$@ $<
|