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

split wxchar.h into several smaller headers

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-03-19 14:39:58 +00:00
parent c8eb817283
commit dd0ef3324b
10 changed files with 1503 additions and 1240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
Makefile.in
View File

@@ -232,6 +232,7 @@ ALL_BASE_HEADERS = \
wx/beforestd.h \
wx/buffer.h \
wx/build.h \
wx/chartype.h \
wx/chkconf.h \
wx/clntdata.h \
wx/cmdline.h \
@@ -322,6 +323,7 @@ ALL_BASE_HEADERS = \
wx/tokenzr.h \
wx/txtstrm.h \
wx/types.h \
wx/unichar.h \
wx/uri.h \
wx/utils.h \
wx/variant.h \
@@ -331,6 +333,7 @@ ALL_BASE_HEADERS = \
wx/wfstream.h \
wx/wx.h \
wx/wxchar.h \
wx/wxcrt.h \
wx/wxprec.h \
wx/xti.h \
wx/xtistrm.h \
@@ -367,6 +370,7 @@ ALL_PORTS_BASE_HEADERS = \
wx/beforestd.h \
wx/buffer.h \
wx/build.h \
wx/chartype.h \
wx/chkconf.h \
wx/clntdata.h \
wx/cmdline.h \
@@ -457,6 +461,7 @@ ALL_PORTS_BASE_HEADERS = \
wx/tokenzr.h \
wx/txtstrm.h \
wx/types.h \
wx/unichar.h \
wx/uri.h \
wx/utils.h \
wx/variant.h \
@@ -466,6 +471,7 @@ ALL_PORTS_BASE_HEADERS = \
wx/wfstream.h \
wx/wx.h \
wx/wxchar.h \
wx/wxcrt.h \
wx/wxprec.h \
wx/xti.h \
wx/xtistrm.h \
@@ -588,10 +594,12 @@ ALL_BASE_SOURCES = \
src/common/textfile.cpp \
src/common/tokenzr.cpp \
src/common/txtstrm.cpp \
src/common/unichar.cpp \
src/common/uri.cpp \
src/common/variant.cpp \
src/common/wfstream.cpp \
src/common/wxchar.cpp \
src/common/wxcrt.cpp \
src/common/wxprintf.cpp \
src/common/xti.cpp \
src/common/xtistrm.cpp \
src/common/zipstrm.cpp \
@@ -744,10 +752,12 @@ MONODLL_OBJECTS = \
monodll_textfile.o \
monodll_tokenzr.o \
monodll_txtstrm.o \
monodll_unichar.o \
monodll_uri.o \
monodll_variant.o \
monodll_wfstream.o \
monodll_wxchar.o \
monodll_wxcrt.o \
monodll_wxprintf.o \
monodll_xti.o \
monodll_xtistrm.o \
monodll_zipstrm.o \
@@ -844,10 +854,12 @@ MONOLIB_OBJECTS = \
monolib_textfile.o \
monolib_tokenzr.o \
monolib_txtstrm.o \
monolib_unichar.o \
monolib_uri.o \
monolib_variant.o \
monolib_wfstream.o \
monolib_wxchar.o \
monolib_wxcrt.o \
monolib_wxprintf.o \
monolib_xti.o \
monolib_xtistrm.o \
monolib_zipstrm.o \
@@ -946,10 +958,12 @@ BASEDLL_OBJECTS = \
basedll_textfile.o \
basedll_tokenzr.o \
basedll_txtstrm.o \
basedll_unichar.o \
basedll_uri.o \
basedll_variant.o \
basedll_wfstream.o \
basedll_wxchar.o \
basedll_wxcrt.o \
basedll_wxprintf.o \
basedll_xti.o \
basedll_xtistrm.o \
basedll_zipstrm.o \
@@ -1031,10 +1045,12 @@ BASELIB_OBJECTS = \
baselib_textfile.o \
baselib_tokenzr.o \
baselib_txtstrm.o \
baselib_unichar.o \
baselib_uri.o \
baselib_variant.o \
baselib_wfstream.o \
baselib_wxchar.o \
baselib_wxcrt.o \
baselib_wxprintf.o \
baselib_xti.o \
baselib_xtistrm.o \
baselib_zipstrm.o \
@@ -12761,6 +12777,9 @@ monodll_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp $(MONODLL_ODEP)
monodll_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/txtstrm.cpp
monodll_unichar.o: $(srcdir)/src/common/unichar.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/unichar.cpp
monodll_uri.o: $(srcdir)/src/common/uri.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/uri.cpp
@@ -12770,8 +12789,11 @@ monodll_variant.o: $(srcdir)/src/common/variant.cpp $(MONODLL_ODEP)
monodll_wfstream.o: $(srcdir)/src/common/wfstream.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/wfstream.cpp
monodll_wxchar.o: $(srcdir)/src/common/wxchar.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/wxchar.cpp
monodll_wxcrt.o: $(srcdir)/src/common/wxcrt.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/wxcrt.cpp
monodll_wxprintf.o: $(srcdir)/src/common/wxprintf.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/wxprintf.cpp
monodll_xti.o: $(srcdir)/src/common/xti.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/xti.cpp
@@ -16904,6 +16926,9 @@ monolib_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp $(MONOLIB_ODEP)
monolib_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/txtstrm.cpp
monolib_unichar.o: $(srcdir)/src/common/unichar.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/unichar.cpp
monolib_uri.o: $(srcdir)/src/common/uri.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/uri.cpp
@@ -16913,8 +16938,11 @@ monolib_variant.o: $(srcdir)/src/common/variant.cpp $(MONOLIB_ODEP)
monolib_wfstream.o: $(srcdir)/src/common/wfstream.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/wfstream.cpp
monolib_wxchar.o: $(srcdir)/src/common/wxchar.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/wxchar.cpp
monolib_wxcrt.o: $(srcdir)/src/common/wxcrt.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/wxcrt.cpp
monolib_wxprintf.o: $(srcdir)/src/common/wxprintf.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/wxprintf.cpp
monolib_xti.o: $(srcdir)/src/common/xti.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/xti.cpp
@@ -21050,6 +21078,9 @@ basedll_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp $(BASEDLL_ODEP)
basedll_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp $(BASEDLL_ODEP)
$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/txtstrm.cpp
basedll_unichar.o: $(srcdir)/src/common/unichar.cpp $(BASEDLL_ODEP)
$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/unichar.cpp
basedll_uri.o: $(srcdir)/src/common/uri.cpp $(BASEDLL_ODEP)
$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/uri.cpp
@@ -21059,8 +21090,11 @@ basedll_variant.o: $(srcdir)/src/common/variant.cpp $(BASEDLL_ODEP)
basedll_wfstream.o: $(srcdir)/src/common/wfstream.cpp $(BASEDLL_ODEP)
$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/wfstream.cpp
basedll_wxchar.o: $(srcdir)/src/common/wxchar.cpp $(BASEDLL_ODEP)
$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/wxchar.cpp
basedll_wxcrt.o: $(srcdir)/src/common/wxcrt.cpp $(BASEDLL_ODEP)
$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/wxcrt.cpp
basedll_wxprintf.o: $(srcdir)/src/common/wxprintf.cpp $(BASEDLL_ODEP)
$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/wxprintf.cpp
basedll_xti.o: $(srcdir)/src/common/xti.cpp $(BASEDLL_ODEP)
$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/xti.cpp
@@ -21641,6 +21675,9 @@ baselib_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp $(BASELIB_ODEP)
baselib_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp $(BASELIB_ODEP)
$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/txtstrm.cpp
baselib_unichar.o: $(srcdir)/src/common/unichar.cpp $(BASELIB_ODEP)
$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/unichar.cpp
baselib_uri.o: $(srcdir)/src/common/uri.cpp $(BASELIB_ODEP)
$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/uri.cpp
@@ -21650,8 +21687,11 @@ baselib_variant.o: $(srcdir)/src/common/variant.cpp $(BASELIB_ODEP)
baselib_wfstream.o: $(srcdir)/src/common/wfstream.cpp $(BASELIB_ODEP)
$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/wfstream.cpp
baselib_wxchar.o: $(srcdir)/src/common/wxchar.cpp $(BASELIB_ODEP)
$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/wxchar.cpp
baselib_wxcrt.o: $(srcdir)/src/common/wxcrt.cpp $(BASELIB_ODEP)
$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/wxcrt.cpp
baselib_wxprintf.o: $(srcdir)/src/common/wxprintf.cpp $(BASELIB_ODEP)
$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/wxprintf.cpp
baselib_xti.o: $(srcdir)/src/common/xti.cpp $(BASELIB_ODEP)
$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/xti.cpp

7
build/bakefiles/files.bkl
View File

@@ -347,10 +347,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/common/textfile.cpp
src/common/tokenzr.cpp
src/common/txtstrm.cpp
src/common/unichar.cpp
src/common/uri.cpp
src/common/variant.cpp
src/common/wfstream.cpp
src/common/wxchar.cpp
src/common/wxcrt.cpp
src/common/wxprintf.cpp
src/common/xti.cpp
src/common/xtistrm.cpp
src/common/zipstrm.cpp
@@ -372,6 +374,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/beforestd.h
wx/buffer.h
wx/build.h
wx/chartype.h
wx/chkconf.h
wx/clntdata.h
wx/cmdline.h
@@ -462,6 +465,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/tokenzr.h
wx/txtstrm.h
wx/types.h
wx/unichar.h
wx/uri.h
wx/utils.h
wx/variant.h
@@ -471,6 +475,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/wfstream.h
wx/wx.h
wx/wxchar.h
wx/wxcrt.h
wx/wxprec.h
wx/xti.h
wx/xtistrm.h

48
build/msw/makefile.bcc
View File

@@ -260,10 +260,12 @@ MONODLL_OBJECTS = \
$(OBJS)\monodll_textfile.obj \
$(OBJS)\monodll_tokenzr.obj \
$(OBJS)\monodll_txtstrm.obj \
$(OBJS)\monodll_unichar.obj \
$(OBJS)\monodll_uri.obj \
$(OBJS)\monodll_variant.obj \
$(OBJS)\monodll_wfstream.obj \
$(OBJS)\monodll_wxchar.obj \
$(OBJS)\monodll_wxcrt.obj \
$(OBJS)\monodll_wxprintf.obj \
$(OBJS)\monodll_xti.obj \
$(OBJS)\monodll_xtistrm.obj \
$(OBJS)\monodll_zipstrm.obj \
@@ -381,10 +383,12 @@ MONOLIB_OBJECTS = \
$(OBJS)\monolib_textfile.obj \
$(OBJS)\monolib_tokenzr.obj \
$(OBJS)\monolib_txtstrm.obj \
$(OBJS)\monolib_unichar.obj \
$(OBJS)\monolib_uri.obj \
$(OBJS)\monolib_variant.obj \
$(OBJS)\monolib_wfstream.obj \
$(OBJS)\monolib_wxchar.obj \
$(OBJS)\monolib_wxcrt.obj \
$(OBJS)\monolib_wxprintf.obj \
$(OBJS)\monolib_xti.obj \
$(OBJS)\monolib_xtistrm.obj \
$(OBJS)\monolib_zipstrm.obj \
@@ -503,10 +507,12 @@ BASEDLL_OBJECTS = \
$(OBJS)\basedll_textfile.obj \
$(OBJS)\basedll_tokenzr.obj \
$(OBJS)\basedll_txtstrm.obj \
$(OBJS)\basedll_unichar.obj \
$(OBJS)\basedll_uri.obj \
$(OBJS)\basedll_variant.obj \
$(OBJS)\basedll_wfstream.obj \
$(OBJS)\basedll_wxchar.obj \
$(OBJS)\basedll_wxcrt.obj \
$(OBJS)\basedll_wxprintf.obj \
$(OBJS)\basedll_xti.obj \
$(OBJS)\basedll_xtistrm.obj \
$(OBJS)\basedll_zipstrm.obj \
@@ -609,10 +615,12 @@ BASELIB_OBJECTS = \
$(OBJS)\baselib_textfile.obj \
$(OBJS)\baselib_tokenzr.obj \
$(OBJS)\baselib_txtstrm.obj \
$(OBJS)\baselib_unichar.obj \
$(OBJS)\baselib_uri.obj \
$(OBJS)\baselib_variant.obj \
$(OBJS)\baselib_wfstream.obj \
$(OBJS)\baselib_wxchar.obj \
$(OBJS)\baselib_wxcrt.obj \
$(OBJS)\baselib_wxprintf.obj \
$(OBJS)\baselib_xti.obj \
$(OBJS)\baselib_xtistrm.obj \
$(OBJS)\baselib_zipstrm.obj \
@@ -4738,6 +4746,9 @@ $(OBJS)\monodll_tokenzr.obj: ..\..\src\common\tokenzr.cpp
$(OBJS)\monodll_txtstrm.obj: ..\..\src\common\txtstrm.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_unichar.obj: ..\..\src\common\unichar.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_uri.obj: ..\..\src\common\uri.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -4747,7 +4758,10 @@ $(OBJS)\monodll_variant.obj: ..\..\src\common\variant.cpp
$(OBJS)\monodll_wfstream.obj: ..\..\src\common\wfstream.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_wxchar.obj: ..\..\src\common\wxchar.cpp
$(OBJS)\monodll_wxcrt.obj: ..\..\src\common\wxcrt.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_wxprintf.obj: ..\..\src\common\wxprintf.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_xti.obj: ..\..\src\common\xti.cpp
@@ -6753,6 +6767,9 @@ $(OBJS)\monolib_tokenzr.obj: ..\..\src\common\tokenzr.cpp
$(OBJS)\monolib_txtstrm.obj: ..\..\src\common\txtstrm.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_unichar.obj: ..\..\src\common\unichar.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_uri.obj: ..\..\src\common\uri.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -6762,7 +6779,10 @@ $(OBJS)\monolib_variant.obj: ..\..\src\common\variant.cpp
$(OBJS)\monolib_wfstream.obj: ..\..\src\common\wfstream.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_wxchar.obj: ..\..\src\common\wxchar.cpp
$(OBJS)\monolib_wxcrt.obj: ..\..\src\common\wxcrt.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_wxprintf.obj: ..\..\src\common\wxprintf.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_xti.obj: ..\..\src\common\xti.cpp
@@ -8771,6 +8791,9 @@ $(OBJS)\basedll_tokenzr.obj: ..\..\src\common\tokenzr.cpp
$(OBJS)\basedll_txtstrm.obj: ..\..\src\common\txtstrm.cpp
$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
$(OBJS)\basedll_unichar.obj: ..\..\src\common\unichar.cpp
$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
$(OBJS)\basedll_uri.obj: ..\..\src\common\uri.cpp
$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
@@ -8780,7 +8803,10 @@ $(OBJS)\basedll_variant.obj: ..\..\src\common\variant.cpp
$(OBJS)\basedll_wfstream.obj: ..\..\src\common\wfstream.cpp
$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
$(OBJS)\basedll_wxchar.obj: ..\..\src\common\wxchar.cpp
$(OBJS)\basedll_wxcrt.obj: ..\..\src\common\wxcrt.cpp
$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
$(OBJS)\basedll_wxprintf.obj: ..\..\src\common\wxprintf.cpp
$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
$(OBJS)\basedll_xti.obj: ..\..\src\common\xti.cpp
@@ -9041,6 +9067,9 @@ $(OBJS)\baselib_tokenzr.obj: ..\..\src\common\tokenzr.cpp
$(OBJS)\baselib_txtstrm.obj: ..\..\src\common\txtstrm.cpp
$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
$(OBJS)\baselib_unichar.obj: ..\..\src\common\unichar.cpp
$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
$(OBJS)\baselib_uri.obj: ..\..\src\common\uri.cpp
$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
@@ -9050,7 +9079,10 @@ $(OBJS)\baselib_variant.obj: ..\..\src\common\variant.cpp
$(OBJS)\baselib_wfstream.obj: ..\..\src\common\wfstream.cpp
$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
$(OBJS)\baselib_wxchar.obj: ..\..\src\common\wxchar.cpp
$(OBJS)\baselib_wxcrt.obj: ..\..\src\common\wxcrt.cpp
$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
$(OBJS)\baselib_wxprintf.obj: ..\..\src\common\wxprintf.cpp
$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
$(OBJS)\baselib_xti.obj: ..\..\src\common\xti.cpp

48
build/msw/makefile.gcc
View File

@@ -246,10 +246,12 @@ MONODLL_OBJECTS = \
$(OBJS)\monodll_textfile.o \
$(OBJS)\monodll_tokenzr.o \
$(OBJS)\monodll_txtstrm.o \
$(OBJS)\monodll_unichar.o \
$(OBJS)\monodll_uri.o \
$(OBJS)\monodll_variant.o \
$(OBJS)\monodll_wfstream.o \
$(OBJS)\monodll_wxchar.o \
$(OBJS)\monodll_wxcrt.o \
$(OBJS)\monodll_wxprintf.o \
$(OBJS)\monodll_xti.o \
$(OBJS)\monodll_xtistrm.o \
$(OBJS)\monodll_zipstrm.o \
@@ -367,10 +369,12 @@ MONOLIB_OBJECTS = \
$(OBJS)\monolib_textfile.o \
$(OBJS)\monolib_tokenzr.o \
$(OBJS)\monolib_txtstrm.o \
$(OBJS)\monolib_unichar.o \
$(OBJS)\monolib_uri.o \
$(OBJS)\monolib_variant.o \
$(OBJS)\monolib_wfstream.o \
$(OBJS)\monolib_wxchar.o \
$(OBJS)\monolib_wxcrt.o \
$(OBJS)\monolib_wxprintf.o \
$(OBJS)\monolib_xti.o \
$(OBJS)\monolib_xtistrm.o \
$(OBJS)\monolib_zipstrm.o \
@@ -490,10 +494,12 @@ BASEDLL_OBJECTS = \
$(OBJS)\basedll_textfile.o \
$(OBJS)\basedll_tokenzr.o \
$(OBJS)\basedll_txtstrm.o \
$(OBJS)\basedll_unichar.o \
$(OBJS)\basedll_uri.o \
$(OBJS)\basedll_variant.o \
$(OBJS)\basedll_wfstream.o \
$(OBJS)\basedll_wxchar.o \
$(OBJS)\basedll_wxcrt.o \
$(OBJS)\basedll_wxprintf.o \
$(OBJS)\basedll_xti.o \
$(OBJS)\basedll_xtistrm.o \
$(OBJS)\basedll_zipstrm.o \
@@ -596,10 +602,12 @@ BASELIB_OBJECTS = \
$(OBJS)\baselib_textfile.o \
$(OBJS)\baselib_tokenzr.o \
$(OBJS)\baselib_txtstrm.o \
$(OBJS)\baselib_unichar.o \
$(OBJS)\baselib_uri.o \
$(OBJS)\baselib_variant.o \
$(OBJS)\baselib_wfstream.o \
$(OBJS)\baselib_wxchar.o \
$(OBJS)\baselib_wxcrt.o \
$(OBJS)\baselib_wxprintf.o \
$(OBJS)\baselib_xti.o \
$(OBJS)\baselib_xtistrm.o \
$(OBJS)\baselib_zipstrm.o \
@@ -4867,6 +4875,9 @@ $(OBJS)\monodll_tokenzr.o: ../../src/common/tokenzr.cpp
$(OBJS)\monodll_txtstrm.o: ../../src/common/txtstrm.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_unichar.o: ../../src/common/unichar.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_uri.o: ../../src/common/uri.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -4876,7 +4887,10 @@ $(OBJS)\monodll_variant.o: ../../src/common/variant.cpp
$(OBJS)\monodll_wfstream.o: ../../src/common/wfstream.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_wxchar.o: ../../src/common/wxchar.cpp
$(OBJS)\monodll_wxcrt.o: ../../src/common/wxcrt.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_wxprintf.o: ../../src/common/wxprintf.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_xti.o: ../../src/common/xti.cpp
@@ -6982,6 +6996,9 @@ $(OBJS)\monolib_tokenzr.o: ../../src/common/tokenzr.cpp
$(OBJS)\monolib_txtstrm.o: ../../src/common/txtstrm.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_unichar.o: ../../src/common/unichar.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_uri.o: ../../src/common/uri.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -6991,7 +7008,10 @@ $(OBJS)\monolib_variant.o: ../../src/common/variant.cpp
$(OBJS)\monolib_wfstream.o: ../../src/common/wfstream.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_wxchar.o: ../../src/common/wxchar.cpp
$(OBJS)\monolib_wxcrt.o: ../../src/common/wxcrt.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_wxprintf.o: ../../src/common/wxprintf.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_xti.o: ../../src/common/xti.cpp
@@ -9100,6 +9120,9 @@ $(OBJS)\basedll_tokenzr.o: ../../src/common/tokenzr.cpp
$(OBJS)\basedll_txtstrm.o: ../../src/common/txtstrm.cpp
$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\basedll_unichar.o: ../../src/common/unichar.cpp
$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\basedll_uri.o: ../../src/common/uri.cpp
$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -9109,7 +9132,10 @@ $(OBJS)\basedll_variant.o: ../../src/common/variant.cpp
$(OBJS)\basedll_wfstream.o: ../../src/common/wfstream.cpp
$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\basedll_wxchar.o: ../../src/common/wxchar.cpp
$(OBJS)\basedll_wxcrt.o: ../../src/common/wxcrt.cpp
$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\basedll_wxprintf.o: ../../src/common/wxprintf.cpp
$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\basedll_xti.o: ../../src/common/xti.cpp
@@ -9370,6 +9396,9 @@ $(OBJS)\baselib_tokenzr.o: ../../src/common/tokenzr.cpp
$(OBJS)\baselib_txtstrm.o: ../../src/common/txtstrm.cpp
$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\baselib_unichar.o: ../../src/common/unichar.cpp
$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\baselib_uri.o: ../../src/common/uri.cpp
$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
@@ -9379,7 +9408,10 @@ $(OBJS)\baselib_variant.o: ../../src/common/variant.cpp
$(OBJS)\baselib_wfstream.o: ../../src/common/wfstream.cpp
$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\baselib_wxchar.o: ../../src/common/wxchar.cpp
$(OBJS)\baselib_wxcrt.o: ../../src/common/wxcrt.cpp
$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\baselib_wxprintf.o: ../../src/common/wxprintf.cpp
$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\baselib_xti.o: ../../src/common/xti.cpp

48
build/msw/makefile.vc
View File

@@ -261,10 +261,12 @@ MONODLL_OBJECTS = \
$(OBJS)\monodll_textfile.obj \
$(OBJS)\monodll_tokenzr.obj \
$(OBJS)\monodll_txtstrm.obj \
$(OBJS)\monodll_unichar.obj \
$(OBJS)\monodll_uri.obj \
$(OBJS)\monodll_variant.obj \
$(OBJS)\monodll_wfstream.obj \
$(OBJS)\monodll_wxchar.obj \
$(OBJS)\monodll_wxcrt.obj \
$(OBJS)\monodll_wxprintf.obj \
$(OBJS)\monodll_xti.obj \
$(OBJS)\monodll_xtistrm.obj \
$(OBJS)\monodll_zipstrm.obj \
@@ -387,10 +389,12 @@ MONOLIB_OBJECTS = \
$(OBJS)\monolib_textfile.obj \
$(OBJS)\monolib_tokenzr.obj \
$(OBJS)\monolib_txtstrm.obj \
$(OBJS)\monolib_unichar.obj \
$(OBJS)\monolib_uri.obj \
$(OBJS)\monolib_variant.obj \
$(OBJS)\monolib_wfstream.obj \
$(OBJS)\monolib_wxchar.obj \
$(OBJS)\monolib_wxcrt.obj \
$(OBJS)\monolib_wxprintf.obj \
$(OBJS)\monolib_xti.obj \
$(OBJS)\monolib_xtistrm.obj \
$(OBJS)\monolib_zipstrm.obj \
@@ -515,10 +519,12 @@ BASEDLL_OBJECTS = \
$(OBJS)\basedll_textfile.obj \
$(OBJS)\basedll_tokenzr.obj \
$(OBJS)\basedll_txtstrm.obj \
$(OBJS)\basedll_unichar.obj \
$(OBJS)\basedll_uri.obj \
$(OBJS)\basedll_variant.obj \
$(OBJS)\basedll_wfstream.obj \
$(OBJS)\basedll_wxchar.obj \
$(OBJS)\basedll_wxcrt.obj \
$(OBJS)\basedll_wxprintf.obj \
$(OBJS)\basedll_xti.obj \
$(OBJS)\basedll_xtistrm.obj \
$(OBJS)\basedll_zipstrm.obj \
@@ -627,10 +633,12 @@ BASELIB_OBJECTS = \
$(OBJS)\baselib_textfile.obj \
$(OBJS)\baselib_tokenzr.obj \
$(OBJS)\baselib_txtstrm.obj \
$(OBJS)\baselib_unichar.obj \
$(OBJS)\baselib_uri.obj \
$(OBJS)\baselib_variant.obj \
$(OBJS)\baselib_wfstream.obj \
$(OBJS)\baselib_wxchar.obj \
$(OBJS)\baselib_wxcrt.obj \
$(OBJS)\baselib_wxprintf.obj \
$(OBJS)\baselib_xti.obj \
$(OBJS)\baselib_xtistrm.obj \
$(OBJS)\baselib_zipstrm.obj \
@@ -5071,6 +5079,9 @@ $(OBJS)\monodll_tokenzr.obj: ..\..\src\common\tokenzr.cpp
$(OBJS)\monodll_txtstrm.obj: ..\..\src\common\txtstrm.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_unichar.obj: ..\..\src\common\unichar.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_uri.obj: ..\..\src\common\uri.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -5080,7 +5091,10 @@ $(OBJS)\monodll_variant.obj: ..\..\src\common\variant.cpp
$(OBJS)\monodll_wfstream.obj: ..\..\src\common\wfstream.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_wxchar.obj: ..\..\src\common\wxchar.cpp
$(OBJS)\monodll_wxcrt.obj: ..\..\src\common\wxcrt.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_wxprintf.obj: ..\..\src\common\wxprintf.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_xti.obj: ..\..\src\common\xti.cpp
@@ -7086,6 +7100,9 @@ $(OBJS)\monolib_tokenzr.obj: ..\..\src\common\tokenzr.cpp
$(OBJS)\monolib_txtstrm.obj: ..\..\src\common\txtstrm.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_unichar.obj: ..\..\src\common\unichar.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_uri.obj: ..\..\src\common\uri.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -7095,7 +7112,10 @@ $(OBJS)\monolib_variant.obj: ..\..\src\common\variant.cpp
$(OBJS)\monolib_wfstream.obj: ..\..\src\common\wfstream.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_wxchar.obj: ..\..\src\common\wxchar.cpp
$(OBJS)\monolib_wxcrt.obj: ..\..\src\common\wxcrt.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_wxprintf.obj: ..\..\src\common\wxprintf.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_xti.obj: ..\..\src\common\xti.cpp
@@ -9104,6 +9124,9 @@ $(OBJS)\basedll_tokenzr.obj: ..\..\src\common\tokenzr.cpp
$(OBJS)\basedll_txtstrm.obj: ..\..\src\common\txtstrm.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
$(OBJS)\basedll_unichar.obj: ..\..\src\common\unichar.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
$(OBJS)\basedll_uri.obj: ..\..\src\common\uri.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
@@ -9113,7 +9136,10 @@ $(OBJS)\basedll_variant.obj: ..\..\src\common\variant.cpp
$(OBJS)\basedll_wfstream.obj: ..\..\src\common\wfstream.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
$(OBJS)\basedll_wxchar.obj: ..\..\src\common\wxchar.cpp
$(OBJS)\basedll_wxcrt.obj: ..\..\src\common\wxcrt.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
$(OBJS)\basedll_wxprintf.obj: ..\..\src\common\wxprintf.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
$(OBJS)\basedll_xti.obj: ..\..\src\common\xti.cpp
@@ -9374,6 +9400,9 @@ $(OBJS)\baselib_tokenzr.obj: ..\..\src\common\tokenzr.cpp
$(OBJS)\baselib_txtstrm.obj: ..\..\src\common\txtstrm.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
$(OBJS)\baselib_unichar.obj: ..\..\src\common\unichar.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
$(OBJS)\baselib_uri.obj: ..\..\src\common\uri.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
@@ -9383,7 +9412,10 @@ $(OBJS)\baselib_variant.obj: ..\..\src\common\variant.cpp
$(OBJS)\baselib_wfstream.obj: ..\..\src\common\wfstream.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
$(OBJS)\baselib_wxchar.obj: ..\..\src\common\wxchar.cpp
$(OBJS)\baselib_wxcrt.obj: ..\..\src\common\wxcrt.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
$(OBJS)\baselib_wxprintf.obj: ..\..\src\common\wxprintf.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
$(OBJS)\baselib_xti.obj: ..\..\src\common\xti.cpp

48
build/msw/makefile.wat
View File

@@ -3038,10 +3038,12 @@ MONODLL_OBJECTS = &
$(OBJS)\monodll_textfile.obj &
$(OBJS)\monodll_tokenzr.obj &
$(OBJS)\monodll_txtstrm.obj &
$(OBJS)\monodll_unichar.obj &
$(OBJS)\monodll_uri.obj &
$(OBJS)\monodll_variant.obj &
$(OBJS)\monodll_wfstream.obj &
$(OBJS)\monodll_wxchar.obj &
$(OBJS)\monodll_wxcrt.obj &
$(OBJS)\monodll_wxprintf.obj &
$(OBJS)\monodll_xti.obj &
$(OBJS)\monodll_xtistrm.obj &
$(OBJS)\monodll_zipstrm.obj &
@@ -3159,10 +3161,12 @@ MONOLIB_OBJECTS = &
$(OBJS)\monolib_textfile.obj &
$(OBJS)\monolib_tokenzr.obj &
$(OBJS)\monolib_txtstrm.obj &
$(OBJS)\monolib_unichar.obj &
$(OBJS)\monolib_uri.obj &
$(OBJS)\monolib_variant.obj &
$(OBJS)\monolib_wfstream.obj &
$(OBJS)\monolib_wxchar.obj &
$(OBJS)\monolib_wxcrt.obj &
$(OBJS)\monolib_wxprintf.obj &
$(OBJS)\monolib_xti.obj &
$(OBJS)\monolib_xtistrm.obj &
$(OBJS)\monolib_zipstrm.obj &
@@ -3282,10 +3286,12 @@ BASEDLL_OBJECTS = &
$(OBJS)\basedll_textfile.obj &
$(OBJS)\basedll_tokenzr.obj &
$(OBJS)\basedll_txtstrm.obj &
$(OBJS)\basedll_unichar.obj &
$(OBJS)\basedll_uri.obj &
$(OBJS)\basedll_variant.obj &
$(OBJS)\basedll_wfstream.obj &
$(OBJS)\basedll_wxchar.obj &
$(OBJS)\basedll_wxcrt.obj &
$(OBJS)\basedll_wxprintf.obj &
$(OBJS)\basedll_xti.obj &
$(OBJS)\basedll_xtistrm.obj &
$(OBJS)\basedll_zipstrm.obj &
@@ -3389,10 +3395,12 @@ BASELIB_OBJECTS = &
$(OBJS)\baselib_textfile.obj &
$(OBJS)\baselib_tokenzr.obj &
$(OBJS)\baselib_txtstrm.obj &
$(OBJS)\baselib_unichar.obj &
$(OBJS)\baselib_uri.obj &
$(OBJS)\baselib_variant.obj &
$(OBJS)\baselib_wfstream.obj &
$(OBJS)\baselib_wxchar.obj &
$(OBJS)\baselib_wxcrt.obj &
$(OBJS)\baselib_wxprintf.obj &
$(OBJS)\baselib_xti.obj &
$(OBJS)\baselib_xtistrm.obj &
$(OBJS)\baselib_zipstrm.obj &
@@ -5097,6 +5105,9 @@ $(OBJS)\monodll_tokenzr.obj : .AUTODEPEND ..\..\src\common\tokenzr.cpp
$(OBJS)\monodll_txtstrm.obj : .AUTODEPEND ..\..\src\common\txtstrm.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_unichar.obj : .AUTODEPEND ..\..\src\common\unichar.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_uri.obj : .AUTODEPEND ..\..\src\common\uri.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -5106,7 +5117,10 @@ $(OBJS)\monodll_variant.obj : .AUTODEPEND ..\..\src\common\variant.cpp
$(OBJS)\monodll_wfstream.obj : .AUTODEPEND ..\..\src\common\wfstream.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_wxchar.obj : .AUTODEPEND ..\..\src\common\wxchar.cpp
$(OBJS)\monodll_wxcrt.obj : .AUTODEPEND ..\..\src\common\wxcrt.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_wxprintf.obj : .AUTODEPEND ..\..\src\common\wxprintf.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_xti.obj : .AUTODEPEND ..\..\src\common\xti.cpp
@@ -7212,6 +7226,9 @@ $(OBJS)\monolib_tokenzr.obj : .AUTODEPEND ..\..\src\common\tokenzr.cpp
$(OBJS)\monolib_txtstrm.obj : .AUTODEPEND ..\..\src\common\txtstrm.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_unichar.obj : .AUTODEPEND ..\..\src\common\unichar.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_uri.obj : .AUTODEPEND ..\..\src\common\uri.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -7221,7 +7238,10 @@ $(OBJS)\monolib_variant.obj : .AUTODEPEND ..\..\src\common\variant.cpp
$(OBJS)\monolib_wfstream.obj : .AUTODEPEND ..\..\src\common\wfstream.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_wxchar.obj : .AUTODEPEND ..\..\src\common\wxchar.cpp
$(OBJS)\monolib_wxcrt.obj : .AUTODEPEND ..\..\src\common\wxcrt.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_wxprintf.obj : .AUTODEPEND ..\..\src\common\wxprintf.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_xti.obj : .AUTODEPEND ..\..\src\common\xti.cpp
@@ -9330,6 +9350,9 @@ $(OBJS)\basedll_tokenzr.obj : .AUTODEPEND ..\..\src\common\tokenzr.cpp
$(OBJS)\basedll_txtstrm.obj : .AUTODEPEND ..\..\src\common\txtstrm.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
$(OBJS)\basedll_unichar.obj : .AUTODEPEND ..\..\src\common\unichar.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
$(OBJS)\basedll_uri.obj : .AUTODEPEND ..\..\src\common\uri.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
@@ -9339,7 +9362,10 @@ $(OBJS)\basedll_variant.obj : .AUTODEPEND ..\..\src\common\variant.cpp
$(OBJS)\basedll_wfstream.obj : .AUTODEPEND ..\..\src\common\wfstream.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
$(OBJS)\basedll_wxchar.obj : .AUTODEPEND ..\..\src\common\wxchar.cpp
$(OBJS)\basedll_wxcrt.obj : .AUTODEPEND ..\..\src\common\wxcrt.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
$(OBJS)\basedll_wxprintf.obj : .AUTODEPEND ..\..\src\common\wxprintf.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
$(OBJS)\basedll_xti.obj : .AUTODEPEND ..\..\src\common\xti.cpp
@@ -9600,6 +9626,9 @@ $(OBJS)\baselib_tokenzr.obj : .AUTODEPEND ..\..\src\common\tokenzr.cpp
$(OBJS)\baselib_txtstrm.obj : .AUTODEPEND ..\..\src\common\txtstrm.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
$(OBJS)\baselib_unichar.obj : .AUTODEPEND ..\..\src\common\unichar.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
$(OBJS)\baselib_uri.obj : .AUTODEPEND ..\..\src\common\uri.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
@@ -9609,7 +9638,10 @@ $(OBJS)\baselib_variant.obj : .AUTODEPEND ..\..\src\common\variant.cpp
$(OBJS)\baselib_wfstream.obj : .AUTODEPEND ..\..\src\common\wfstream.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
$(OBJS)\baselib_wxchar.obj : .AUTODEPEND ..\..\src\common\wxchar.cpp
$(OBJS)\baselib_wxcrt.obj : .AUTODEPEND ..\..\src\common\wxcrt.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
$(OBJS)\baselib_wxprintf.obj : .AUTODEPEND ..\..\src\common\wxprintf.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
$(OBJS)\baselib_xti.obj : .AUTODEPEND ..\..\src\common\xti.cpp

22
build/msw/wx_base.dsp
View File

@@ -703,6 +703,10 @@ SOURCE=..\..\src\common\txtstrm.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\unichar.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\uri.cpp
# End Source File
# Begin Source File
@@ -719,7 +723,11 @@ SOURCE=..\..\src\common\wfstream.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\wxchar.cpp
SOURCE=..\..\src\common\wxcrt.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\wxprintf.cpp
# End Source File
# Begin Source File
@@ -1451,6 +1459,10 @@ SOURCE=..\..\include\wx\build.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\chartype.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\chkconf.h
# End Source File
# Begin Source File
@@ -1799,6 +1811,10 @@ SOURCE=..\..\include\wx\types.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\unichar.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\uri.h
# End Source File
# Begin Source File
@@ -1835,6 +1851,10 @@ SOURCE=..\..\include\wx\wxchar.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\wxcrt.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\wxprec.h
# End Source File
# Begin Source File

53
src/common/unichar.cpp Normal file
View File

@@ -0,0 +1,53 @@
/////////////////////////////////////////////////////////////////////////////
// Name: src/common/unichar.cpp
// Purpose: wxUniChar and wxUniCharRef classes
// Author: Vaclav Slavik
// Created: 2007-03-19
// RCS-ID: $Id$
// Copyright: (c) 2007 REA Elektronik GmbH
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// ===========================================================================
// headers
// ===========================================================================
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#include "wx/unichar.h"
// ===========================================================================
// implementation
// ===========================================================================
/* static */
wxUniChar::unicode_type wxUniChar::From8bit(char c)
{
// all supported charsets have the first 128 characters same as ASCII:
if ( (unsigned char)c < 0x80 )
return c;
wchar_t buf[2];
if ( wxConvLibc.ToWChar(buf, 2, &c, 1) != 2 )
return wxT('?'); // FIXME-UTF8: what to use as failure character?
return buf[0];
}
/* static */
char wxUniChar::To8bit(wxUniChar::unicode_type c)
{
// all supported charsets have the first 128 characters same as ASCII:
if ( c < 0x80 )
return c;
wchar_t in = c;
char buf[2];
if ( wxConvLibc.FromWChar(buf, 2, &in, 1) != 2 )
return '?'; // FIXME-UTF8: what to use as failure character?
return buf[0];
}

1207
src/common/wxcrt.cpp Normal file
View File

File diff suppressed because it is too large Load Diff

1196
src/common/wxchar.cpp → src/common/wxprintf.cpp
View File

File diff suppressed because it is too large Load Diff