diff nt/xemacs.mak @ 286:57709be46d1b r21-0b41

Import from CVS: tag r21-0b41
author cvs
date Mon, 13 Aug 2007 10:35:03 +0200
parents 558f606b08ae
children e11d67e05968
line wrap: on
line diff
--- a/nt/xemacs.mak	Mon Aug 13 10:34:15 2007 +0200
+++ b/nt/xemacs.mak	Mon Aug 13 10:35:03 2007 +0200
@@ -34,7 +34,7 @@
 PATH_PACKAGEPATH="~/.xemacs"
 !endif
 !if !defined(HAVE_MSW)
-HAVE_MSW=0
+HAVE_MSW=1
 !endif
 !if !defined(HAVE_X)
 HAVE_X=0
@@ -48,6 +48,9 @@
 !if !defined(HAVE_TOOLBARS)
 HAVE_TOOLBARS=$(HAVE_XPM)
 !endif
+!if !defined(HAVE_DIALOGS)
+HAVE_DIALOGS=1
+!endif
 !if !defined(HAVE_MSW_C_DIRED)
 HAVE_MSW_C_DIRED=1
 !endif
@@ -126,6 +129,9 @@
 !if $(HAVE_TOOLBARS)
 !message Compiling in support for toolbars.
 !endif
+!if $(HAVE_DIALOGS)
+!message Compiling in support for dialogs.
+!endif
 !if $(HAVE_MSW_C_DIRED)
 # Define HAVE_MSW_C_DIRED to be non-zero if you want Xemacs to use C
 # primitives to significantly speed up dired, at the expense of an
@@ -194,6 +200,11 @@
 MSW_TOOLBAR_OBJ=$(OUTDIR)\toolbar.obj $(OUTDIR)\toolbar-msw.obj
 MSW_LIBS=$(MSW_LIBS) comctl32.lib
 !endif
+!if $(HAVE_DIALOGS)
+MSW_DEFINES=$(MSW_DEFINES) -DHAVE_DIALOGS
+MSW_DIALOG_SRC=$(XEMACS)\src\dialog.c $(XEMACS)\src\dialog-msw.c
+MSW_DIALOG_OBJ=$(OUTDIR)\dialog.obj $(OUTDIR)\dialog-msw.obj
+!endif
 !endif
 
 !if $(HAVE_MULE)
@@ -386,7 +397,6 @@
  $(XEMACS)\src\hash.c \
  $(XEMACS)\src\imgproc.c \
  $(XEMACS)\src\indent.c \
- $(XEMACS)\src\inline.c \
  $(XEMACS)\src\insdel.c \
  $(XEMACS)\src\intl.c \
  $(XEMACS)\src\keymap.c \
@@ -471,7 +481,8 @@
  $(XEMACS)\src\scrollbar-msw.c \
  $(XEMACS)\src\select-msw.c \
  $(MSW_C_DIRED_SRC) \
- $(MSW_TOOLBAR_SRC)
+ $(MSW_TOOLBAR_SRC) \
+ $(MSW_DIALOG_SRC)
 !endif
 
 !if $(HAVE_MULE)
@@ -575,7 +586,8 @@
 	$(OUTDIR)\scrollbar-msw.obj \
 	$(OUTDIR)\select-msw.obj \
 	$(MSW_C_DIRED_OBJ) \
-	$(MSW_TOOLBAR_OBJ)
+	$(MSW_TOOLBAR_OBJ) \
+	$(MSW_DIALOG_OBJ)
 !endif
 
 
@@ -647,7 +659,6 @@
 	$(OUTDIR)\hash.obj \
 	$(OUTDIR)\indent.obj \
 	$(OUTDIR)\imgproc.obj \
-	$(OUTDIR)\inline.obj \
 	$(OUTDIR)\insdel.obj \
 	$(OUTDIR)\intl.obj \
 	$(OUTDIR)\keymap.obj \
@@ -787,7 +798,7 @@
 	del *.obj
 	del *.sbr
 	del *.lib
-	cd ..\$(TEMACS_DIR)
+	cd $(XEMACS)\$(TEMACS_DIR)
 	del config.h
 	del paths.h
 	del Emacs.ad.h