X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..a29ffc34c07e0408a798538b268d4733ee62965c:/src/makeprog.b32 diff --git a/src/makeprog.b32 b/src/makeprog.b32 index 57d43f8396..880ac4a44b 100644 --- a/src/makeprog.b32 +++ b/src/makeprog.b32 @@ -8,19 +8,20 @@ # 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 xpm tiff odbc32 +LIBS=$(WXLIB) $(EXTRALIBS) cw32mti import32 ole2w32 winpng regex zlib jpeg tiff odbc32 !else -LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng zlib jpeg xpm 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 -#LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng zlib xpm tiff +#LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng zlib tiff !if "$(FINAL)" == "0" #LINKFLAGS=/v /c /Tpe $(LNKCFG) $(EXTRALINKFLAGS)