expat/bcb5 expatw.bpr,1.6,1.7 expatw.mak,1.6,1.7 expatw_static.bpr,1.2,1.3 expatw_static.mak,1.2,1.3setup.bat,1.3,1.4
"Patrick McConnell" <[email protected]>
| Newsgroups | gmane.text.xml.expat.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/expat/expat/bcb5
In directory sc8-pr-cvs1:/tmp/cvs-serv7215
Modified Files:
expatw.bpr expatw.mak expatw_static.bpr expatw_static.mak
setup.bat
Log Message:
Segregate obj files for utf8 and unicode build versions
Index: expatw.bpr
===================================================================
RCS file: /cvsroot/expat/expat/bcb5/expatw.bpr,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- expatw.bpr 8 Dec 2002 03:37:41 -0000 1.6
+++ expatw.bpr 9 Dec 2002 17:23:23 -0000 1.7
@@ -4,8 +4,8 @@
<MACROS>
<VERSION value="BCB.05.03"/>
<PROJECT value="Release\libexpatw_mtd.dll"/>
- <OBJFILES value="Release\obj\libexpat\xmlparse.obj Release\obj\libexpat\xmlrole.obj
- Release\obj\libexpat\xmltok.obj"/>
+ <OBJFILES value="Release\obj\libexpatw\xmlparse.obj Release\obj\libexpatw\xmlrole.obj
+ Release\obj\libexpatw\xmltok.obj"/>
<RESFILES value=""/>
<IDLFILES value=""/>
<IDLGENFILES value=""/>
@@ -35,10 +35,10 @@
<OPTIONS>
<IDLCFLAGS value="-I$(BCB)\include"/>
<CFLAG1 value="-WD -O2 -X- -a8 -b -k- -vi -q -tWM -c -tWD"/>
- <PFLAGS value="-N2Release\obj\libexpat -N0Release\obj\libexpat -$Y- -$L- -$D-"/>
+ <PFLAGS value="-N2Release\obj\libexpatw -N0Release\obj\libexpatw -$Y- -$L- -$D-"/>
<RFLAGS value="/l 0x409 /d "NDEBUG" /i$(BCB)\include"/>
<AFLAGS value="/mx /w2 /zn"/>
- <LFLAGS value="-IRelease\obj\libexpat -D"" -aa -Tpd -x -Gn -Gi -w -q"/>
+ <LFLAGS value="-IRelease\obj\libexpatw -D"" -aa -Tpd -x -Gn -Gi -w -q"/>
</OPTIONS>
<LINKER>
<ALLOBJ value="c0d32w.obj $(OBJFILES)"/>
@@ -105,14 +105,15 @@
Item8=NDEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;EXPAT_EXPORTS;XML_UNICODE_WCHAR_T
[HistoryLists\hlIntOutputDir]
-Count=7
-Item0=Release\obj\libexpat
-Item1=Release\obj\mtd
-Item2=Release\obj\mt
-Item3=Release_w\obj
-Item4=Release-w\obj
-Item5=Release-w
-Item6=..\lib\Release-w
+Count=8
+Item0=Release\obj\libexpatw
+Item1=Release\obj\libexpat
+Item2=Release\obj\mtd
+Item3=Release\obj\mt
+Item4=Release_w\obj
+Item5=Release-w\obj
+Item6=Release-w
+Item7=..\lib\Release-w
[HistoryLists\hlFinalOutputDir]
Count=5
Index: expatw.mak
===================================================================
RCS file: /cvsroot/expat/expat/bcb5/expatw.mak,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- expatw.mak 8 Dec 2002 03:37:41 -0000 1.6
+++ expatw.mak 9 Dec 2002 17:23:23 -0000 1.7
@@ -14,8 +14,8 @@
VERSION = BCB.05.03
# ---------------------------------------------------------------------------
PROJECT = Release\libexpatw_mtd.dll
-OBJFILES = Release\obj\libexpat\xmlparse.obj Release\obj\libexpat\xmlrole.obj \
- Release\obj\libexpat\xmltok.obj
+OBJFILES = Release\obj\libexpatw\xmlparse.obj Release\obj\libexpatw\xmlrole.obj \
+ Release\obj\libexpatw\xmltok.obj
RESFILES =
MAINSOURCE = expatw.bpf
RESDEPEN = $(RESFILES)
@@ -44,10 +44,10 @@
# ---------------------------------------------------------------------------
CFLAG1 = -WD -O2 -X- -a8 -b -k- -vi -q -tWM -c -tWD
IDLCFLAGS = -I$(BCB)\include
-PFLAGS = -N2Release\obj\libexpat -N0Release\obj\libexpat -$Y- -$L- -$D-
+PFLAGS = -N2Release\obj\libexpatw -N0Release\obj\libexpatw -$Y- -$L- -$D-
RFLAGS = /l 0x409 /d "NDEBUG" /i$(BCB)\include
AFLAGS = /mx /w2 /zn
-LFLAGS = -IRelease\obj\libexpat -D"" -aa -Tpd -x -Gn -Gi -w -q
+LFLAGS = -IRelease\obj\libexpatw -D"" -aa -Tpd -x -Gn -Gi -w -q
# ---------------------------------------------------------------------------
ALLOBJ = c0d32w.obj $(OBJFILES)
ALLRES = $(RESFILES)
Index: expatw_static.bpr
===================================================================
RCS file: /cvsroot/expat/expat/bcb5/expatw_static.bpr,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- expatw_static.bpr 7 Dec 2002 08:59:43 -0000 1.2
+++ expatw_static.bpr 9 Dec 2002 17:23:23 -0000 1.3
@@ -4,9 +4,9 @@
<MACROS>
<VERSION value="BCB.05.03"/>
<PROJECT value="Release\libexpatws_mtd.lib"/>
- <OBJFILES value="Release\obj\libexpat_static\xmlparse.obj
- Release\obj\libexpat_static\xmlrole.obj
- Release\obj\libexpat_static\xmltok.obj"/>
+ <OBJFILES value="Release\obj\libexpatw_static\xmlparse.obj
+ Release\obj\libexpatw_static\xmlrole.obj
+ Release\obj\libexpatw_static\xmltok.obj"/>
<RESFILES value=""/>
<IDLFILES value=""/>
<IDLGENFILES value=""/>
@@ -34,7 +34,8 @@
<OPTIONS>
<IDLCFLAGS value="-I$(BCB)\include"/>
<CFLAG1 value="-O2 -X- -a8 -b -k- -vi -q -tWM -c"/>
- <PFLAGS value="-N2Release\obj\libexpat_static -N0Release\obj\libexpat_static -$Y- -$L- -$D-"/>
+ <PFLAGS value="-N2Release\obj\libexpatw_static -N0Release\obj\libexpatw_static -$Y- -$L-
+ -$D-"/>
<RFLAGS value="/l 0x409 /d "NDEBUG" /i$(BCB)\include"/>
<AFLAGS value="/mx /w2 /zn"/>
<LFLAGS value=""/>
@@ -110,12 +111,13 @@
Item14=WIN32;_WINDOWS;NDEBUG;_MBCS;_LIB;COMPILED_FROM_DSP;XML_UNICODE_WCHAR_T;XML_UNICODE
[HistoryLists\hlIntOutputDir]
-Count=5
-Item0=Release\obj\libexpat_static
-Item1=Release\obj\mts
-Item2=Release\obj\mt
-Item3=..\lib\Release-w_static
-Item4=Release-w_static
+Count=6
+Item0=Release\obj\libexpatw_static
+Item1=Release\obj\libexpat_static
+Item2=Release\obj\mts
+Item3=Release\obj\mt
+Item4=..\lib\Release-w_static
+Item5=Release-w_static
[HistoryLists\hlFinalOutputDir]
Count=3
Index: expatw_static.mak
===================================================================
RCS file: /cvsroot/expat/expat/bcb5/expatw_static.mak,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- expatw_static.mak 7 Dec 2002 08:59:43 -0000 1.2
+++ expatw_static.mak 9 Dec 2002 17:23:23 -0000 1.3
@@ -14,9 +14,9 @@
VERSION = BCB.05.03
# ---------------------------------------------------------------------------
PROJECT = Release\libexpatws_mtd.lib
-OBJFILES = Release\obj\libexpat_static\xmlparse.obj \
- Release\obj\libexpat_static\xmlrole.obj \
- Release\obj\libexpat_static\xmltok.obj
+OBJFILES = Release\obj\libexpatw_static\xmlparse.obj \
+ Release\obj\libexpatw_static\xmlrole.obj \
+ Release\obj\libexpatw_static\xmltok.obj
RESFILES =
MAINSOURCE = expatw_static.bpf
RESDEPEN = $(RESFILES)
@@ -44,7 +44,8 @@
# ---------------------------------------------------------------------------
CFLAG1 = -O2 -X- -a8 -b -k- -vi -q -tWM -c
IDLCFLAGS = -I$(BCB)\include
-PFLAGS = -N2Release\obj\libexpat_static -N0Release\obj\libexpat_static -$Y- -$L- -$D-
+PFLAGS = -N2Release\obj\libexpatw_static -N0Release\obj\libexpatw_static -$Y- -$L- \
+ -$D-
RFLAGS = /l 0x409 /d "NDEBUG" /i$(BCB)\include
AFLAGS = /mx /w2 /zn
LFLAGS =
Index: setup.bat
===================================================================
RCS file: /cvsroot/expat/expat/bcb5/setup.bat,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- setup.bat 7 Dec 2002 08:59:43 -0000 1.3
+++ setup.bat 9 Dec 2002 17:23:23 -0000 1.4
@@ -2,6 +2,8 @@
if not exist .\release\nul mkdir release
if not exist .\release\obj\nul mkdir release\obj
if not exist .\release\obj\libexpat\nul mkdir release\obj\libexpat
+if not exist .\release\obj\libexpatw\nul mkdir release\obj\libexpatw
if not exist .\release\obj\libexpat_static\nul mkdir release\obj\libexpat_static
+if not exist .\release\obj\libexpatw_static\nul mkdir release\obj\libexpatw_static
if not exist .\release\obj\examples\nul mkdir release\obj\examples
if not exist .\release\obj\xmlwf\nul mkdir release\obj\xmlwf