Distrib things

[wxWidgets.git] / src / makebcc.env

diff --git a/src/makebcc.env b/src/makebcc.env
index 70b5f4338810d22dfa99568530294fb889c9f336..302872beb5eef658de278fa0d78d98ea7abe2e20 100644 (file)
--- a/src/makebcc.env
+++ b/src/makebcc.env
@@ -2,32 +2,32 @@
 
 WXDIR = $(WXWIN)
 
 
 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
+WXINC = $(WXDIR)\include

 
 !ifndef FINAL
 FINAL=0
 !endif
 
 !if "$(FINAL)" == "0"
 
 !ifndef FINAL
 FINAL=0
 !endif
 
 !if "$(FINAL)" == "0"

-LINKFLAGS=/v/Vt /Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
+LINKFLAGS=/v/Vt /Twe /L$(WXDIR)\lib;$(BCCDIR)\lib $(EXTRALINKFLAGS)

 OPT = -Od
 OPT = -Od

-DEBUG_FLAGS= -v -D__WXDEBUG__ -DWXDEBUG=1
+DEBUG_FLAGS= -v -D__WXDEBUG__

 !else
 !else

-LINKFLAGS=/Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
+LINKFLAGS=/Twe /L$(WXDIR)\lib;$(BCCDIR)\lib $(EXTRALINKFLAGS)

 OPT = -O2
 DEBUG_FLAGS =
 !endif
 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 {$< }
 
 SRCSUFF = cpp
 OBJSUFF = obj
 
 .$(SRCSUFF).obj:
         bcc $(CPPFLAGS) -c {$< }

+
+.c.obj:
+       bcc $(CPPFLAGS) -DUSE_DEFINE -P- -c {$< }