Merge new item attributes if any are already existing

[wxWidgets.git] / src / makebcc.env

diff --git a/src/makebcc.env b/src/makebcc.env
index 1bbebd62499661a5a3e443bc8104b90df9c7b14b..e9c4876f741036d87e9f372abbeb06f38161d7e2 100644 (file)
--- a/src/makebcc.env
+++ b/src/makebcc.env
@@ -4,25 +4,24 @@ WXDIR = $(WXWIN)
 
 CFG = $(WXDIR)\src\msw\wxwin.cfg
 WXLIBDIR = $(WXDIR)\lib
-WXINC = $(WXDIR)\include
+WXLIBDIR2 = $(WXDIR)\contrib\lib
+WXINC = $(WXDIR)\include;$(WXDIR)\contrib\include
 
 !ifndef FINAL
 FINAL=0
 !endif
 
 !if "$(FINAL)" == "0"
-LINKFLAGS=/v/Vt /Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
+LINKFLAGS=/v/Vt /Twe /L$(WXDIR)\lib;$(WXDIR)\contrib\lib;$(BCCDIR)\lib $(EXTRALINKFLAGS)
 OPT = -Od
 DEBUG_FLAGS= -v -D__WXDEBUG__
 !else
-LINKFLAGS=/Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
+LINKFLAGS=/Twe /L$(WXDIR)\lib;$(WXDIR)\contrib\lib;$(BCCDIR)\lib $(EXTRALINKFLAGS)
 OPT = -O2
 DEBUG_FLAGS =
 !endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
 
+CPPFLAGS=$(DEBUG_FLAGS) $(OPT) $(EXTRACPPFLAGS) @$(CFG)
 WXLIB= $(WXLIBDIR)\wx.lib
 
 SRCSUFF = cpp