comparison nt/xemacs.mak @ 294:4b85ae5eabfb r21-0b45

Import from CVS: tag r21-0b45
author cvs
date Mon, 13 Aug 2007 10:38:01 +0200
parents e11d67e05968
children 70ad99077275
comparison
equal deleted inserted replaced
293:403535bfea94 294:4b85ae5eabfb
92 !endif 92 !endif
93 !if $(HAVE_MSW) && $(HAVE_XPM) && !defined(XPM_DIR) 93 !if $(HAVE_MSW) && $(HAVE_XPM) && !defined(XPM_DIR)
94 !message Please specify root directory for your XPM installation: XPM_DIR=path 94 !message Please specify root directory for your XPM installation: XPM_DIR=path
95 CONFIG_ERROR=1 95 CONFIG_ERROR=1
96 !endif 96 !endif
97 !if $(HAVE_MSW) && $(HAVE_XPM) && defined(XPM_DIR) && !exist("$(XPM_DIR)\LIB\XPM.LIB") 97 !if $(HAVE_MSW) && $(HAVE_XPM) && defined(XPM_DIR) && !exist("$(XPM_DIR)\lib\Xpm.lib")
98 !message Specified XPM directory does not contain "$(XPM_DIR)\LIB\XPM.LIB" 98 !message Specified XPM directory does not contain "$(XPM_DIR)\lib\Xpm.lib"
99 CONFIG_ERROR=1 99 CONFIG_ERROR=1
100 !endif 100 !endif
101 !if $(HAVE_MSW) && $(HAVE_TOOLBARS) && !$(HAVE_XPM) 101 !if $(HAVE_MSW) && $(HAVE_TOOLBARS) && !$(HAVE_XPM)
102 !error Toolbars require XPM support 102 !error Toolbars require XPM support
103 CONFIG_ERROR=1 103 CONFIG_ERROR=1
257 -DPATH_PROGNAME=\"infodock\" \ 257 -DPATH_PROGNAME=\"infodock\" \
258 -DINFODOCK_MAJOR_VERSION=$(infodock_major_version) \ 258 -DINFODOCK_MAJOR_VERSION=$(infodock_major_version) \
259 -DINFODOCK_MINOR_VERSION=$(infodock_minor_version) \ 259 -DINFODOCK_MINOR_VERSION=$(infodock_minor_version) \
260 -DINFODOCK_BUILD_VERSION=$(infodock_build_version) 260 -DINFODOCK_BUILD_VERSION=$(infodock_build_version)
261 !else 261 !else
262 !if defined(emacs_beta_version) 262 !if "$(emacs_beta_version)" != ""
263 XEMACS_VERSION_STRING=$(emacs_major_version).$(emacs_minor_version)-b$(emacs_beta_version) 263 XEMACS_VERSION_STRING=$(emacs_major_version).$(emacs_minor_version)-b$(emacs_beta_version)
264 !else 264 !else
265 XEMACS_VERSION_STRING=$(emacs_major_version).$(emacs_minor_version) 265 XEMACS_VERSION_STRING=$(emacs_major_version).$(emacs_minor_version)
266 !endif 266 !endif
267 PROGRAM_DEFINES= \ 267 PROGRAM_DEFINES= \
551 551
552 #------------------------------------------------------------------------------ 552 #------------------------------------------------------------------------------
553 553
554 # TEMACS Executable 554 # TEMACS Executable
555 555
556 # This may not exist
557 !if "$(emacs_beta_version)" != ""
558 EMACS_BETA_VERSION=-DEMACS_BETA_VERSION=$(emacs_beta_version)
559 !ENDIF
560
556 TEMACS_DIR=$(XEMACS)\src 561 TEMACS_DIR=$(XEMACS)\src
557 TEMACS=$(TEMACS_DIR)\temacs.exe 562 TEMACS=$(TEMACS_DIR)\temacs.exe
558 TEMACS_BROWSE=$(TEMACS_DIR)\temacs.bsc 563 TEMACS_BROWSE=$(TEMACS_DIR)\temacs.bsc
559 TEMACS_SRC=$(XEMACS)\src 564 TEMACS_SRC=$(XEMACS)\src
560 TEMACS_LIBS=$(LASTFILE) $(LWLIB) $(X_LIBS) $(MSW_LIBS) \ 565 TEMACS_LIBS=$(LASTFILE) $(LWLIB) $(X_LIBS) $(MSW_LIBS) \
565 -pdb:$(TEMACS_DIR)\temacs.pdb -map:$(TEMACS_DIR)\temacs.map \ 570 -pdb:$(TEMACS_DIR)\temacs.pdb -map:$(TEMACS_DIR)\temacs.map \
566 -heap:0x00100000 -out:$@ 571 -heap:0x00100000 -out:$@
567 TEMACS_CPP_FLAGS= $(WARN_CPP_FLAGS) $(INCLUDES) $(DEFINES) $(DEBUG_DEFINES) \ 572 TEMACS_CPP_FLAGS= $(WARN_CPP_FLAGS) $(INCLUDES) $(DEFINES) $(DEBUG_DEFINES) \
568 -DEMACS_MAJOR_VERSION=$(emacs_major_version) \ 573 -DEMACS_MAJOR_VERSION=$(emacs_major_version) \
569 -DEMACS_MINOR_VERSION=$(emacs_minor_version) \ 574 -DEMACS_MINOR_VERSION=$(emacs_minor_version) \
570 -DEMACS_BETA_VERSION=$(emacs_beta_version) \ 575 $(EMACS_BETA_VERSION) \
571 -DXEMACS_CODENAME=\"$(xemacs_codename)\" \ 576 -DXEMACS_CODENAME=\"$(xemacs_codename)\" \
572 -DPATH_PACKAGEPATH=\"$(PATH_PACKAGEPATH)\" 577 -DPATH_PACKAGEPATH=\"$(PATH_PACKAGEPATH)\"
573 578
574 TEMACS_FLAGS=-ML $(WARN_CPP_FALGS) $(OPT) -c $(TEMACS_CPP_FLAGS) 579 TEMACS_FLAGS=-ML $(WARN_CPP_FALGS) $(OPT) -c $(TEMACS_CPP_FLAGS)
575 580
815 del *.bak 820 del *.bak
816 del *.orig 821 del *.orig
817 del *.rej 822 del *.rej
818 del *.pdb 823 del *.pdb
819 del *.tmp 824 del *.tmp
820 del puresize-adjust.h
821 cd $(OUTDIR) 825 cd $(OUTDIR)
822 del *.obj 826 del *.obj
823 del *.sbr 827 del *.sbr
824 del *.lib 828 del *.lib
825 cd $(XEMACS)\$(TEMACS_DIR) 829 cd $(XEMACS)\$(TEMACS_DIR)
830 del puresize-adjust.h
826 del config.h 831 del config.h
827 del paths.h 832 del paths.h
828 del Emacs.ad.h 833 del Emacs.ad.h
829 del *.bak 834 del *.bak
830 del *.orig 835 del *.orig