X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b2aef89b7a675805b601e757492c982031f38d21..d77d9398e423e48984ef5c290b6b029ed3d599fd:/src/makebcc.env

diff --git a/src/makebcc.env b/src/makebcc.env
index 70b5f43388..e9c4876f74 100644
--- a/src/makebcc.env
+++ b/src/makebcc.env
@@ -2,32 +2,33 @@
 
 WXDIR = $(WXWIN)
 
-CFG = $(WXDIR)\src\wxwin.cfg
-WXLIB = $(WXDIR)\lib
-WXINC = $(WXDIR)\include\msw
-WXBASEINC = $(WXDIR)\include\base
+CFG = $(WXDIR)\src\msw\wxwin.cfg
+WXLIBDIR = $(WXDIR)\lib
+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__ -DWXDEBUG=1
+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)
-
-LIBTARGET= $(WXLIB)\wx.lib
+CPPFLAGS=$(DEBUG_FLAGS) $(OPT) $(EXTRACPPFLAGS) @$(CFG)
+WXLIB= $(WXLIBDIR)\wx.lib
 
 SRCSUFF = cpp
 OBJSUFF = obj
 
 .$(SRCSUFF).obj:
         bcc $(CPPFLAGS) -c {$< }
+
+.c.obj:
+	bcc $(CPPFLAGS) -DUSE_DEFINE -P- -c {$< }