X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9d8c2f419f522408a922277df330d4c4511befb9..bf2cac26a5502fa208a4a29dd60165cb1011aeca:/src/makeprog.b32 diff --git a/src/makeprog.b32 b/src/makeprog.b32 index b1769c1602..880ac4a44b 100644 --- a/src/makeprog.b32 +++ b/src/makeprog.b32 @@ -8,15 +8,16 @@ # Include file for samples and utilities. Set TARGET and OBJECTS # before including this file. -# WXWIN and BCCDIR are set by parent make +# WXWIN set by parent make +# BCCDIR set in makeb32.env WXDIR = $(WXWIN) !include $(WXDIR)\src\makeb32.env !if "$(WXUSINGDLL)" == "1" -LIBS=$(WXLIB) $(EXTRALIBS) cw32mti import32 ole2w32 winpng zlib jpeg tiff odbc32 +LIBS=$(WXLIB) $(EXTRALIBS) cw32mti import32 ole2w32 winpng regex zlib jpeg tiff odbc32 !else -LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng zlib jpeg tiff odbc32 +LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng regex zlib jpeg tiff odbc32 !endif # Note: you may need to remove some libraries for earlier versions of BC++, as below