Added wxchar.cpp/.obj

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2108 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 7c0b8760c5655ba979f2f7e55583bc802f7df604..780261308d82a87fee9a70f517bdbd50b9f8c99b 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -157,7 +157,8 @@ COMMONOBJS = \
   $(MSWDIR)\http.obj \
   $(MSWDIR)\ftp.obj \
   $(MSWDIR)\sckfile.obj \
-  $(MSWDIR)\sckipc.obj
+  $(MSWDIR)\sckipc.obj \
+  $(MSWDIR)\wxchar.obj
 
 #  $(MSWDIR)\odbc.obj \
 #  $(MSWDIR)\matrix.obj \
@@ -606,6 +607,8 @@ $(MSWDIR)\sckfile.obj:      $(COMMDIR)\sckfile.$(SRCSUFF)
 
 $(MSWDIR)\sckipc.obj:  $(COMMDIR)\sckipc.$(SRCSUFF)
 
+$(MSWDIR)\wxchar.obj:  $(COMMDIR)\wxchar.$(SRCSUFF)
+
 ########################################################
 # Generic objects (not always compiled, depending on
 # whether platforms have native implementations)

diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc
index 26c0230cb975e9480bd49a717363d0d92a2c5223..c4bea78281f0096e9346e4b0e2fc0ee8c161c80a 100644 (file)
--- a/src/msw/makefile.bcc
+++ b/src/msw/makefile.bcc
@@ -145,7 +145,8 @@ COMMONOBJS = \
   $(MSWDIR)\wincmn.obj \
   $(MSWDIR)\objstrm.obj \
   $(MSWDIR)\dynlib.obj \
-  $(MSWDIR)\tokenzr.obj
+  $(MSWDIR)\tokenzr.obj \
+  $(MSWDIR)\wxchar.obj
 
 # Don't compile for WIN16
 #  $(MSWDIR)\socket.obj \
@@ -586,6 +587,8 @@ $(MSWDIR)\sckfile.obj:      $(COMMDIR)\sckfile.$(SRCSUFF)
 
 $(MSWDIR)\sckipc.obj:  $(COMMDIR)\sckipc.$(SRCSUFF)
 
+$(MSWDIR)\wxchar.obj:  $(COMMDIR)\wxchar.$(SRCSUFF)
+
 ########################################################
 # Generic objects (not always compiled, depending on
 # whether platforms have native implementations)

diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos
index ad57928f1700ba4cc678cbe51e2903e0a8463c32..15c72478441a99d94ed22b55a389c57edaf846de 100644 (file)
--- a/src/msw/makefile.dos
+++ b/src/msw/makefile.dos
@@ -126,7 +126,8 @@ COMMONOBJS = \
   $(COMMDIR)\zstream.obj \
   $(COMMDIR)\datstrm.obj \
   $(COMMDIR)\extended.obj \
-  $(COMMDIR)\wincmn.obj
+  $(COMMDIR)\wincmn.obj \
+  $(COMMDIR)\wxchar.obj
 
 # Doesn't compile (nested classes)
 # $(COMMDIR)\fileconf.obj\
@@ -939,6 +940,11 @@ $(COMMDIR)/wincmn.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/wxchar.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/y_tab.obj:     $*.c $(COMMDIR)/lex_yy.c
         cl @<<
 $(CPPFLAGS2) -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@ /I ..\common /c $*.c

diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc
index cc87d8511237f40a36962b2dd6e7307664e9b163..631379c8d36922b5a2c8924b7f5114fb6bd028db 100644 (file)
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -103,7 +103,8 @@ COMMONOBJS = \
   $(COMMDIR)\datstrm.obj \
   $(COMMDIR)\objstrm.obj \
   $(COMMDIR)\variant.obj \
-  $(COMMDIR)\wincmn.obj
+  $(COMMDIR)\wincmn.obj \
+  $(COMMDIR)\wxchar.obj
 
 # Don't compile for WIN16
 #  $(COMMDIR)\socket.obj \

diff --git a/src/msw/makefile.sl b/src/msw/makefile.sl
index 94e47f423d59e3b4c2875b129787d87d9546d5c1..bf981e4c438bc7de44e833785ed737eedb0bbaeb 100644 (file)
--- a/src/msw/makefile.sl
+++ b/src/msw/makefile.sl
@@ -97,7 +97,8 @@ COMMONOBJS = cmndata.obj \
   datstrm.obj \
   objstrm.obj \
   variant.obj \
-  wincmn.obj
+  wincmn.obj \
+  wxchar.obj
 
 # Can't compile these yet under Salford C++
 #  mimetype.obj \
@@ -687,6 +688,9 @@ variant.obj:     $(COMMDIR)\variant.cpp
 wincmn.obj:     $(COMMDIR)\wincmn.cpp
   $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\wincmn.cpp /BINARY wincmn.obj
 
+wxchar.obj:     $(COMMDIR)\wxcharp.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\wxchar.cpp /BINARY wxchar.obj
+
 ########################################################
 # Generic objects (not always compiled, depending on
 # whether platforms have native implementations)

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 805ce4d6948e33977c452885c2ef6231990aed99..12bd65834dbd98f975ae6afc84a3ef18ac344f2c 100644 (file)
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -161,7 +161,8 @@ COMMONOBJS = \
   ..\common\$D\datstrm.obj \
   ..\common\$D\objstrm.obj \
   ..\common\$D\variant.obj \
-  ..\common\$D\wincmn.obj
+  ..\common\$D\wincmn.obj \
+  ..\common\$D\wxchar.obj
 
 MSWOBJS = \
   ..\msw\$D\accel.obj \

diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index 436cd229eef4d12af7b6f67e4c443e19d0f0622f..37778a11fe53a2dc5a9d25a443f428b0c9fc8114 100644 (file)
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -109,7 +109,8 @@ COMMONOBJS = cmndata.obj &
   datstrm.obj &
   objstrm.obj &
   variant.obj &
-  wincmn.obj
+  wincmn.obj &
+  wxchar.obj
 
 # Can't compile these yet under Watcom C++
 #  odbc.obj &
@@ -707,6 +708,9 @@ variant.obj:     $(COMMDIR)\variant.cpp
 wincmn.obj:     $(COMMDIR)\wincmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+wxchar.obj:     $(COMMDIR)\wxchar.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
   *$(CC) $(CPPFLAGS) $(IFLAGS) -DUSE_DEFINE $(COMMDIR)\y_tab.c
 

diff --git a/src/msw/salford.lnk b/src/msw/salford.lnk
index 1aab3eb5cc23331342a3943849322f0790b5eba9..54f6214e414762570bd8d46402ca6cb3cf205bac 100644 (file)
--- a/src/msw/salford.lnk
+++ b/src/msw/salford.lnk
@@ -145,6 +145,7 @@ addobj wave.obj
 addobj wfstream.obj
 addobj wincmn.obj
 addobj window.obj
+addobj wxchar.obj
 addobj wxexpr.obj
 addobj y_tab.obj
 addobj zstream.obj