cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

applied patch for regex building with BC++ (patch 463140)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11721 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2001-09-28 14:35:17 +00:00
parent 6c5ac6e1f1
commit bed118ca9e
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
distrib/msw/tmake/b32.t
View File

@ -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=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\jpeg.lib $(WXDIR)\lib\tiff.lib $(PERIPH_LIBS)
PERIPH_LIBS= PERIPH_LIBS=
PERIPH_TARGET=zlib png jpeg tiff $(PERIPH_TARGET) PERIPH_TARGET=zlib png jpeg tiff regex $(PERIPH_TARGET)
PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff $(PERIPH_CLEAN_TARGET) PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff clean_regex $(PERIPH_CLEAN_TARGET)
!if "$(DLL)" == "0" !if "$(DLL)" == "0"
DUMMY=dummy DUMMY=dummy
!else !else
DUMMY=dummydll DUMMY=dummydll
LIBS= cw32mti import32 ole2w32 odbc32 zlib winpng jpeg tiff LIBS= cw32mti import32 ole2w32 odbc32 zlib winpng jpeg tiff regex
!endif !endif
LIBTARGET=$(WXLIB) LIBTARGET=$(WXLIB)
@ -306,6 +306,16 @@ clean_jpeg:
make -f makefile.b32 clean make -f makefile.b32 clean
cd $(WXDIR)\src\msw 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) tiff: $(CFG)
cd $(WXDIR)\src\tiff cd $(WXDIR)\src\tiff
make -f makefile.b32 lib make -f makefile.b32 lib

16
src/msw/makefile.b32
View File

@ -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=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\jpeg.lib $(WXDIR)\lib\tiff.lib $(PERIPH_LIBS)
PERIPH_LIBS= PERIPH_LIBS=
PERIPH_TARGET=zlib png jpeg tiff $(PERIPH_TARGET) PERIPH_TARGET=zlib png jpeg tiff regex $(PERIPH_TARGET)
PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff $(PERIPH_CLEAN_TARGET) PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff clean_regex $(PERIPH_CLEAN_TARGET)
!if "$(DLL)" == "0" !if "$(DLL)" == "0"
DUMMY=dummy DUMMY=dummy
!else !else
DUMMY=dummydll DUMMY=dummydll
LIBS= cw32mti import32 ole2w32 odbc32 zlib winpng jpeg tiff LIBS= cw32mti import32 ole2w32 odbc32 zlib winpng jpeg tiff regex
!endif !endif
LIBTARGET=$(WXLIB) LIBTARGET=$(WXLIB)
@ -1019,6 +1019,16 @@ jpeg: $(CFG)
cd $(WXDIR)\src\jpeg cd $(WXDIR)\src\jpeg
make -f makefile.b32 make -f makefile.b32
cd $(WXDIR)\src\msw 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: clean_jpeg:
cd $(WXDIR)\src\jpeg cd $(WXDIR)\src\jpeg