More changes for building the regex lib
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -109,6 +109,8 @@ DOCDIR = $(WXDIR)\docs
|
||||
HTMLDIR = $(WXDIR)\src\html
|
||||
JPEGDIR = $(WXDIR)\src\jpeg
|
||||
TIFFDIR = $(WXDIR)\src\tiff
|
||||
REGEXDIR = $(WXDIR)\src\regex
|
||||
|
||||
|
||||
{$(GENDIR)}.cpp{$(GENDIR)\$D}.obj:
|
||||
cl @<<
|
||||
@@ -172,7 +174,7 @@ setuph:
|
||||
if not exist setup.h copy setup0.h setup.h
|
||||
cd $(WXDIR)\src\msw
|
||||
|
||||
dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D $(JPEGDIR)\$D $(TIFFDIR)\$D
|
||||
dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D $(JPEGDIR)\$D $(TIFFDIR)\$D $(REGEXDIR)\$D
|
||||
|
||||
$D:
|
||||
mkdir $D
|
||||
@@ -198,6 +200,9 @@ $(JPEGDIR)\$D:
|
||||
$(TIFFDIR)\$D:
|
||||
mkdir $(TIFFDIR)\$D
|
||||
|
||||
$(REGEXDIR)\$D:
|
||||
mkdir $(REGEXDIR)\$D
|
||||
|
||||
# wxWindows library as DLL
|
||||
dll:
|
||||
nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME)
|
||||
@@ -422,7 +427,7 @@ clean_tiff:
|
||||
|
||||
regex:
|
||||
cd $(WXDIR)\src\regex
|
||||
nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
|
||||
nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) all
|
||||
cd $(WXDIR)\src\msw
|
||||
|
||||
clean_regex:
|
||||
|
Reference in New Issue
Block a user