User: ben
Date: 05/01/28 02:54:48
Modified: xemacs/nt ChangeLog xemacs.mak
Log:
Fixes to xemacs.mak
xemacs.mak: Use filename only when calling makeinfo, or it chokes on index
generation.
xemacs.mak: Generate separate .pdb and .map files for temacs/xemacs; may
make profiling possible.
Revision Changes Path
1.177 +11 -0 XEmacs/xemacs/nt/ChangeLog
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/ChangeLog,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -b -r1.176 -r1.177
--- ChangeLog 2005/01/24 23:33:39 1.176
+++ ChangeLog 2005/01/28 01:54:47 1.177
@@ -1,3 +1,14 @@
+2005-01-27 Ben Wing <ben(a)xemacs.org>
+
+ * xemacs.mak ({$(MANDIR)}.texi{$(INFODIR)}.info):
+ Use filename only when calling makeinfo, or it chokes on index
+ generation.
+
+ * xemacs.mak (TEMACS_COMMON_LFLAGS):
+ * xemacs.mak ( $(XEMACS_LFLAGS) -section):
+ Generate separate .pdb and .map files for temacs/xemacs; may
+ make profiling possible.
+
2005-01-24 Ben Wing <ben(a)xemacs.org>
* config.inc.samp:
1.111 +7 -4 XEmacs/xemacs/nt/xemacs.mak
(In the diff below, changes in quantity of whitespace are not shown.)
Index: xemacs.mak
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/xemacs.mak,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -b -r1.110 -r1.111
--- xemacs.mak 2005/01/24 23:33:40 1.110
+++ xemacs.mak 2005/01/28 01:54:47 1.111
@@ -962,7 +962,7 @@
{$(MANDIR)}.texi{$(INFODIR)}.info:
cd $(MANDIR)
- $(MAKEINFO) $**
+ $(MAKEINFO) $(**F)
XEMACS_SRCS = \
$(MANDIR)\xemacs\abbrevs.texi \
@@ -1263,10 +1263,13 @@
oldnames.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib \
shell32.lib wsock32.lib netapi32.lib winmm.lib winspool.lib ole32.lib \
mpr.lib uuid.lib imm32.lib $(LIBC_LIB)
-TEMACS_LFLAGS=-nologo $(LIBRARIES) $(DEBUG_FLAGS_LINK) \
+TEMACS_COMMON_LFLAGS=-nologo $(LIBRARIES) $(DEBUG_FLAGS_LINK) \
-base:0x1000000 -stack:0x800000 $(TEMACS_ENTRYPOINT) -subsystem:windows \
- -pdb:$(BLDSRC)\temacs.pdb -map:$(BLDSRC)\temacs.map \
-heap:0x00100000 -nodefaultlib $(PROFILE_FLAGS) setargv.obj
+TEMACS_LFLAGS=$(TEMACS_COMMON_LFLAGS) \
+ -pdb:$(BLDSRC)\temacs.pdb -map:$(BLDSRC)\temacs.map
+XEMACS_LFLAGS=$(TEMACS_COMMON_LFLAGS) \
+ -pdb:$(BLDSRC)\xemacs.pdb -map:$(BLDSRC)\xemacs.map
########################### Definitions for running temacs.exe/xemacs.exe
@@ -1380,7 +1383,7 @@
# 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.
link.exe @<<
- $(TEMACS_LFLAGS) -section:.rsrc,rw -out:$(BLDSRC)\xemacs.exe $(TEMACS_OBJS)
$(OUTDIR)\xemacs.res $(TEMACS_LIBS) $(OUTDIR)\dump-id.obj
+ $(XEMACS_LFLAGS) -section:.rsrc,rw -out:$(BLDSRC)\xemacs.exe $(TEMACS_OBJS)
$(OUTDIR)\xemacs.res $(TEMACS_LIBS) $(OUTDIR)\dump-id.obj
<<
-$(DEL) $(BLDSRC)\xemacs.dmp
!endif
Show replies by date