Mercurial > hg > xemacs-beta
comparison nt/xemacs.mak @ 827:28426972f654
[xemacs-hg @ 2002-05-06 14:14:33 by jhar]
Misc win32 native build and doc fixes
author | jhar |
---|---|
date | Mon, 06 May 2002 14:16:31 +0000 |
parents | 6728e641994e |
children | 9c4fcc216a5f |
comparison
equal
deleted
inserted
replaced
826:6728e641994e | 827:28426972f654 |
---|---|
149 !if !defined(HAVE_GIF) | 149 !if !defined(HAVE_GIF) |
150 HAVE_GIF=1 | 150 HAVE_GIF=1 |
151 !endif | 151 !endif |
152 !if !defined(HAVE_GTK) | 152 !if !defined(HAVE_GTK) |
153 HAVE_GTK=0 | 153 HAVE_GTK=0 |
154 !endif | |
155 !if !defined(HAVE_MENUBARS) | |
156 HAVE_MENUBARS=1 | |
157 !endif | |
158 !if !defined(HAVE_SCROLLBARS) | |
159 HAVE_SCROLLBARS=1 | |
154 !endif | 160 !endif |
155 !if !defined(HAVE_TOOLBARS) | 161 !if !defined(HAVE_TOOLBARS) |
156 HAVE_TOOLBARS=$(HAVE_XPM) | 162 HAVE_TOOLBARS=$(HAVE_XPM) |
157 !endif | 163 !endif |
158 !if !defined(HAVE_DIALOGS) | 164 !if !defined(HAVE_DIALOGS) |
367 !endif | 373 !endif |
368 | 374 |
369 CFLAGS_NO_LIB=-nologo -W3 $(DEBUGFLAGS) $(OPTFLAGS) | 375 CFLAGS_NO_LIB=-nologo -W3 $(DEBUGFLAGS) $(OPTFLAGS) |
370 CFLAGS=$(CFLAGS_NO_LIB) $(C_LIBFLAG) | 376 CFLAGS=$(CFLAGS_NO_LIB) $(C_LIBFLAG) |
371 | 377 |
372 | |
373 !if $(HAVE_X_WINDOWS) | 378 !if $(HAVE_X_WINDOWS) |
374 X_DEFINES=-DHAVE_X_WINDOWS | 379 X_DEFINES=-DHAVE_X_WINDOWS |
375 X_INCLUDES=-I$(X11_DIR)\include | 380 X_INCLUDES=-I$(X11_DIR)\include |
376 X_LIBS=-libpath:$(X11_DIR)\lib Xaw.lib Xmu.lib Xt.lib SM.lib ICE.lib Xext.lib X11.lib | 381 X_LIBS=-libpath:$(X11_DIR)\lib Xaw.lib Xmu.lib Xt.lib SM.lib ICE.lib Xext.lib X11.lib |
377 !endif | 382 !endif |
378 | 383 |
379 !if $(HAVE_MS_WINDOWS) | 384 !if $(HAVE_MS_WINDOWS) |
380 MSW_DEFINES=-DHAVE_MS_WINDOWS -DHAVE_SCROLLBARS -DHAVE_MENUBARS | 385 MSW_DEFINES=-DHAVE_MS_WINDOWS |
381 MSW_INCLUDES= | 386 MSW_INCLUDES= |
382 MSW_LIBS= | 387 MSW_LIBS=comctl32.lib |
388 | |
383 !if $(HAVE_MSW_C_DIRED) | 389 !if $(HAVE_MSW_C_DIRED) |
384 MSW_DEFINES=$(MSW_DEFINES) -DHAVE_MSW_C_DIRED | 390 MSW_DEFINES=$(MSW_DEFINES) -DHAVE_MSW_C_DIRED |
385 MSW_C_DIRED_OBJ=$(OUTDIR)\dired-msw.obj | 391 MSW_C_DIRED_OBJ=$(OUTDIR)\dired-msw.obj |
386 !endif | 392 !endif |
387 !if $(HAVE_XPM) | 393 !if $(HAVE_XPM) |
416 !if $(HAVE_ZLIB) | 422 !if $(HAVE_ZLIB) |
417 MSW_DEFINES=$(MSW_DEFINES) -DHAVE_ZLIB | 423 MSW_DEFINES=$(MSW_DEFINES) -DHAVE_ZLIB |
418 MSW_INCLUDES=$(MSW_INCLUDES) -I"$(ZLIB_DIR)" | 424 MSW_INCLUDES=$(MSW_INCLUDES) -I"$(ZLIB_DIR)" |
419 MSW_LIBS=$(MSW_LIBS) "$(ZLIB_DIR)\zlib.lib" | 425 MSW_LIBS=$(MSW_LIBS) "$(ZLIB_DIR)\zlib.lib" |
420 !endif | 426 !endif |
427 !if $(HAVE_MENUBARS) | |
428 MSW_DEFINES=$(MSW_DEFINES) -DHAVE_MENUBARS | |
429 MSW_MENUBAR_OBJ=$(OUTDIR)\menubar.obj $(OUTDIR)\menubar-msw.obj | |
430 !endif | |
431 !if $(HAVE_SCROLLBARS) | |
432 MSW_DEFINES=$(MSW_DEFINES) -DHAVE_SCROLLBARS | |
433 MSW_SCROLLBAR_OBJ=$(OUTDIR)\scrollbar.obj $(OUTDIR)\scrollbar-msw.obj | |
434 !endif | |
421 !if $(HAVE_TOOLBARS) | 435 !if $(HAVE_TOOLBARS) |
422 MSW_DEFINES=$(MSW_DEFINES) -DHAVE_TOOLBARS | 436 MSW_DEFINES=$(MSW_DEFINES) -DHAVE_TOOLBARS |
423 MSW_TOOLBAR_OBJ=$(OUTDIR)\toolbar.obj $(OUTDIR)\toolbar-msw.obj | 437 MSW_TOOLBAR_OBJ=$(OUTDIR)\toolbar.obj $(OUTDIR)\toolbar-msw.obj |
424 !endif | 438 !endif |
425 !if $(HAVE_WIDGETS) | 439 !if $(HAVE_WIDGETS) |
426 MSW_DEFINES=$(MSW_DEFINES) -DHAVE_WIDGETS | 440 MSW_DEFINES=$(MSW_DEFINES) -DHAVE_WIDGETS |
427 !endif | |
428 !if $(HAVE_TOOLBARS) || $(HAVE_WIDGETS) | |
429 MSW_LIBS=$(MSW_LIBS) comctl32.lib | |
430 !endif | 441 !endif |
431 !if $(HAVE_DIALOGS) | 442 !if $(HAVE_DIALOGS) |
432 MSW_DEFINES=$(MSW_DEFINES) -DHAVE_DIALOGS | 443 MSW_DEFINES=$(MSW_DEFINES) -DHAVE_DIALOGS |
433 MSW_DIALOG_OBJ=$(OUTDIR)\dialog.obj $(OUTDIR)\dialog-msw.obj | 444 MSW_DIALOG_OBJ=$(OUTDIR)\dialog.obj $(OUTDIR)\dialog-msw.obj |
434 !endif | 445 !endif |
543 !endif | 554 !endif |
544 | 555 |
545 # Inferred rule | 556 # Inferred rule |
546 {$(LIB_SRC)}.c{$(LIB_SRC)}.exe : | 557 {$(LIB_SRC)}.c{$(LIB_SRC)}.exe : |
547 cd $(LIB_SRC) | 558 cd $(LIB_SRC) |
548 $(CCV) -I. -I$(XEMACS)/src -I$(XEMACS)/nt/inc $(LIB_SRC_DEFINES) $(CFLAGS) -Fe$@ $** -link -incremental:no setargv.obj | 559 $(CCV) -I$(LIB_SRC) -I$(SRC) $(LIB_SRC_DEFINES) $(CFLAGS) -Fe$@ -Fd$* $** -link -incremental:no setargv.obj user32.lib wsock32.lib |
549 cd $(NT) | 560 cd $(NT) |
550 | 561 |
551 # Individual dependencies | 562 # Individual dependencies |
552 ETAGS_DEPS = $(LIB_SRC)/getopt.c $(LIB_SRC)/getopt1.c $(SRC)/regex.c | 563 ETAGS_DEPS = $(LIB_SRC)/getopt.c $(LIB_SRC)/getopt1.c $(SRC)/regex.c |
553 $(LIB_SRC)/etags.exe : $(LIB_SRC)/etags.c $(ETAGS_DEPS) | 564 $(LIB_SRC)/etags.exe : $(LIB_SRC)/etags.c $(ETAGS_DEPS) |
554 $(LIB_SRC)/movemail.exe: $(LIB_SRC)/movemail.c $(LIB_SRC)/pop.c $(ETAGS_DEPS) | 565 $(LIB_SRC)/movemail.exe : $(LIB_SRC)/movemail.c $(LIB_SRC)/pop.c $(ETAGS_DEPS) |
566 | |
567 $(LIB_SRC)/minitar.exe : $(NT)/minitar.c | |
555 cd $(LIB_SRC) | 568 cd $(LIB_SRC) |
556 $(CCV) -I. -I$(XEMACS)/src -I$(XEMACS)/nt/inc $(LIB_SRC_DEFINES) $(CFLAGS) -Fe$@ $** wsock32.lib -link -incremental:no | 569 $(CCV) -I"$(ZLIB_DIR)" $(LIB_SRC_DEFINES) $(CFLAGS_NO_LIB) -Fe$@ -Fd$* $** -link -incremental:no "$(ZLIB_DIR)\zlib.lib" |
557 cd $(NT) | 570 cd $(NT) |
558 | |
559 $(LIB_SRC)/winclient.exe: $(LIB_SRC)/winclient.c | |
560 cd $(LIB_SRC) | |
561 $(CCV) -I. -I$(XEMACS)/src -I$(XEMACS)/nt/inc $(LIB_SRC_DEFINES) $(CFLAGS) -Fe$@ $** user32.lib -link -incremental:no | |
562 cd $(NT) | |
563 | |
564 $(LIB_SRC)/minitar.exe : $(NT)/minitar.c | |
565 $(CCV) -I"$(ZLIB_DIR)" $(LIB_SRC_DEFINES) $(CFLAGS_NO_LIB) -Fe$@ $** "$(ZLIB_DIR)\zlib.lib" -link -incremental:no | |
566 | 571 |
567 LIB_SRC_TOOLS = \ | 572 LIB_SRC_TOOLS = \ |
568 $(LIB_SRC)/etags.exe \ | 573 $(LIB_SRC)/etags.exe \ |
569 $(LIB_SRC)/hexl.exe \ | 574 $(LIB_SRC)/hexl.exe \ |
570 $(LIB_SRC)/i.exe \ | 575 $(LIB_SRC)/i.exe \ |
729 $(OUTDIR)\device-msw.obj \ | 734 $(OUTDIR)\device-msw.obj \ |
730 $(OUTDIR)\event-msw.obj \ | 735 $(OUTDIR)\event-msw.obj \ |
731 $(OUTDIR)\frame-msw.obj \ | 736 $(OUTDIR)\frame-msw.obj \ |
732 $(OUTDIR)\glyphs-msw.obj \ | 737 $(OUTDIR)\glyphs-msw.obj \ |
733 $(OUTDIR)\gui-msw.obj \ | 738 $(OUTDIR)\gui-msw.obj \ |
734 $(OUTDIR)\menubar-msw.obj \ | |
735 $(OUTDIR)\objects-msw.obj \ | 739 $(OUTDIR)\objects-msw.obj \ |
736 $(OUTDIR)\redisplay-msw.obj \ | 740 $(OUTDIR)\redisplay-msw.obj \ |
737 $(OUTDIR)\scrollbar-msw.obj \ | |
738 $(OUTDIR)\select-msw.obj \ | 741 $(OUTDIR)\select-msw.obj \ |
739 $(MSW_C_DIRED_OBJ) \ | 742 $(MSW_C_DIRED_OBJ) \ |
743 $(MSW_MENUBAR_OBJ) \ | |
744 $(MSW_SCROLLBAR_OBJ) \ | |
740 $(MSW_TOOLBAR_OBJ) \ | 745 $(MSW_TOOLBAR_OBJ) \ |
741 $(MSW_DIALOG_OBJ) \ | 746 $(MSW_DIALOG_OBJ) \ |
742 $(MSW_GIF_OBJ) | 747 $(MSW_GIF_OBJ) |
743 !endif | 748 !endif |
744 | 749 |
838 $(OUTDIR)\keymap.obj \ | 843 $(OUTDIR)\keymap.obj \ |
839 $(OUTDIR)\line-number.obj \ | 844 $(OUTDIR)\line-number.obj \ |
840 $(OUTDIR)\lread.obj \ | 845 $(OUTDIR)\lread.obj \ |
841 $(OUTDIR)\lstream.obj \ | 846 $(OUTDIR)\lstream.obj \ |
842 $(OUTDIR)\macros.obj \ | 847 $(OUTDIR)\macros.obj \ |
843 $(OUTDIR)\menubar.obj \ | |
844 $(OUTDIR)\marker.obj \ | 848 $(OUTDIR)\marker.obj \ |
845 $(OUTDIR)\md5.obj \ | 849 $(OUTDIR)\md5.obj \ |
846 $(OUTDIR)\minibuf.obj \ | 850 $(OUTDIR)\minibuf.obj \ |
847 $(OUTDIR)\nt.obj \ | 851 $(OUTDIR)\nt.obj \ |
848 $(OUTDIR)\ntplay.obj \ | 852 $(OUTDIR)\ntplay.obj \ |
855 $(OUTDIR)\rangetab.obj \ | 859 $(OUTDIR)\rangetab.obj \ |
856 $(OUTDIR)\realpath.obj \ | 860 $(OUTDIR)\realpath.obj \ |
857 $(OUTDIR)\redisplay-output.obj \ | 861 $(OUTDIR)\redisplay-output.obj \ |
858 $(OUTDIR)\redisplay.obj \ | 862 $(OUTDIR)\redisplay.obj \ |
859 $(OUTDIR)\regex.obj \ | 863 $(OUTDIR)\regex.obj \ |
860 $(OUTDIR)\scrollbar.obj \ | |
861 $(OUTDIR)\search.obj \ | 864 $(OUTDIR)\search.obj \ |
862 $(OUTDIR)\select.obj \ | 865 $(OUTDIR)\select.obj \ |
863 $(OUTDIR)\signal.obj \ | 866 $(OUTDIR)\signal.obj \ |
864 $(OUTDIR)\sound.obj \ | 867 $(OUTDIR)\sound.obj \ |
865 $(OUTDIR)\specifier.obj \ | 868 $(OUTDIR)\specifier.obj \ |