Mercurial > vim

changeset 185:037369688e14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.0057
author vimboss
date Mon, 07 Mar 2005 23:03:19 +0000
parents 476198990769
children 5f559eb69ed8
files src/Make_bc5.mak src/Make_cyg.mak
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/Make_bc5.mak
+++ b/src/Make_bc5.mak
@@ -605,7 +605,7 @@ vimobj = $(vimobj) \
 
 !if ("$(NETBEANS)"=="yes")
 vimobj = $(vimobj) \
-    $(OBJDIR)\netbeans.obj $(OBJDIR)\gui_beval.obj
+    $(OBJDIR)\netbeans.obj
 !endif
 
 !ifdef XPM
@@ -628,6 +628,7 @@ DLLTARGET = joebob
 vimobj = $(vimobj) \
 	$(vimwinmain) \
 	$(OBJDIR)\gui.obj \
+	$(OBJDIR)\gui_beval.obj \
 	$(OBJDIR)\gui_w32.obj
 !endif
 
--- a/src/Make_cyg.mak
+++ b/src/Make_cyg.mak
@@ -329,7 +329,7 @@ ifeq ($(GUI),yes)
 ifeq (yes, $(NETBEANS))
 # Only allow NETBEANS for a GUI build.
 DEFINES += -DFEAT_NETBEANS_INTG
-EXTRA_OBJS += $(OUTDIR)/netbeans.o $(OUTDIR)/gui_beval.o
+EXTRA_OBJS += $(OUTDIR)/netbeans.o
 EXTRA_LIBS += -lwsock32
 
 ifeq (yes, $(NBDEBUG))
@@ -352,7 +352,7 @@ endif
 EXE = gvim$(DEBUG_SUFFIX).exe
 OUTDIR = gobj$(DEBUG_SUFFIX)
 DEFINES += -DFEAT_GUI_W32 -DFEAT_CLIPBOARD
-EXTRA_OBJS += $(OUTDIR)/gui.o $(OUTDIR)/gui_w32.o $(OUTDIR)/os_w32exe.o
+EXTRA_OBJS += $(OUTDIR)/gui.o $(OUTDIR)/gui_w32.o $(OUTDIR)/gui_beval.o $(OUTDIR)/os_w32exe.o
 EXTRA_LIBS += -mwindows -lcomctl32
 else
 EXE = vim$(DEBUG_SUFFIX).exe