X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6244848856584171db8cd74a7ff227250e46cc54..b838cfc9151aea38402ad2b1ba5d2f97cf94e973:/src/makebcc.env?ds=sidebyside diff --git a/src/makebcc.env b/src/makebcc.env index 1bbebd6249..e9c4876f74 100644 --- 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