From bed118ca9e15aa83bc69bd38ac014123ba2477a2 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 28 Sep 2001 14:35:17 +0000 Subject: [PATCH 1/1] applied patch for regex building with BC++ (patch 463140) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11721 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/msw/tmake/b32.t | 16 +++++++++++++--- src/msw/makefile.b32 | 16 +++++++++++++--- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/distrib/msw/tmake/b32.t b/distrib/msw/tmake/b32.t index e3350acf23..cf27dc87c4 100644 --- a/distrib/msw/tmake/b32.t +++ b/distrib/msw/tmake/b32.t @@ -112,14 +112,14 @@ PERIPH_CLEAN_TARGET=clean_ctl3d $(PERIPH_CLEAN_TARGET) #PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\jpeg.lib $(WXDIR)\lib\tiff.lib $(PERIPH_LIBS) PERIPH_LIBS= -PERIPH_TARGET=zlib png jpeg tiff $(PERIPH_TARGET) -PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff $(PERIPH_CLEAN_TARGET) +PERIPH_TARGET=zlib png jpeg tiff regex $(PERIPH_TARGET) +PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff clean_regex $(PERIPH_CLEAN_TARGET) !if "$(DLL)" == "0" DUMMY=dummy !else DUMMY=dummydll -LIBS= cw32mti import32 ole2w32 odbc32 zlib winpng jpeg tiff +LIBS= cw32mti import32 ole2w32 odbc32 zlib winpng jpeg tiff regex !endif LIBTARGET=$(WXLIB) @@ -306,6 +306,16 @@ clean_jpeg: make -f makefile.b32 clean cd $(WXDIR)\src\msw +regex: $(CFG) + cd $(WXDIR)\src\regex + make -f makefile.b32 lib + cd $(WXDIR)\src\msw + +clean_regex: + cd $(WXDIR)\src\regex + make -f makefile.b32 clean + cd $(WXDIR)\src\msw + tiff: $(CFG) cd $(WXDIR)\src\tiff make -f makefile.b32 lib diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32 index 282b07eaa9..3fbea38d8f 100644 --- a/src/msw/makefile.b32 +++ b/src/msw/makefile.b32 @@ -51,14 +51,14 @@ PERIPH_CLEAN_TARGET=clean_ctl3d $(PERIPH_CLEAN_TARGET) #PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\jpeg.lib $(WXDIR)\lib\tiff.lib $(PERIPH_LIBS) PERIPH_LIBS= -PERIPH_TARGET=zlib png jpeg tiff $(PERIPH_TARGET) -PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff $(PERIPH_CLEAN_TARGET) +PERIPH_TARGET=zlib png jpeg tiff regex $(PERIPH_TARGET) +PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff clean_regex $(PERIPH_CLEAN_TARGET) !if "$(DLL)" == "0" DUMMY=dummy !else DUMMY=dummydll -LIBS= cw32mti import32 ole2w32 odbc32 zlib winpng jpeg tiff +LIBS= cw32mti import32 ole2w32 odbc32 zlib winpng jpeg tiff regex !endif LIBTARGET=$(WXLIB) @@ -1019,6 +1019,16 @@ jpeg: $(CFG) cd $(WXDIR)\src\jpeg make -f makefile.b32 cd $(WXDIR)\src\msw + make -f makefile.b32 clean + cd $(WXDIR)\src\msw + +regex: $(CFG) + cd $(WXDIR)\src\regex + make -f makefile.b32 + cd $(WXDIR)\src\msw + +clean_regex: + cd $(WXDIR)\src\regex clean_jpeg: cd $(WXDIR)\src\jpeg -- 2.45.2