summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2005-03-07 23:03:19 +0000
committerBram Moolenaar <Bram@vim.org>2005-03-07 23:03:19 +0000
commit408fb62450e5b4e5eb8174d501b73a818d7048e3 (patch)
treeac93ec898ef67e08f9ff1996c455a75ca7c1ae6f
parent52b4b557a26e742a14bd6da4dff55f8e167af04e (diff)
downloadvim-git-408fb62450e5b4e5eb8174d501b73a818d7048e3.tar.gz
updated for version 7.0057
-rw-r--r--src/Make_bc5.mak3
-rw-r--r--src/Make_cyg.mak4
2 files changed, 4 insertions, 3 deletions
diff --git a/src/Make_bc5.mak b/src/Make_bc5.mak
index d05d83694..25145d94d 100644
--- 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
diff --git a/src/Make_cyg.mak b/src/Make_cyg.mak
index da98b501c..24a52ce8a 100644
--- 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