fix some more samples for digital mars [allow contrib to work]

[wxWidgets.git] / src / makeprog.b32

diff --git a/src/makeprog.b32 b/src/makeprog.b32
index 0b06ef64954db865787767324baffbfec78a92f2..6f941996ae9790afa762f18f2d2a826688e6beae 100644 (file)
--- a/src/makeprog.b32
+++ b/src/makeprog.b32
@@ -26,18 +26,22 @@ IMGLIBS=
 IMGLIBS= png_$(DEBUG_SUFFIX) jpeg_$(DEBUG_SUFFIX) tiff_$(DEBUG_SUFFIX)
 !endif
 
+!if "$(FINAL)" == "0"
+EX_LIBS=$(EXTRALIBS:.lib=_d.lib)
+!else
+EX_LIBS=$(EXTRALIBS)
+!endif
+
 !if "$(WXUSINGDLL)" == "1"
-LIBS=$(WXLIB) $(EXTRALIBS) cw32mti import32 ole2w32 regex_$(DEBUG_SUFFIX) zlib_$(DEBUG_SUFFIX) $(IMGLIBS) 
+LIBS=$(WXLIB) $(EX_LIBS) cw32mti import32 ole2w32 regex_$(DEBUG_SUFFIX) zlib_$(DEBUG_SUFFIX) $(IMGLIBS) 
 !else
-LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 regex_$(DEBUG_SUFFIX) zlib_$(DEBUG_SUFFIX) $(IMGLIBS)
+LIBS=$(WXLIB) $(EX_LIBS) cw32mt import32 ole2w32 regex_$(DEBUG_SUFFIX) zlib_$(DEBUG_SUFFIX) $(IMGLIBS)
 !endif
 
 !if "$(wxUSE_ODBC)" == "1"
 LIBS=$(LIBS) odbc32
 !endif
 
-# Note: you may need to remove some libraries for earlier versions of BC++, as below
-#LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng zlib tiff
 
 !if "$(wxUSE_GUI)" == "0"
 LINKOUT = /ap
@@ -72,7 +76,7 @@ EXE_TARGET=$(EXEDIR)\$(TARGET)
 default : all
 
 maked: 
-    -if not exist $(EXEDIR) mkdir $(EXEDIR)
+    -if not exist $(EXEDIR)\nul mkdir $(EXEDIR)
 
 wx: $(EXE_TARGET).exe $(EXTRATARGETS)
 
@@ -92,20 +96,20 @@ $(TARGETRES)
 .path.obj=$(EXEDIR)
 
 .$(SRCSUFF).obj:
-       bcc32 $(CPPFLAGS) -c -o$(EXEDIR)\$(<B).obj {$< }
+       bcc32 $(CPPFLAGS) -c  -n$(EXEDIR) {$< }
 
 .c.obj:
-       bcc32 $(CPPFLAGS) -P- -c -o$(EXEDIR)\$(<B).obj {$< }
+       bcc32 $(CPPFLAGS) -P- -c -n$(EXEDIR) {$< }
 
 $(TARGETRES) :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
     brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include /i$(WXDIR)\contrib\include -fo$(EXEDIR)\$(<B).res $(TARGET)
 
 clean:
-        -erase $(EXEDIR)\*.obj
-        -erase $(EXEDIR)\*.exe
-        -erase $(EXEDIR)\*.res
-        -erase $(EXEDIR)\*.map
-        -erase $(EXEDIR)\*.rws
-        -erase $(EXEDIR)\*.tds
-        -erase $(EXEDIR)\*.il?
+        -$(RM) $(EXEDIR)\*.obj
+        -$(RM) $(EXEDIR)\*.exe
+        -$(RM) $(EXEDIR)\*.res
+        -$(RM) $(EXEDIR)\*.map
+        -$(RM) $(EXEDIR)\*.rws
+        -$(RM) $(EXEDIR)\*.tds
+        -$(RM) $(EXEDIR)\*.il?