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

More changes for building the regex lib

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2001-10-08 18:05:58 +00:00
parent b9989817f4
commit 2431209ccd
3 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
distrib/msw/tmake/vc.t
View File

@@ -109,6 +109,8 @@ DOCDIR = $(WXDIR)\docs
HTMLDIR = $(WXDIR)\src\html HTMLDIR = $(WXDIR)\src\html
JPEGDIR = $(WXDIR)\src\jpeg JPEGDIR = $(WXDIR)\src\jpeg
TIFFDIR = $(WXDIR)\src\tiff TIFFDIR = $(WXDIR)\src\tiff
REGEXDIR = $(WXDIR)\src\regex
{$(GENDIR)}.cpp{$(GENDIR)\$D}.obj: {$(GENDIR)}.cpp{$(GENDIR)\$D}.obj:
cl @<< cl @<<
@@ -172,7 +174,7 @@ setuph:
if not exist setup.h copy setup0.h setup.h if not exist setup.h copy setup0.h setup.h
cd $(WXDIR)\src\msw 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: $D:
mkdir $D mkdir $D
@@ -198,6 +200,9 @@ $(JPEGDIR)\$D:
$(TIFFDIR)\$D: $(TIFFDIR)\$D:
mkdir $(TIFFDIR)\$D mkdir $(TIFFDIR)\$D
$(REGEXDIR)\$D:
mkdir $(REGEXDIR)\$D
# wxWindows library as DLL # wxWindows library as DLL
dll: dll:
nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME)
@@ -422,7 +427,7 @@ clean_tiff:
regex: regex:
cd $(WXDIR)\src\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 cd $(WXDIR)\src\msw
clean_regex: clean_regex:

11
src/msw/makefile.vc
View File

@@ -1,4 +1,4 @@
# This file was automatically generated by tmake at 10:37, 2001/10/08 # This file was automatically generated by tmake at 10:56, 2001/10/08
# 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
@@ -52,6 +52,8 @@ DOCDIR = $(WXDIR)\docs
HTMLDIR = $(WXDIR)\src\html HTMLDIR = $(WXDIR)\src\html
JPEGDIR = $(WXDIR)\src\jpeg JPEGDIR = $(WXDIR)\src\jpeg
TIFFDIR = $(WXDIR)\src\tiff TIFFDIR = $(WXDIR)\src\tiff
REGEXDIR = $(WXDIR)\src\regex
{$(GENDIR)}.cpp{$(GENDIR)\$D}.obj: {$(GENDIR)}.cpp{$(GENDIR)\$D}.obj:
cl @<< cl @<<
@@ -395,7 +397,7 @@ setuph:
if not exist setup.h copy setup0.h setup.h if not exist setup.h copy setup0.h setup.h
cd $(WXDIR)\src\msw 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: $D:
mkdir $D mkdir $D
@@ -421,6 +423,9 @@ $(JPEGDIR)\$D:
$(TIFFDIR)\$D: $(TIFFDIR)\$D:
mkdir $(TIFFDIR)\$D mkdir $(TIFFDIR)\$D
$(REGEXDIR)\$D:
mkdir $(REGEXDIR)\$D
# wxWindows library as DLL # wxWindows library as DLL
dll: dll:
nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME)
@@ -645,7 +650,7 @@ clean_tiff:
regex: regex:
cd $(WXDIR)\src\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 cd $(WXDIR)\src\msw
clean_regex: clean_regex:

8
src/regex/makefile.vc
View File

@@ -7,10 +7,10 @@ LIBTARGET=$(WXDIR)\lib\regexd.lib
!endif !endif
OBJECTS= \ OBJECTS= \
regcomp.obj \ $D\regcomp.obj \
regexec.obj \ $D\regexec.obj \
regerror.obj \ $D\regerror.obj \
regfree.obj $D\regfree.obj
# Pull in standard variable definitions # Pull in standard variable definitions