[ 1216436 ] cleanup 'shadow variable' warnings from gcc in headers.

[wxWidgets.git] / src / makeb32.env

diff --git a/src/makeb32.env b/src/makeb32.env
index b22614cde452e221c68836168c6a8179d7f5a187..21351f5b0113fee7b56114d6ae5c07d826aa4f4e 100644 (file)
--- a/src/makeb32.env
+++ b/src/makeb32.env
@@ -1,12 +1,14 @@
 # Common settings for Borland 32-bit compilation (makefile.b32 files)
 
 !if "$(RM)" == ""
 # Common settings for Borland 32-bit compilation (makefile.b32 files)
 
 !if "$(RM)" == ""

-RM= erase
+RM= del

 !endif
 
 BORLAND_SUFFIX=bc
 DEBUG_SUFFIX=
 
 !endif
 
 BORLAND_SUFFIX=bc
 DEBUG_SUFFIX=
 

+MAKEFLAGS=FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) OUTPUTDIR=$(OUTPUTDIR) EXEDIR=$(EXEDIR)
+

 WXDIR = $(WXWIN)
 CFG = wxw32
 
 WXDIR = $(WXWIN)
 CFG = wxw32
 


@@ -135,7 +137,7 @@ INCEXT=dll$(INCEXT)
 # final names determined here
 WXLIB=$(WXLIBDIR)\$(WXLIBNAME)_$(BORLAND_SUFFIX)$(DEBUG_SUFFIX).lib
 WXDLL=$(WXLIBDIR)\$(WXLIBNAME)_$(BORLAND_SUFFIX)$(DEBUG_SUFFIX).dll
 # final names determined here
 WXLIB=$(WXLIBDIR)\$(WXLIBNAME)_$(BORLAND_SUFFIX)$(DEBUG_SUFFIX).lib
 WXDLL=$(WXLIBDIR)\$(WXLIBNAME)_$(BORLAND_SUFFIX)$(DEBUG_SUFFIX).dll

-LIBTARGET=$(WXLIBDIR)\$(LIBTARGET)_$(DEBUG_SUFFIX).lib
+LIBTARGET=$(WXLIBDIR)\$(LIBTARGET)_bc$(DEBUG_SUFFIX).lib

 OBJ_PATH=$(OBJ_PATH)_$(BORLAND_SUFFIX)$(DEBUG_SUFFIX)
 
 !if "$(WXMAKINGDLL)" == "1"
 OBJ_PATH=$(OBJ_PATH)_$(BORLAND_SUFFIX)$(DEBUG_SUFFIX)
 
 !if "$(WXMAKINGDLL)" == "1"


@@ -165,7 +167,7 @@ OBJSUFF = obj
 WAITFLAG = /w
 
 .$(SRCSUFF).obj:
 WAITFLAG = /w
 
 .$(SRCSUFF).obj:

-    bcc32 $(CPPFLAGS) -c -o$(OBJ_PATH)\$(<B).obj {$< }
+    bcc32 $(CPPFLAGS) -c -n$(OBJ_PATH) {$< }

 
 .c.obj:
 
 .c.obj:

-    bcc32 $(CPPFLAGS) -P- -c -o$(OBJ_PATH)\$(<B).obj {$< }
+    bcc32 $(CPPFLAGS) -P- -c -n$(OBJ_PATH) {$< }