Mercurial > hg > xemacs-beta

diff nt/xemacs.mak @ 4413:dc84ec90b463

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix build problems on Windows. Also: regenerate dependencies, update ignored files 2008-01-24 Mike Sperber <mike@xemacs.org> * config.inc.samp: Fix URL for optional libraries. * xemacs.mak (PATH_PREFIX): Set PATH_PREFIX to the value of INSTALL_DIR. * xemacs.mak (PATH_DEFINES): Fix setting of PATH_DEFINES. * xemacs.mak (DEBUG_FLAG_COMPILE_DEBUG): Comment out -RTC1: it even crashes with VC 8. * xemacs.mak: Comment out echo line that leads to command-line-too-long error on some Windowses. 2008-01-24 Mike Sperber <mike@xemacs.org> * make-src-depend (PrintDeps): Fix Perl code that no longer works with Perl 5.10.
author Mike Sperber <sperber@deinprogramm.de>
date Mon, 28 Jan 2008 08:13:37 +0100
parents 4b62544f5139
children eb82fbb675ea
line wrap: on
line diff
--- a/nt/xemacs.mak	Fri Jan 25 10:40:53 2008 +0900
+++ b/nt/xemacs.mak	Mon Jan 28 08:13:37 2008 +0100
@@ -458,10 +458,10 @@
 !if $(INFODOCK)
 PATH_PREFIX=../..
 !else
-PATH_PREFIX=..
+PATH_PREFIX="$(INSTALL_DIR)"
 !endif
 
-PATH_DEFINES=-DPATH_PREFIX=\"$(PATH_PREFIX)\"
+PATH_DEFINES=-DPATH_PREFIX=\"$(PATH_PREFIX:\=\\)\"
 
 !if $(SEPARATE_BUILD)
 PATH_DEFINES=$(PATH_DEFINES) -DPATH_LOADSEARCH=\"$(LISP:\=\\)\" -DPATH_DATA=\"$(ETC:\=\\)\" -DPATH_INFO=\"$(INFO:\=\\)\"
@@ -691,8 +691,8 @@
 # giving it.
 DEBUG_FLAG_LINK_DEBUG=-debug -opt:noref
 # This turns on additional run-time checking
-# For some reason it causes spawning of make-docfile to crash in VC 7
-DEBUG_FLAG_COMPILE_DEBUG=-RTC1
+# For some reason it causes spawning of make-docfile to crash in VC 7 and VC 8
+# DEBUG_FLAG_COMPILE_DEBUG=-RTC1
 ! else
 DEBUG_FLAG_LINK_DEBUG=-debug:full
 DEBUG_FLAG_COMPILE_DEBUG=
@@ -1366,7 +1366,8 @@
 !endif
 
 $(RAW_EXE): $(TEMACS_OBJS) $(LASTFILE) $(TEMACS_DUMP_DEP)
-	@echo link $(TEMACS_LFLAGS) -out:$@ $(TEMACS_OBJS) $(TEMACS_DUMP_DEP) $(TEMACS_LIBS)
+# Command line too long for some Windows installation:
+#	@echo link $(TEMACS_LFLAGS) -out:$@ $(TEMACS_OBJS) $(TEMACS_DUMP_DEP) $(TEMACS_LIBS)
 	link.exe @<<
   $(TEMACS_LFLAGS) -out:$@ $(TEMACS_OBJS) $(TEMACS_DUMP_DEP) $(TEMACS_LIBS)
 <<