projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(GT-K02180): New character.
[chise/xemacs-chise.git-]
/
nt
/
xemacs.mak
diff --git
a/nt/xemacs.mak
b/nt/xemacs.mak
index
87ab685
..
d0aff62
100644
(file)
--- a/
nt/xemacs.mak
+++ b/
nt/xemacs.mak
@@
-167,18
+167,9
@@
USE_UNION_TYPE=0
!if !defined(USE_MINITAR)
USE_MINITAR=$(HAVE_ZLIB)
!endif
!if !defined(USE_MINITAR)
USE_MINITAR=$(HAVE_ZLIB)
!endif
-!if !defined(USE_MINIMAL_TAGBITS)
-USE_MINIMAL_TAGBITS=0
-!endif
-!if !defined(USE_INDEXED_LRECORD_IMPLEMENTATION)
-USE_INDEXED_LRECORD_IMPLEMENTATION=0
-!endif
!if !defined(USE_PORTABLE_DUMPER)
USE_PORTABLE_DUMPER=0
!endif
!if !defined(USE_PORTABLE_DUMPER)
USE_PORTABLE_DUMPER=0
!endif
-!if !defined(GUNG_HO)
-GUNG_HO=0
-!endif
# A little bit of adhockery. Default to use system malloc and
# DLL version of the C runtime library when using portable
# A little bit of adhockery. Default to use system malloc and
# DLL version of the C runtime library when using portable
@@
-207,6
+198,9
@@
EMACS_CONFIGURATION=ppc-pc-win32
!else
! error Unknown processor architecture type $(PROCESSOR_ARCHITECTURE)
!endif
!else
! error Unknown processor architecture type $(PROCESSOR_ARCHITECTURE)
!endif
+STACK_TRACE_EYE_CATCHER=$(XEMACS_VERSION_STRING:.=_)
+STACK_TRACE_EYE_CATCHER=xemacs_$(STACK_TRACE_EYE_CATCHER:-=_)_$(EMACS_CONFIGURATION:-=_)
+PROGRAM_DEFINES=$(PROGRAM_DEFINES) -DSTACK_TRACE_EYE_CATCHER=$(STACK_TRACE_EYE_CATCHER)
#
# Conf error checks
#
# Conf error checks
@@
-302,14
+296,6
@@
CONFIG_ERROR=1
!endif
#
!endif
#
-# Handle GUNG_HO
-#
-!if defined(GUNG_HO)
-USE_MINIMAL_TAGBITS=$(GUNG_HO)
-USE_INDEXED_LRECORD_IMPLEMENTATION=$(GUNG_HO)
-!endif
-
-#
# Whether to use dependency information generated by make-src-depend
#
!if !defined(DEPEND)
# Whether to use dependency information generated by make-src-depend
#
!if !defined(DEPEND)
@@
-458,12
+444,6
@@
DEBUG_FLAGS=-debug:full
QUICK_DEFINES=-DQUICK_BUILD
!endif
QUICK_DEFINES=-DQUICK_BUILD
!endif
-!if $(USE_MINIMAL_TAGBITS)
-TAGBITS_DEFINES=-DUSE_MINIMAL_TAGBITS
-!endif
-!if $(USE_INDEXED_LRECORD_IMPLEMENTATION)
-LRECORD_DEFINES=-DUSE_INDEXED_LRECORD_IMPLEMENTATION
-!endif
!if $(USE_UNION_TYPE)
UNION_DEFINES=-DUSE_UNION_TYPE
!endif
!if $(USE_UNION_TYPE)
UNION_DEFINES=-DUSE_UNION_TYPE
!endif
@@
-492,8
+472,7
@@
PATH_DEFINES=-DPATH_PREFIX=\"$(PATH_PREFIX)\"
INCLUDES=$(X_INCLUDES) $(MSW_INCLUDES) -I$(NT)\inc -I$(SRC) -I$(LWLIB_SRCDIR)
INCLUDES=$(X_INCLUDES) $(MSW_INCLUDES) -I$(NT)\inc -I$(SRC) -I$(LWLIB_SRCDIR)
-DEFINES=$(X_DEFINES) $(MSW_DEFINES) $(MULE_DEFINES) \
- $(TAGBITS_DEFINES) $(LRECORD_DEFINES) $(UNION_DEFINES) \
+DEFINES=$(X_DEFINES) $(MSW_DEFINES) $(MULE_DEFINES) $(UNION_DEFINES) \
$(DUMPER_DEFINES) $(MALLOC_DEFINES) $(QUICK_DEFINES) \
-DWIN32_LEAN_AND_MEAN -DWIN32_NATIVE -Demacs \
-DHAVE_CONFIG_H $(PROGRAM_DEFINES) $(PATH_DEFINES)
$(DUMPER_DEFINES) $(MALLOC_DEFINES) $(QUICK_DEFINES) \
-DWIN32_LEAN_AND_MEAN -DWIN32_NATIVE -Demacs \
-DHAVE_CONFIG_H $(PROGRAM_DEFINES) $(PATH_DEFINES)
@@
-562,6
+541,11
@@
$(LIB_SRC)/movemail.exe: $(LIB_SRC)/movemail.c $(LIB_SRC)/pop.c $(ETAGS_DEPS)
$(CCV) -I. -I$(XEMACS)/src -I$(XEMACS)/nt/inc $(LIB_SRC_DEFINES) $(CFLAGS) -Fe$@ $** wsock32.lib -link -incremental:no
cd $(NT)
$(CCV) -I. -I$(XEMACS)/src -I$(XEMACS)/nt/inc $(LIB_SRC_DEFINES) $(CFLAGS) -Fe$@ $** wsock32.lib -link -incremental:no
cd $(NT)
+$(LIB_SRC)/winclient.exe: $(LIB_SRC)/winclient.c
+ cd $(LIB_SRC)
+ $(CCV) -I. -I$(XEMACS)/src -I$(XEMACS)/nt/inc $(LIB_SRC_DEFINES) $(CFLAGS) -Fe$@ $** user32.lib -link -incremental:no
+ cd $(NT)
+
$(LIB_SRC)/minitar.exe : $(NT)/minitar.c
$(CCV) $(CFLAGS) -I$(ZLIB_DIR) -Fe$@ $** $(ZLIB_DIR)\zlib.lib -link -incremental:no
$(LIB_SRC)/minitar.exe : $(NT)/minitar.c
$(CCV) $(CFLAGS) -I$(ZLIB_DIR) -Fe$@ $** $(ZLIB_DIR)\zlib.lib -link -incremental:no
@@
-569,6
+553,7
@@
LIB_SRC_TOOLS = \
$(LIB_SRC)/etags.exe \
$(LIB_SRC)/hexl.exe \
$(LIB_SRC)/i.exe \
$(LIB_SRC)/etags.exe \
$(LIB_SRC)/hexl.exe \
$(LIB_SRC)/i.exe \
+ $(LIB_SRC)/winclient.exe \
$(LIB_SRC)/make-docfile.exe \
$(LIB_SRC)/mmencode.exe \
$(LIB_SRC)/movemail.exe \
$(LIB_SRC)/make-docfile.exe \
$(LIB_SRC)/mmencode.exe \
$(LIB_SRC)/movemail.exe \
@@
-1400,8
+1385,10
@@
$(PROGNAME) : $(TEMACS) $(TEMACS_DIR)\NEEDTODUMP
<<
# Make the resource section read/write since almost all of it is the dump
# data which needs to be writable. This avoids having to copy it.
<<
# Make the resource section read/write since almost all of it is the dump
# data which needs to be writable. This avoids having to copy it.
- editbin -nologo -section:.rsrc,rw xemacs.exe
+ editbin -nologo -stack:0x800000 -section:.rsrc,rw xemacs.exe
$(DEL) $(TEMACS_DIR)\xemacs.dmp
$(DEL) $(TEMACS_DIR)\xemacs.dmp
+!else
+ editbin -nologo -stack:0x800000 xemacs.exe
!endif
cd $(NT)
@if not exist $(TEMACS_DIR)\SATISFIED nmake -nologo -f xemacs.mak $@
!endif
cd $(NT)
@if not exist $(TEMACS_DIR)\SATISFIED nmake -nologo -f xemacs.mak $@
@@
-1512,14
+1499,14
@@
installation::
OS: $(OS)
!endif
OS: $(OS)
!endif
-XEmacs $(XEMACS_VERSION_STRING) $(xemacs_codename:"=\") configured for `$(EMACS_CONFIGURATION)'.
+XEmacs $(XEMACS_VERSION_STRING) $(xemacs_codename) configured for `$(EMACS_CONFIGURATION)'.
- Building XEmacs in \"$(MAKEDIR:\=\\)\".
+ Building XEmacs in "$(MAKEDIR:\=\\)".
!if defined(CCV)
!if defined(CCV)
- Using compiler \"$(CC) $(CFLAGS)\".
+ Using compiler "$(CC) $(CFLAGS)".
!endif
!endif
- Installing XEmacs in \"$(INSTALL_DIR:\=\\)\".
- Package path is $(PATH_PACKAGEPATH:"=\").
+ Installing XEmacs in "$(INSTALL_DIR:\=\\)".
+ Package path is $(PATH_PACKAGEPATH).
!if $(INFODOCK)
Building InfoDock.
!endif
!if $(INFODOCK)
Building InfoDock.
!endif
@@
-1593,12
+1580,6
@@
XEmacs $(XEMACS_VERSION_STRING) $(xemacs_codename:"=\") configured for `$(EMACS_
WARNING: expense of an additional ~4KB of code.
--------------------------------------------------------------------
!endif
WARNING: expense of an additional ~4KB of code.
--------------------------------------------------------------------
!endif
-!if $(USE_MINIMAL_TAGBITS)
- Using minimal tagbits.
-!endif
-!if $(USE_INDEXED_LRECORD_IMPLEMENTATION)
- Using indexed lrecord implementation.
-!endif
!if $(USE_UNION_TYPE)
Using union type for Lisp object storage.
!endif
!if $(USE_UNION_TYPE)
Using union type for Lisp object storage.
!endif