Added rules to build the regex library from the main makefile, if
needed. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11077 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
11ec1f16f8
commit
8e673075f6
@ -162,7 +162,7 @@ HTMLOBJS = #$ ExpandList("WXHTMLOBJS");
|
|||||||
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
|
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
|
||||||
|
|
||||||
# Normal, static library
|
# Normal, static library
|
||||||
all: setuph dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib jpeg tiff $(LIBTARGET)
|
all: setuph dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib jpeg tiff regex $(LIBTARGET)
|
||||||
|
|
||||||
setuph:
|
setuph:
|
||||||
cd $(WXDIR)\include\wx\msw
|
cd $(WXDIR)\include\wx\msw
|
||||||
@ -407,12 +407,22 @@ clean_tiff:
|
|||||||
nmake -f makefile.vc clean
|
nmake -f makefile.vc clean
|
||||||
cd $(WXDIR)\src\msw
|
cd $(WXDIR)\src\msw
|
||||||
|
|
||||||
|
regex:
|
||||||
|
cd $(WXDIR)\src\regex
|
||||||
|
nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
|
||||||
|
cd $(WXDIR)\src\msw
|
||||||
|
|
||||||
|
clean_regex:
|
||||||
|
cd $(WXDIR)\src\regex
|
||||||
|
nmake -f makefile.vc clean
|
||||||
|
cd $(WXDIR)\src\msw
|
||||||
|
|
||||||
rcparser:
|
rcparser:
|
||||||
cd $(WXDIR)\utils\rcparser\src
|
cd $(WXDIR)\utils\rcparser\src
|
||||||
nmake -f makefile.vc FINAL=$(FINAL)
|
nmake -f makefile.vc FINAL=$(FINAL)
|
||||||
cd $(WXDIR)\src\msw
|
cd $(WXDIR)\src\msw
|
||||||
|
|
||||||
cleanall: clean clean_png clean_zlib clean_jpeg clean_tiff
|
cleanall: clean clean_png clean_zlib clean_jpeg clean_tiff clean_regex
|
||||||
-erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).dll
|
-erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).dll
|
||||||
-erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).lib
|
-erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).lib
|
||||||
-erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).exp
|
-erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).exp
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# This file was automatically generated by tmake at 20:55, 2001/07/13
|
# This file was automatically generated by tmake at 17:17, 2001/07/16
|
||||||
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
|
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
|
||||||
|
|
||||||
# File: makefile.vc
|
# File: makefile.vc
|
||||||
@ -379,7 +379,7 @@ HTMLOBJS = $(HTMLDIR)\$D\helpctrl.obj \
|
|||||||
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
|
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
|
||||||
|
|
||||||
# Normal, static library
|
# Normal, static library
|
||||||
all: setuph dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib jpeg tiff $(LIBTARGET)
|
all: setuph dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib jpeg tiff regex $(LIBTARGET)
|
||||||
|
|
||||||
setuph:
|
setuph:
|
||||||
cd $(WXDIR)\include\wx\msw
|
cd $(WXDIR)\include\wx\msw
|
||||||
@ -624,12 +624,22 @@ clean_tiff:
|
|||||||
nmake -f makefile.vc clean
|
nmake -f makefile.vc clean
|
||||||
cd $(WXDIR)\src\msw
|
cd $(WXDIR)\src\msw
|
||||||
|
|
||||||
|
regex:
|
||||||
|
cd $(WXDIR)\src\regex
|
||||||
|
nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
|
||||||
|
cd $(WXDIR)\src\msw
|
||||||
|
|
||||||
|
clean_regex:
|
||||||
|
cd $(WXDIR)\src\regex
|
||||||
|
nmake -f makefile.vc clean
|
||||||
|
cd $(WXDIR)\src\msw
|
||||||
|
|
||||||
rcparser:
|
rcparser:
|
||||||
cd $(WXDIR)\utils\rcparser\src
|
cd $(WXDIR)\utils\rcparser\src
|
||||||
nmake -f makefile.vc FINAL=$(FINAL)
|
nmake -f makefile.vc FINAL=$(FINAL)
|
||||||
cd $(WXDIR)\src\msw
|
cd $(WXDIR)\src\msw
|
||||||
|
|
||||||
cleanall: clean clean_png clean_zlib clean_jpeg clean_tiff
|
cleanall: clean clean_png clean_zlib clean_jpeg clean_tiff clean_regex
|
||||||
-erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).dll
|
-erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).dll
|
||||||
-erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).lib
|
-erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).lib
|
||||||
-erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).exp
|
-erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).exp
|
||||||
|
Loading…
Reference in New Issue
Block a user