X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2cedc12a6ab49a8d943b303a3d391c6ac59e201c..c0aadc6f40301f99cbdcc345807b808737a492bf:/src/makeprog.b32 diff --git a/src/makeprog.b32 b/src/makeprog.b32 index 0b06ef6495..59592513ea 100644 --- a/src/makeprog.b32 +++ b/src/makeprog.b32 @@ -23,21 +23,25 @@ EXEDIR = BORL !if "$(wxUSE_GUI)" == "0" IMGLIBS= !else -IMGLIBS= png_$(DEBUG_SUFFIX) jpeg_$(DEBUG_SUFFIX) tiff_$(DEBUG_SUFFIX) +IMGLIBS= png_bc$(DEBUG_SUFFIX) jpeg_bc$(DEBUG_SUFFIX) tiff_bc$(DEBUG_SUFFIX) +!endif + +!if "$(FINAL)" == "0" +EX_LIBS=$(EXTRALIBS:.lib=_bcd.lib) +!else +EX_LIBS=$(EXTRALIBS:.lib=_bc.lib) !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_bc$(DEBUG_SUFFIX) zlib_bc$(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_bc$(DEBUG_SUFFIX) zlib_bc$(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 @@ -47,12 +51,12 @@ LINKOUT = /aa !if "$(FINAL)" == "0" #LINKFLAGS=/v /c /Tpe $(LNKCFG) $(EXTRALINKFLAGS) -LINKFLAGS=/v /c $(LINKOUT) -L$(WXLIBDIR);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk $(EXTRALINKFLAGS) +LINKFLAGS=/v /c $(LINKOUT) -L"$(WXLIBDIR);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk" $(EXTRALINKFLAGS) OPT = -Od DEBUG_FLAGS= -v !else #LINKFLAGS=/Tpe +$(LNKCFG) $(EXTRALINKFLAGS) -LINKFLAGS=$(LINKOUT) -L$(WXLIBDIR);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk $(EXTRALINKFLAGS) +LINKFLAGS=$(LINKOUT) -L"$(WXLIBDIR);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk" $(EXTRALINKFLAGS) OPT = -Od DEBUG_FLAGS = !endif @@ -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,23 @@ $(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) {$< } +!if "$(wxUSE_GUI)" != "0" +#make resources only with GUI apps $(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) +!endif 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?