X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..137c8bde085d6d5b7c459902d2ea1a198ab48765:/src/makeprog.b32 diff --git a/src/makeprog.b32 b/src/makeprog.b32 index 2afd2304d6..59592513ea 100644 --- a/src/makeprog.b32 +++ b/src/makeprog.b32 @@ -5,29 +5,43 @@ # Updated: # Copyright: # -# Include file for samples and utilities. Set TARGET and OBJECTS -# before including this file. +# Include file for samples and utilities. Set TARGET, OBJECTS and +# TARGETDEF (if you want to include a DEF file in the build) before +# including this file. # WXWIN set by parent make # BCCDIR set in makeb32.env WXDIR = $(WXWIN) + +!ifndef EXEDIR +EXEDIR = BORL +!endif + !include $(WXDIR)\src\makeb32.env !if "$(wxUSE_GUI)" == "0" IMGLIBS= !else -IMGLIBS= winpng jpeg tiff +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 zlib $(IMGLIBS) odbc32 +LIBS=$(WXLIB) $(EX_LIBS) cw32mti import32 ole2w32 regex_bc$(DEBUG_SUFFIX) zlib_bc$(DEBUG_SUFFIX) $(IMGLIBS) !else -LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 regex zlib $(IMGLIBS) odbc32 +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 @@ -37,12 +51,12 @@ LINKOUT = /aa !if "$(FINAL)" == "0" #LINKFLAGS=/v /c /Tpe $(LNKCFG) $(EXTRALINKFLAGS) -LINKFLAGS=/v /c $(LINKOUT) -L$(WXLIBDIR);$(WXLIBDIR2);$(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);$(WXLIBDIR2);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk $(EXTRALINKFLAGS) +LINKFLAGS=$(LINKOUT) -L"$(WXLIBDIR);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk" $(EXTRALINKFLAGS) OPT = -Od DEBUG_FLAGS = !endif @@ -53,37 +67,52 @@ CPPFLAGS=$(CPPFLAGS) $(DEBUG_FLAGS) $(OPT) TARGETRES = STARTUP = c0x32.obj !else -TARGETRES = $(TARGET).res +TARGETRES = $(EXEDIR)\$(TARGET).res STARTUP = c0w32.obj !endif -all: $(TARGET).exe $(EXTRATARGETS) +EXE_TARGET=$(EXEDIR)\$(TARGET) -$(TARGET).exe: $(OBJECTS) $(TARGETRES) - $(LINK) $(LINKFLAGS) @&&! +default : all + +maked: + -if not exist $(EXEDIR)\nul mkdir $(EXEDIR) + +wx: $(EXE_TARGET).exe $(EXTRATARGETS) + +all: maked wx + + +$(EXE_TARGET).exe: $(OBJECTS) $(TARGETDEF) $(TARGETRES) + $(LINK) $(LINKFLAGS) -j$(EXEDIR) @&&! $(STARTUP) $(OBJECTS) -$(TARGET) +$(EXE_TARGET) nul $(LIBS) - +$(TARGETDEF) $(TARGETRES) ! +.path.obj=$(EXEDIR) + .$(SRCSUFF).obj: - bcc32 $(CPPFLAGS) -c {$< } + bcc32 $(CPPFLAGS) -c -n$(EXEDIR) {$< } .c.obj: - bcc32 $(CPPFLAGS) -P- -c {$< } + bcc32 $(CPPFLAGS) -P- -c -n$(EXEDIR) {$< } -$(TARGET).res : $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc - brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include /i$(WXDIR)\contrib\include $(TARGET) +!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)\$(