X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/741f371c68fcb2d18d8cb726b656ceb2d1961de3..1be06faf7318abf88a35b299b90ceb2a49c0353b:/src/makeprog.b32 diff --git a/src/makeprog.b32 b/src/makeprog.b32 index df95b0e0db..57d43f8396 100644 --- a/src/makeprog.b32 +++ b/src/makeprog.b32 @@ -13,7 +13,11 @@ WXDIR = $(WXWIN) !include $(WXDIR)\src\makeb32.env +!if "$(WXUSINGDLL)" == "1" +LIBS=$(WXLIB) $(EXTRALIBS) cw32mti import32 ole2w32 winpng zlib jpeg xpm tiff odbc32 +!else LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng zlib jpeg xpm tiff 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 xpm tiff @@ -30,7 +34,7 @@ OPT = -Od DEBUG_FLAGS = !endif -CPPFLAGS=$(DEBUG_FLAGS) $(EXTRACPPFLAGS) $(OPT) @$(CFG) +CPPFLAGS=$(CPPFLAGS) $(DEBUG_FLAGS) $(OPT) all: $(TARGET).exe $(EXTRATARGETS)