applied patch 432202 (allow installing in already existing directories)

[wxWidgets.git] / src / makeprog.b32

diff --git a/src/makeprog.b32 b/src/makeprog.b32
index 57d43f8396feeaf2b43b629028a8fa28bb0966c2..d53a56e9e2bc0074fe879e446ed9bf4a3d3bea84 100644 (file)
--- a/src/makeprog.b32
+++ b/src/makeprog.b32
@@ -14,13 +14,13 @@ WXDIR = $(WXWIN)
 !include $(WXDIR)\src\makeb32.env
 
 !if "$(WXUSINGDLL)" == "1"
 !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
 !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
 !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)
 
 !if "$(FINAL)" == "0"
 #LINKFLAGS=/v /c /Tpe $(LNKCFG) $(EXTRALINKFLAGS)