moved wxClientData to wxcore

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

diff --git a/Makefile.in b/Makefile.in
index 50c71519a439aefb77ec20699143f0d4406fe9df..0125d391fd39dfe05d542c6b37f6f050fd0b62f3 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -217,7 +217,6 @@ ALL_BASE_HEADERS =  \
        wx/buffer.h \
        wx/build.h \
        wx/chkconf.h \
        wx/buffer.h \
        wx/build.h \
        wx/chkconf.h \

-       wx/clntdata.h \

        wx/cmdline.h \
        wx/confbase.h \
        wx/config.h \
        wx/cmdline.h \
        wx/confbase.h \
        wx/config.h \


@@ -330,7 +329,6 @@ ALL_HEADERS =  \
        $(ALL_GUI_HEADERS)
 ALL_BASE_SOURCES =  \
        src/common/appbase.cpp \
        $(ALL_GUI_HEADERS)
 ALL_BASE_SOURCES =  \
        src/common/appbase.cpp \

-       src/common/clntdata.cpp \

        src/common/cmdline.cpp \
        src/common/config.cpp \
        src/common/datetime.cpp \
        src/common/cmdline.cpp \
        src/common/config.cpp \
        src/common/datetime.cpp \


@@ -452,7 +450,6 @@ MONODLL_CXXFLAGS = $(__monodll_PCH_INC) -D__WX$(TOOLKIT)__ \
        -DwxUSE_BASE=1 -DWXMAKINGDLL $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
 MONODLL_OBJECTS =  \
        monodll_appbase.o \
        -DwxUSE_BASE=1 -DWXMAKINGDLL $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
 MONODLL_OBJECTS =  \
        monodll_appbase.o \

-       monodll_clntdata.o \

        monodll_cmdline.o \
        monodll_config.o \
        monodll_datetime.o \
        monodll_cmdline.o \
        monodll_config.o \
        monodll_datetime.o \


@@ -537,7 +534,6 @@ MONOLIB_CXXFLAGS = $(__monolib_PCH_INC) -D__WX$(TOOLKIT)__ \
        -DwxUSE_BASE=1 $(CPPFLAGS) $(CXXFLAGS)
 MONOLIB_OBJECTS =  \
        monolib_appbase.o \
        -DwxUSE_BASE=1 $(CPPFLAGS) $(CXXFLAGS)
 MONOLIB_OBJECTS =  \
        monolib_appbase.o \

-       monolib_clntdata.o \

        monolib_cmdline.o \
        monolib_config.o \
        monolib_datetime.o \
        monolib_cmdline.o \
        monolib_config.o \
        monolib_datetime.o \


@@ -623,7 +619,6 @@ BASEDLL_CXXFLAGS = $(__basedll_PCH_INC) -D__WX$(TOOLKIT)__ \
        $(CXXFLAGS)
 BASEDLL_OBJECTS =  \
        basedll_appbase.o \
        $(CXXFLAGS)
 BASEDLL_OBJECTS =  \
        basedll_appbase.o \

-       basedll_clntdata.o \

        basedll_cmdline.o \
        basedll_config.o \
        basedll_datetime.o \
        basedll_cmdline.o \
        basedll_config.o \
        basedll_datetime.o \


@@ -693,7 +688,6 @@ BASELIB_CXXFLAGS = $(__baselib_PCH_INC) -D__WX$(TOOLKIT)__ \
        -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CPPFLAGS) $(CXXFLAGS)
 BASELIB_OBJECTS =  \
        baselib_appbase.o \
        -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CPPFLAGS) $(CXXFLAGS)
 BASELIB_OBJECTS =  \
        baselib_appbase.o \

-       baselib_clntdata.o \

        baselib_cmdline.o \
        baselib_config.o \
        baselib_datetime.o \
        baselib_cmdline.o \
        baselib_config.o \
        baselib_datetime.o \


@@ -1734,6 +1728,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
        wx/checklst.h \
        wx/choicdlg.h \
        wx/choice.h \
        wx/checklst.h \
        wx/choicdlg.h \
        wx/choice.h \

+       wx/clntdata.h \

        wx/cmndata.h \
        wx/combobox.h \
        wx/control.h \
        wx/cmndata.h \
        wx/combobox.h \
        wx/control.h \


@@ -2090,6 +2085,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS =  \
        monodll_bookctrl.o \
        monodll_choiccmn.o \
        monodll_clipcmn.o \
        monodll_bookctrl.o \
        monodll_choiccmn.o \
        monodll_clipcmn.o \

+       monodll_clntdata.o \

        monodll_cmdproc.o \
        monodll_cmndata.o \
        monodll_containr.o \
        monodll_cmdproc.o \
        monodll_cmndata.o \
        monodll_containr.o \


@@ -2236,6 +2232,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
        monodll_bookctrl.o \
        monodll_choiccmn.o \
        monodll_clipcmn.o \
        monodll_bookctrl.o \
        monodll_choiccmn.o \
        monodll_clipcmn.o \

+       monodll_clntdata.o \

        monodll_cmdproc.o \
        monodll_cmndata.o \
        monodll_containr.o \
        monodll_cmdproc.o \
        monodll_cmndata.o \
        monodll_containr.o \


@@ -2874,6 +2871,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
        monolib_bookctrl.o \
        monolib_choiccmn.o \
        monolib_clipcmn.o \
        monolib_bookctrl.o \
        monolib_choiccmn.o \
        monolib_clipcmn.o \

+       monolib_clntdata.o \

        monolib_cmdproc.o \
        monolib_cmndata.o \
        monolib_containr.o \
        monolib_cmdproc.o \
        monolib_cmndata.o \
        monolib_containr.o \


@@ -3020,6 +3018,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
        monolib_bookctrl.o \
        monolib_choiccmn.o \
        monolib_clipcmn.o \
        monolib_bookctrl.o \
        monolib_choiccmn.o \
        monolib_clipcmn.o \

+       monolib_clntdata.o \

        monolib_cmdproc.o \
        monolib_cmndata.o \
        monolib_containr.o \
        monolib_cmdproc.o \
        monolib_cmndata.o \
        monolib_containr.o \


@@ -3815,6 +3814,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 =  \
        coredll_bookctrl.o \
        coredll_choiccmn.o \
        coredll_clipcmn.o \
        coredll_bookctrl.o \
        coredll_choiccmn.o \
        coredll_clipcmn.o \

+       coredll_clntdata.o \

        coredll_cmdproc.o \
        coredll_cmndata.o \
        coredll_containr.o \
        coredll_cmdproc.o \
        coredll_cmndata.o \
        coredll_containr.o \


@@ -3961,6 +3961,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
        coredll_bookctrl.o \
        coredll_choiccmn.o \
        coredll_clipcmn.o \
        coredll_bookctrl.o \
        coredll_choiccmn.o \
        coredll_clipcmn.o \

+       coredll_clntdata.o \

        coredll_cmdproc.o \
        coredll_cmndata.o \
        coredll_containr.o \
        coredll_cmdproc.o \
        coredll_cmndata.o \
        coredll_containr.o \


@@ -4474,6 +4475,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 =  \
        corelib_bookctrl.o \
        corelib_choiccmn.o \
        corelib_clipcmn.o \
        corelib_bookctrl.o \
        corelib_choiccmn.o \
        corelib_clipcmn.o \

+       corelib_clntdata.o \

        corelib_cmdproc.o \
        corelib_cmndata.o \
        corelib_containr.o \
        corelib_cmdproc.o \
        corelib_cmndata.o \
        corelib_containr.o \


@@ -4620,6 +4622,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
        corelib_bookctrl.o \
        corelib_choiccmn.o \
        corelib_clipcmn.o \
        corelib_bookctrl.o \
        corelib_choiccmn.o \
        corelib_clipcmn.o \

+       corelib_clntdata.o \

        corelib_cmdproc.o \
        corelib_cmndata.o \
        corelib_containr.o \
        corelib_cmdproc.o \
        corelib_cmndata.o \
        corelib_containr.o \


@@ -7086,9 +7089,6 @@ wxexpat_xmltok.o: $(srcdir)/src/expat/lib/xmltok.c
 monodll_appbase.o: $(srcdir)/src/common/appbase.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 monodll_appbase.o: $(srcdir)/src/common/appbase.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 

-monodll_clntdata.o: $(srcdir)/src/common/clntdata.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-

 monodll_cmdline.o: $(srcdir)/src/common/cmdline.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 monodll_cmdline.o: $(srcdir)/src/common/cmdline.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 


@@ -9369,6 +9369,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@monodll_clipcmn.o: $(srcdir)/src/common/clipcmn.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_USE_GUI_1@monodll_clipcmn.o: $(srcdir)/src/common/clipcmn.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 

+@COND_USE_GUI_1@monodll_clntdata.o: $(srcdir)/src/common/clntdata.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+

 @COND_USE_GUI_1@monodll_cmdproc.o: $(srcdir)/src/common/cmdproc.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_USE_GUI_1@monodll_cmdproc.o: $(srcdir)/src/common/cmdproc.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 


@@ -9693,9 +9696,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 monolib_appbase.o: $(srcdir)/src/common/appbase.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 monolib_appbase.o: $(srcdir)/src/common/appbase.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 

-monolib_clntdata.o: $(srcdir)/src/common/clntdata.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-

 monolib_cmdline.o: $(srcdir)/src/common/cmdline.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 monolib_cmdline.o: $(srcdir)/src/common/cmdline.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 


@@ -11976,6 +11976,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@monolib_clipcmn.o: $(srcdir)/src/common/clipcmn.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_USE_GUI_1@monolib_clipcmn.o: $(srcdir)/src/common/clipcmn.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 

+@COND_USE_GUI_1@monolib_clntdata.o: $(srcdir)/src/common/clntdata.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+

 @COND_USE_GUI_1@monolib_cmdproc.o: $(srcdir)/src/common/cmdproc.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_USE_GUI_1@monolib_cmdproc.o: $(srcdir)/src/common/cmdproc.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 


@@ -12300,9 +12303,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 basedll_appbase.o: $(srcdir)/src/common/appbase.cpp $(BASEDLL_ODEP)
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
 basedll_appbase.o: $(srcdir)/src/common/appbase.cpp $(BASEDLL_ODEP)
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 

-basedll_clntdata.o: $(srcdir)/src/common/clntdata.cpp $(BASEDLL_ODEP)
-       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
-

 basedll_cmdline.o: $(srcdir)/src/common/cmdline.cpp $(BASEDLL_ODEP)
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
 basedll_cmdline.o: $(srcdir)/src/common/cmdline.cpp $(BASEDLL_ODEP)
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 


@@ -12606,9 +12606,6 @@ basedll_uma.o: $(srcdir)/src/mac/uma.cpp $(BASEDLL_ODEP)
 baselib_appbase.o: $(srcdir)/src/common/appbase.cpp $(BASELIB_ODEP)
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
 baselib_appbase.o: $(srcdir)/src/common/appbase.cpp $(BASELIB_ODEP)
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 

-baselib_clntdata.o: $(srcdir)/src/common/clntdata.cpp $(BASELIB_ODEP)
-       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
-

 baselib_cmdline.o: $(srcdir)/src/common/cmdline.cpp $(BASELIB_ODEP)
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
 baselib_cmdline.o: $(srcdir)/src/common/cmdline.cpp $(BASELIB_ODEP)
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 


@@ -14844,6 +14841,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_USE_GUI_1@coredll_clipcmn.o: $(srcdir)/src/common/clipcmn.cpp $(COREDLL_ODEP)
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
 @COND_USE_GUI_1@coredll_clipcmn.o: $(srcdir)/src/common/clipcmn.cpp $(COREDLL_ODEP)
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 

+@COND_USE_GUI_1@coredll_clntdata.o: $(srcdir)/src/common/clntdata.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+

 @COND_USE_GUI_1@coredll_cmdproc.o: $(srcdir)/src/common/cmdproc.cpp $(COREDLL_ODEP)
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
 @COND_USE_GUI_1@coredll_cmdproc.o: $(srcdir)/src/common/cmdproc.cpp $(COREDLL_ODEP)
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 


@@ -16953,6 +16953,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_USE_GUI_1@corelib_clipcmn.o: $(srcdir)/src/common/clipcmn.cpp $(CORELIB_ODEP)
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
 @COND_USE_GUI_1@corelib_clipcmn.o: $(srcdir)/src/common/clipcmn.cpp $(CORELIB_ODEP)
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 

+@COND_USE_GUI_1@corelib_clntdata.o: $(srcdir)/src/common/clntdata.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+

 @COND_USE_GUI_1@corelib_cmdproc.o: $(srcdir)/src/common/cmdproc.cpp $(CORELIB_ODEP)
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
 @COND_USE_GUI_1@corelib_cmdproc.o: $(srcdir)/src/common/cmdproc.cpp $(CORELIB_ODEP)
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index f9856c82ac717a7366bd74eb92f8f6c44075276f..c5f7bab4d4ee6c7a2a648223364fd834ca634433 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -136,7 +136,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="BASE_CMN_SRC" hints="files">
     src/common/appbase.cpp
 
 <set var="BASE_CMN_SRC" hints="files">
     src/common/appbase.cpp

-    src/common/clntdata.cpp

     src/common/cmdline.cpp
     src/common/config.cpp
     src/common/datetime.cpp
     src/common/cmdline.cpp
     src/common/config.cpp
     src/common/datetime.cpp


@@ -205,7 +204,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/buffer.h
     wx/build.h
     wx/chkconf.h
     wx/buffer.h
     wx/build.h
     wx/chkconf.h

-    wx/clntdata.h

     wx/cmdline.h
     wx/confbase.h
     wx/config.h
     wx/cmdline.h
     wx/confbase.h
     wx/config.h


@@ -371,6 +369,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/bookctrl.cpp
     src/common/choiccmn.cpp
     src/common/clipcmn.cpp
     src/common/bookctrl.cpp
     src/common/choiccmn.cpp
     src/common/clipcmn.cpp

+    src/common/clntdata.cpp

     src/common/cmdproc.cpp
     src/common/cmndata.cpp
     src/common/containr.cpp
     src/common/cmdproc.cpp
     src/common/cmndata.cpp
     src/common/containr.cpp


@@ -466,6 +465,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/checklst.h
     wx/choicdlg.h
     wx/choice.h
     wx/checklst.h
     wx/choicdlg.h
     wx/choice.h

+    wx/clntdata.h

     wx/cmndata.h
     wx/combobox.h
     wx/control.h
     wx/cmndata.h
     wx/combobox.h
     wx/control.h

diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index 747c30f1f51fc4d21cb8ea8bcc9373359969de48..542d20d10d1bb126aa8b306c938d6b1096e52c2a 100644 (file)
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -187,7 +187,6 @@ MONODLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 MONODLL_OBJECTS =  \
        $(OBJS)\monodll_dummy.obj \
        $(OBJS)\monodll_appbase.obj \
 MONODLL_OBJECTS =  \
        $(OBJS)\monodll_dummy.obj \
        $(OBJS)\monodll_appbase.obj \

-       $(OBJS)\monodll_clntdata.obj \

        $(OBJS)\monodll_cmdline.obj \
        $(OBJS)\monodll_config.obj \
        $(OBJS)\monodll_datetime.obj \
        $(OBJS)\monodll_cmdline.obj \
        $(OBJS)\monodll_config.obj \
        $(OBJS)\monodll_datetime.obj \


@@ -285,7 +284,6 @@ MONOLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_dummy.obj \
        $(OBJS)\monolib_appbase.obj \
 MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_dummy.obj \
        $(OBJS)\monolib_appbase.obj \

-       $(OBJS)\monolib_clntdata.obj \

        $(OBJS)\monolib_cmdline.obj \
        $(OBJS)\monolib_config.obj \
        $(OBJS)\monolib_datetime.obj \
        $(OBJS)\monolib_cmdline.obj \
        $(OBJS)\monolib_config.obj \
        $(OBJS)\monolib_datetime.obj \


@@ -384,7 +382,6 @@ BASEDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_dummy.obj \
        $(OBJS)\basedll_appbase.obj \
 BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_dummy.obj \
        $(OBJS)\basedll_appbase.obj \

-       $(OBJS)\basedll_clntdata.obj \

        $(OBJS)\basedll_cmdline.obj \
        $(OBJS)\basedll_config.obj \
        $(OBJS)\basedll_datetime.obj \
        $(OBJS)\basedll_cmdline.obj \
        $(OBJS)\basedll_config.obj \
        $(OBJS)\basedll_datetime.obj \


@@ -468,7 +465,6 @@ BASELIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 BASELIB_OBJECTS =  \
        $(OBJS)\baselib_dummy.obj \
        $(OBJS)\baselib_appbase.obj \
 BASELIB_OBJECTS =  \
        $(OBJS)\baselib_dummy.obj \
        $(OBJS)\baselib_appbase.obj \

-       $(OBJS)\baselib_clntdata.obj \

        $(OBJS)\baselib_cmdline.obj \
        $(OBJS)\baselib_config.obj \
        $(OBJS)\baselib_datetime.obj \
        $(OBJS)\baselib_cmdline.obj \
        $(OBJS)\baselib_config.obj \
        $(OBJS)\baselib_datetime.obj \


@@ -1012,6 +1008,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_bookctrl.obj \
        $(OBJS)\monodll_choiccmn.obj \
        $(OBJS)\monodll_clipcmn.obj \
        $(OBJS)\monodll_bookctrl.obj \
        $(OBJS)\monodll_choiccmn.obj \
        $(OBJS)\monodll_clipcmn.obj \

+       $(OBJS)\monodll_clntdata.obj \

        $(OBJS)\monodll_cmdproc.obj \
        $(OBJS)\monodll_cmndata.obj \
        $(OBJS)\monodll_containr.obj \
        $(OBJS)\monodll_cmdproc.obj \
        $(OBJS)\monodll_cmndata.obj \
        $(OBJS)\monodll_containr.obj \


@@ -1207,6 +1204,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_bookctrl.obj \
        $(OBJS)\monodll_choiccmn.obj \
        $(OBJS)\monodll_clipcmn.obj \
        $(OBJS)\monodll_bookctrl.obj \
        $(OBJS)\monodll_choiccmn.obj \
        $(OBJS)\monodll_clipcmn.obj \

+       $(OBJS)\monodll_clntdata.obj \

        $(OBJS)\monodll_cmdproc.obj \
        $(OBJS)\monodll_cmndata.obj \
        $(OBJS)\monodll_containr.obj \
        $(OBJS)\monodll_cmdproc.obj \
        $(OBJS)\monodll_cmndata.obj \
        $(OBJS)\monodll_containr.obj \


@@ -1448,6 +1446,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_bookctrl.obj \
        $(OBJS)\monolib_choiccmn.obj \
        $(OBJS)\monolib_clipcmn.obj \
        $(OBJS)\monolib_bookctrl.obj \
        $(OBJS)\monolib_choiccmn.obj \
        $(OBJS)\monolib_clipcmn.obj \

+       $(OBJS)\monolib_clntdata.obj \

        $(OBJS)\monolib_cmdproc.obj \
        $(OBJS)\monolib_cmndata.obj \
        $(OBJS)\monolib_containr.obj \
        $(OBJS)\monolib_cmdproc.obj \
        $(OBJS)\monolib_cmndata.obj \
        $(OBJS)\monolib_containr.obj \


@@ -1643,6 +1642,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_bookctrl.obj \
        $(OBJS)\monolib_choiccmn.obj \
        $(OBJS)\monolib_clipcmn.obj \
        $(OBJS)\monolib_bookctrl.obj \
        $(OBJS)\monolib_choiccmn.obj \
        $(OBJS)\monolib_clipcmn.obj \

+       $(OBJS)\monolib_clntdata.obj \

        $(OBJS)\monolib_cmdproc.obj \
        $(OBJS)\monolib_cmndata.obj \
        $(OBJS)\monolib_containr.obj \
        $(OBJS)\monolib_cmdproc.obj \
        $(OBJS)\monolib_cmndata.obj \
        $(OBJS)\monolib_containr.obj \


@@ -1856,6 +1856,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_bookctrl.obj \
        $(OBJS)\coredll_choiccmn.obj \
        $(OBJS)\coredll_clipcmn.obj \
        $(OBJS)\coredll_bookctrl.obj \
        $(OBJS)\coredll_choiccmn.obj \
        $(OBJS)\coredll_clipcmn.obj \

+       $(OBJS)\coredll_clntdata.obj \

        $(OBJS)\coredll_cmdproc.obj \
        $(OBJS)\coredll_cmndata.obj \
        $(OBJS)\coredll_containr.obj \
        $(OBJS)\coredll_cmdproc.obj \
        $(OBJS)\coredll_cmndata.obj \
        $(OBJS)\coredll_containr.obj \


@@ -2051,6 +2052,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_bookctrl.obj \
        $(OBJS)\coredll_choiccmn.obj \
        $(OBJS)\coredll_clipcmn.obj \
        $(OBJS)\coredll_bookctrl.obj \
        $(OBJS)\coredll_choiccmn.obj \
        $(OBJS)\coredll_clipcmn.obj \

+       $(OBJS)\coredll_clntdata.obj \

        $(OBJS)\coredll_cmdproc.obj \
        $(OBJS)\coredll_cmndata.obj \
        $(OBJS)\coredll_containr.obj \
        $(OBJS)\coredll_cmdproc.obj \
        $(OBJS)\coredll_cmndata.obj \
        $(OBJS)\coredll_containr.obj \


@@ -2248,6 +2250,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_bookctrl.obj \
        $(OBJS)\corelib_choiccmn.obj \
        $(OBJS)\corelib_clipcmn.obj \
        $(OBJS)\corelib_bookctrl.obj \
        $(OBJS)\corelib_choiccmn.obj \
        $(OBJS)\corelib_clipcmn.obj \

+       $(OBJS)\corelib_clntdata.obj \

        $(OBJS)\corelib_cmdproc.obj \
        $(OBJS)\corelib_cmndata.obj \
        $(OBJS)\corelib_containr.obj \
        $(OBJS)\corelib_cmdproc.obj \
        $(OBJS)\corelib_cmndata.obj \
        $(OBJS)\corelib_containr.obj \


@@ -2443,6 +2446,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_bookctrl.obj \
        $(OBJS)\corelib_choiccmn.obj \
        $(OBJS)\corelib_clipcmn.obj \
        $(OBJS)\corelib_bookctrl.obj \
        $(OBJS)\corelib_choiccmn.obj \
        $(OBJS)\corelib_clipcmn.obj \

+       $(OBJS)\corelib_clntdata.obj \

        $(OBJS)\corelib_cmdproc.obj \
        $(OBJS)\corelib_cmndata.obj \
        $(OBJS)\corelib_containr.obj \
        $(OBJS)\corelib_cmdproc.obj \
        $(OBJS)\corelib_cmndata.obj \
        $(OBJS)\corelib_containr.obj \


@@ -3365,9 +3369,6 @@ $(OBJS)\monodll_dummy.obj: ..\..\src\msw\dummy.cpp
 $(OBJS)\monodll_appbase.obj: ..\..\src\common\appbase.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
 $(OBJS)\monodll_appbase.obj: ..\..\src\common\appbase.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 

-$(OBJS)\monodll_clntdata.obj: ..\..\src\common\clntdata.cpp
-       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-

 $(OBJS)\monodll_cmdline.obj: ..\..\src\common\cmdline.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
 $(OBJS)\monodll_cmdline.obj: ..\..\src\common\cmdline.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 


@@ -4406,6 +4407,11 @@ $(OBJS)\monodll_clipcmn.obj: ..\..\src\common\clipcmn.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 !endif
 

+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_clntdata.obj: ..\..\src\common\clntdata.cpp
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+!endif
+

 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_cmdproc.obj: ..\..\src\common\cmdproc.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_cmdproc.obj: ..\..\src\common\cmdproc.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**


@@ -4842,9 +4848,6 @@ $(OBJS)\monolib_dummy.obj: ..\..\src\msw\dummy.cpp
 $(OBJS)\monolib_appbase.obj: ..\..\src\common\appbase.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
 $(OBJS)\monolib_appbase.obj: ..\..\src\common\appbase.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 

-$(OBJS)\monolib_clntdata.obj: ..\..\src\common\clntdata.cpp
-       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-

 $(OBJS)\monolib_cmdline.obj: ..\..\src\common\cmdline.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
 $(OBJS)\monolib_cmdline.obj: ..\..\src\common\cmdline.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 


@@ -5883,6 +5886,11 @@ $(OBJS)\monolib_clipcmn.obj: ..\..\src\common\clipcmn.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 

+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_clntdata.obj: ..\..\src\common\clntdata.cpp
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+

 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_cmdproc.obj: ..\..\src\common\cmdproc.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_cmdproc.obj: ..\..\src\common\cmdproc.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**


@@ -6319,9 +6327,6 @@ $(OBJS)\basedll_dummy.obj: ..\..\src\msw\dummy.cpp
 $(OBJS)\basedll_appbase.obj: ..\..\src\common\appbase.cpp
        $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
 
 $(OBJS)\basedll_appbase.obj: ..\..\src\common\appbase.cpp
        $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
 

-$(OBJS)\basedll_clntdata.obj: ..\..\src\common\clntdata.cpp
-       $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
-

 $(OBJS)\basedll_cmdline.obj: ..\..\src\common\cmdline.cpp
        $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
 
 $(OBJS)\basedll_cmdline.obj: ..\..\src\common\cmdline.cpp
        $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
 


@@ -6535,9 +6540,6 @@ $(OBJS)\baselib_dummy.obj: ..\..\src\msw\dummy.cpp
 $(OBJS)\baselib_appbase.obj: ..\..\src\common\appbase.cpp
        $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
 
 $(OBJS)\baselib_appbase.obj: ..\..\src\common\appbase.cpp
        $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
 

-$(OBJS)\baselib_clntdata.obj: ..\..\src\common\clntdata.cpp
-       $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
-

 $(OBJS)\baselib_cmdline.obj: ..\..\src\common\cmdline.cpp
        $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
 
 $(OBJS)\baselib_cmdline.obj: ..\..\src\common\cmdline.cpp
        $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
 


@@ -7513,6 +7515,11 @@ $(OBJS)\coredll_clipcmn.obj: ..\..\src\common\clipcmn.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 !endif
 

+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_clntdata.obj: ..\..\src\common\clntdata.cpp
+       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
+!endif
+

 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_cmdproc.obj: ..\..\src\common\cmdproc.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_cmdproc.obj: ..\..\src\common\cmdproc.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**


@@ -8639,6 +8646,11 @@ $(OBJS)\corelib_clipcmn.obj: ..\..\src\common\clipcmn.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 !endif
 

+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_clntdata.obj: ..\..\src\common\clntdata.cpp
+       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
+!endif
+

 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_cmdproc.obj: ..\..\src\common\cmdproc.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_cmdproc.obj: ..\..\src\common\cmdproc.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**

diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index d0c5d7a5eb25f6adeea4b9809e25484582258133..0df150ef832b5d97daf1b8b24829e38ffef039b7 100644 (file)
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -174,7 +174,6 @@ MONODLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H
 MONODLL_OBJECTS =  \
        $(OBJS)\monodll_dummy.o \
        $(OBJS)\monodll_appbase.o \
 MONODLL_OBJECTS =  \
        $(OBJS)\monodll_dummy.o \
        $(OBJS)\monodll_appbase.o \

-       $(OBJS)\monodll_clntdata.o \

        $(OBJS)\monodll_cmdline.o \
        $(OBJS)\monodll_config.o \
        $(OBJS)\monodll_datetime.o \
        $(OBJS)\monodll_cmdline.o \
        $(OBJS)\monodll_config.o \
        $(OBJS)\monodll_datetime.o \


@@ -272,7 +271,6 @@ MONOLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H
 MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_dummy.o \
        $(OBJS)\monolib_appbase.o \
 MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_dummy.o \
        $(OBJS)\monolib_appbase.o \

-       $(OBJS)\monolib_clntdata.o \

        $(OBJS)\monolib_cmdline.o \
        $(OBJS)\monolib_config.o \
        $(OBJS)\monolib_datetime.o \
        $(OBJS)\monolib_cmdline.o \
        $(OBJS)\monolib_config.o \
        $(OBJS)\monolib_datetime.o \


@@ -370,7 +368,6 @@ BASEDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H
 BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_dummy.o \
        $(OBJS)\basedll_appbase.o \
 BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_dummy.o \
        $(OBJS)\basedll_appbase.o \

-       $(OBJS)\basedll_clntdata.o \

        $(OBJS)\basedll_cmdline.o \
        $(OBJS)\basedll_config.o \
        $(OBJS)\basedll_datetime.o \
        $(OBJS)\basedll_cmdline.o \
        $(OBJS)\basedll_config.o \
        $(OBJS)\basedll_datetime.o \


@@ -454,7 +451,6 @@ BASELIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H
 BASELIB_OBJECTS =  \
        $(OBJS)\baselib_dummy.o \
        $(OBJS)\baselib_appbase.o \
 BASELIB_OBJECTS =  \
        $(OBJS)\baselib_dummy.o \
        $(OBJS)\baselib_appbase.o \

-       $(OBJS)\baselib_clntdata.o \

        $(OBJS)\baselib_cmdline.o \
        $(OBJS)\baselib_config.o \
        $(OBJS)\baselib_datetime.o \
        $(OBJS)\baselib_cmdline.o \
        $(OBJS)\baselib_config.o \
        $(OBJS)\baselib_datetime.o \


@@ -1001,6 +997,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_bookctrl.o \
        $(OBJS)\monodll_choiccmn.o \
        $(OBJS)\monodll_clipcmn.o \
        $(OBJS)\monodll_bookctrl.o \
        $(OBJS)\monodll_choiccmn.o \
        $(OBJS)\monodll_clipcmn.o \

+       $(OBJS)\monodll_clntdata.o \

        $(OBJS)\monodll_cmdproc.o \
        $(OBJS)\monodll_cmndata.o \
        $(OBJS)\monodll_containr.o \
        $(OBJS)\monodll_cmdproc.o \
        $(OBJS)\monodll_cmndata.o \
        $(OBJS)\monodll_containr.o \


@@ -1198,6 +1195,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_bookctrl.o \
        $(OBJS)\monodll_choiccmn.o \
        $(OBJS)\monodll_clipcmn.o \
        $(OBJS)\monodll_bookctrl.o \
        $(OBJS)\monodll_choiccmn.o \
        $(OBJS)\monodll_clipcmn.o \

+       $(OBJS)\monodll_clntdata.o \

        $(OBJS)\monodll_cmdproc.o \
        $(OBJS)\monodll_cmndata.o \
        $(OBJS)\monodll_containr.o \
        $(OBJS)\monodll_cmdproc.o \
        $(OBJS)\monodll_cmndata.o \
        $(OBJS)\monodll_containr.o \


@@ -1443,6 +1441,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_bookctrl.o \
        $(OBJS)\monolib_choiccmn.o \
        $(OBJS)\monolib_clipcmn.o \
        $(OBJS)\monolib_bookctrl.o \
        $(OBJS)\monolib_choiccmn.o \
        $(OBJS)\monolib_clipcmn.o \

+       $(OBJS)\monolib_clntdata.o \

        $(OBJS)\monolib_cmdproc.o \
        $(OBJS)\monolib_cmndata.o \
        $(OBJS)\monolib_containr.o \
        $(OBJS)\monolib_cmdproc.o \
        $(OBJS)\monolib_cmndata.o \
        $(OBJS)\monolib_containr.o \


@@ -1640,6 +1639,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_bookctrl.o \
        $(OBJS)\monolib_choiccmn.o \
        $(OBJS)\monolib_clipcmn.o \
        $(OBJS)\monolib_bookctrl.o \
        $(OBJS)\monolib_choiccmn.o \
        $(OBJS)\monolib_clipcmn.o \

+       $(OBJS)\monolib_clntdata.o \

        $(OBJS)\monolib_cmdproc.o \
        $(OBJS)\monolib_cmndata.o \
        $(OBJS)\monolib_containr.o \
        $(OBJS)\monolib_cmdproc.o \
        $(OBJS)\monolib_cmndata.o \
        $(OBJS)\monolib_containr.o \


@@ -1867,6 +1867,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_bookctrl.o \
        $(OBJS)\coredll_choiccmn.o \
        $(OBJS)\coredll_clipcmn.o \
        $(OBJS)\coredll_bookctrl.o \
        $(OBJS)\coredll_choiccmn.o \
        $(OBJS)\coredll_clipcmn.o \

+       $(OBJS)\coredll_clntdata.o \

        $(OBJS)\coredll_cmdproc.o \
        $(OBJS)\coredll_cmndata.o \
        $(OBJS)\coredll_containr.o \
        $(OBJS)\coredll_cmdproc.o \
        $(OBJS)\coredll_cmndata.o \
        $(OBJS)\coredll_containr.o \


@@ -2064,6 +2065,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_bookctrl.o \
        $(OBJS)\coredll_choiccmn.o \
        $(OBJS)\coredll_clipcmn.o \
        $(OBJS)\coredll_bookctrl.o \
        $(OBJS)\coredll_choiccmn.o \
        $(OBJS)\coredll_clipcmn.o \

+       $(OBJS)\coredll_clntdata.o \

        $(OBJS)\coredll_cmdproc.o \
        $(OBJS)\coredll_cmndata.o \
        $(OBJS)\coredll_containr.o \
        $(OBJS)\coredll_cmdproc.o \
        $(OBJS)\coredll_cmndata.o \
        $(OBJS)\coredll_containr.o \


@@ -2267,6 +2269,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_bookctrl.o \
        $(OBJS)\corelib_choiccmn.o \
        $(OBJS)\corelib_clipcmn.o \
        $(OBJS)\corelib_bookctrl.o \
        $(OBJS)\corelib_choiccmn.o \
        $(OBJS)\corelib_clipcmn.o \

+       $(OBJS)\corelib_clntdata.o \

        $(OBJS)\corelib_cmdproc.o \
        $(OBJS)\corelib_cmndata.o \
        $(OBJS)\corelib_containr.o \
        $(OBJS)\corelib_cmdproc.o \
        $(OBJS)\corelib_cmndata.o \
        $(OBJS)\corelib_containr.o \


@@ -2464,6 +2467,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_bookctrl.o \
        $(OBJS)\corelib_choiccmn.o \
        $(OBJS)\corelib_clipcmn.o \
        $(OBJS)\corelib_bookctrl.o \
        $(OBJS)\corelib_choiccmn.o \
        $(OBJS)\corelib_clipcmn.o \

+       $(OBJS)\corelib_clntdata.o \

        $(OBJS)\corelib_cmdproc.o \
        $(OBJS)\corelib_cmndata.o \
        $(OBJS)\corelib_containr.o \
        $(OBJS)\corelib_cmdproc.o \
        $(OBJS)\corelib_cmndata.o \
        $(OBJS)\corelib_containr.o \


@@ -3410,9 +3414,6 @@ $(OBJS)\monodll_dummy.o: ../../src/msw/dummy.cpp
 $(OBJS)\monodll_appbase.o: ../../src/common/appbase.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 $(OBJS)\monodll_appbase.o: ../../src/common/appbase.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
 

-$(OBJS)\monodll_clntdata.o: ../../src/common/clntdata.cpp
-       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
-

 $(OBJS)\monodll_cmdline.o: ../../src/common/cmdline.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 $(OBJS)\monodll_cmdline.o: ../../src/common/cmdline.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
 


@@ -4551,6 +4552,11 @@ $(OBJS)\monodll_clipcmn.o: ../../src/common/clipcmn.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
 endif
 
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
 endif
 

+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_clntdata.o: ../../src/common/clntdata.cpp
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
+endif
+

 ifeq ($(USE_GUI),1)
 $(OBJS)\monodll_cmdproc.o: ../../src/common/cmdproc.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
 ifeq ($(USE_GUI),1)
 $(OBJS)\monodll_cmdproc.o: ../../src/common/cmdproc.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<


@@ -4987,9 +4993,6 @@ $(OBJS)\monolib_dummy.o: ../../src/msw/dummy.cpp
 $(OBJS)\monolib_appbase.o: ../../src/common/appbase.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 $(OBJS)\monolib_appbase.o: ../../src/common/appbase.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 

-$(OBJS)\monolib_clntdata.o: ../../src/common/clntdata.cpp
-       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-

 $(OBJS)\monolib_cmdline.o: ../../src/common/cmdline.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 $(OBJS)\monolib_cmdline.o: ../../src/common/cmdline.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 


@@ -6128,6 +6131,11 @@ $(OBJS)\monolib_clipcmn.o: ../../src/common/clipcmn.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 endif
 
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 endif
 

+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_clntdata.o: ../../src/common/clntdata.cpp
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+endif
+

 ifeq ($(USE_GUI),1)
 $(OBJS)\monolib_cmdproc.o: ../../src/common/cmdproc.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 ifeq ($(USE_GUI),1)
 $(OBJS)\monolib_cmdproc.o: ../../src/common/cmdproc.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<


@@ -6564,9 +6572,6 @@ $(OBJS)\basedll_dummy.o: ../../src/msw/dummy.cpp
 $(OBJS)\basedll_appbase.o: ../../src/common/appbase.cpp
        $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
 $(OBJS)\basedll_appbase.o: ../../src/common/appbase.cpp
        $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 

-$(OBJS)\basedll_clntdata.o: ../../src/common/clntdata.cpp
-       $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $<
-

 $(OBJS)\basedll_cmdline.o: ../../src/common/cmdline.cpp
        $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
 $(OBJS)\basedll_cmdline.o: ../../src/common/cmdline.cpp
        $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 


@@ -6780,9 +6785,6 @@ $(OBJS)\baselib_dummy.o: ../../src/msw/dummy.cpp
 $(OBJS)\baselib_appbase.o: ../../src/common/appbase.cpp
        $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
 $(OBJS)\baselib_appbase.o: ../../src/common/appbase.cpp
        $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $<
 

-$(OBJS)\baselib_clntdata.o: ../../src/common/clntdata.cpp
-       $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $<
-

 $(OBJS)\baselib_cmdline.o: ../../src/common/cmdline.cpp
        $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
 $(OBJS)\baselib_cmdline.o: ../../src/common/cmdline.cpp
        $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $<
 


@@ -7858,6 +7860,11 @@ $(OBJS)\coredll_clipcmn.o: ../../src/common/clipcmn.cpp
        $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
 endif
 
        $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
 endif
 

+ifeq ($(USE_GUI),1)
+$(OBJS)\coredll_clntdata.o: ../../src/common/clntdata.cpp
+       $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
+endif
+

 ifeq ($(USE_GUI),1)
 $(OBJS)\coredll_cmdproc.o: ../../src/common/cmdproc.cpp
        $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
 ifeq ($(USE_GUI),1)
 $(OBJS)\coredll_cmdproc.o: ../../src/common/cmdproc.cpp
        $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<


@@ -9084,6 +9091,11 @@ $(OBJS)\corelib_clipcmn.o: ../../src/common/clipcmn.cpp
        $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
 endif
 
        $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
 endif
 

+ifeq ($(USE_GUI),1)
+$(OBJS)\corelib_clntdata.o: ../../src/common/clntdata.cpp
+       $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
+endif
+

 ifeq ($(USE_GUI),1)
 $(OBJS)\corelib_cmdproc.o: ../../src/common/cmdproc.cpp
        $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
 ifeq ($(USE_GUI),1)
 $(OBJS)\corelib_cmdproc.o: ../../src/common/cmdproc.cpp
        $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<

diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 042bab6e20558d891b34aa3c6f88dc62d7b00f55..34467a4f90237fb7a7ee4d46b35778faf16397c2 100644 (file)
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -189,7 +189,6 @@ MONODLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_63) /DWIN32 \
 MONODLL_OBJECTS =  \
        $(OBJS)\monodll_dummy.obj \
        $(OBJS)\monodll_appbase.obj \
 MONODLL_OBJECTS =  \
        $(OBJS)\monodll_dummy.obj \
        $(OBJS)\monodll_appbase.obj \

-       $(OBJS)\monodll_clntdata.obj \

        $(OBJS)\monodll_cmdline.obj \
        $(OBJS)\monodll_config.obj \
        $(OBJS)\monodll_datetime.obj \
        $(OBJS)\monodll_cmdline.obj \
        $(OBJS)\monodll_config.obj \
        $(OBJS)\monodll_datetime.obj \


@@ -293,7 +292,6 @@ MONOLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_75) /DWIN32 \
 MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_dummy.obj \
        $(OBJS)\monolib_appbase.obj \
 MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_dummy.obj \
        $(OBJS)\monolib_appbase.obj \

-       $(OBJS)\monolib_clntdata.obj \

        $(OBJS)\monolib_cmdline.obj \
        $(OBJS)\monolib_config.obj \
        $(OBJS)\monolib_datetime.obj \
        $(OBJS)\monolib_cmdline.obj \
        $(OBJS)\monolib_config.obj \
        $(OBJS)\monolib_datetime.obj \


@@ -398,7 +396,6 @@ BASEDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_87) /DWIN32 \
 BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_dummy.obj \
        $(OBJS)\basedll_appbase.obj \
 BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_dummy.obj \
        $(OBJS)\basedll_appbase.obj \

-       $(OBJS)\basedll_clntdata.obj \

        $(OBJS)\basedll_cmdline.obj \
        $(OBJS)\basedll_config.obj \
        $(OBJS)\basedll_datetime.obj \
        $(OBJS)\basedll_cmdline.obj \
        $(OBJS)\basedll_config.obj \
        $(OBJS)\basedll_datetime.obj \


@@ -488,7 +485,6 @@ BASELIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_99) /DWIN32 \
 BASELIB_OBJECTS =  \
        $(OBJS)\baselib_dummy.obj \
        $(OBJS)\baselib_appbase.obj \
 BASELIB_OBJECTS =  \
        $(OBJS)\baselib_dummy.obj \
        $(OBJS)\baselib_appbase.obj \

-       $(OBJS)\baselib_clntdata.obj \

        $(OBJS)\baselib_cmdline.obj \
        $(OBJS)\baselib_config.obj \
        $(OBJS)\baselib_datetime.obj \
        $(OBJS)\baselib_cmdline.obj \
        $(OBJS)\baselib_config.obj \
        $(OBJS)\baselib_datetime.obj \


@@ -1220,6 +1216,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_bookctrl.obj \
        $(OBJS)\monodll_choiccmn.obj \
        $(OBJS)\monodll_clipcmn.obj \
        $(OBJS)\monodll_bookctrl.obj \
        $(OBJS)\monodll_choiccmn.obj \
        $(OBJS)\monodll_clipcmn.obj \

+       $(OBJS)\monodll_clntdata.obj \

        $(OBJS)\monodll_cmdproc.obj \
        $(OBJS)\monodll_cmndata.obj \
        $(OBJS)\monodll_containr.obj \
        $(OBJS)\monodll_cmdproc.obj \
        $(OBJS)\monodll_cmndata.obj \
        $(OBJS)\monodll_containr.obj \


@@ -1415,6 +1412,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_bookctrl.obj \
        $(OBJS)\monodll_choiccmn.obj \
        $(OBJS)\monodll_clipcmn.obj \
        $(OBJS)\monodll_bookctrl.obj \
        $(OBJS)\monodll_choiccmn.obj \
        $(OBJS)\monodll_clipcmn.obj \

+       $(OBJS)\monodll_clntdata.obj \

        $(OBJS)\monodll_cmdproc.obj \
        $(OBJS)\monodll_cmndata.obj \
        $(OBJS)\monodll_containr.obj \
        $(OBJS)\monodll_cmdproc.obj \
        $(OBJS)\monodll_cmndata.obj \
        $(OBJS)\monodll_containr.obj \


@@ -1674,6 +1672,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_bookctrl.obj \
        $(OBJS)\monolib_choiccmn.obj \
        $(OBJS)\monolib_clipcmn.obj \
        $(OBJS)\monolib_bookctrl.obj \
        $(OBJS)\monolib_choiccmn.obj \
        $(OBJS)\monolib_clipcmn.obj \

+       $(OBJS)\monolib_clntdata.obj \

        $(OBJS)\monolib_cmdproc.obj \
        $(OBJS)\monolib_cmndata.obj \
        $(OBJS)\monolib_containr.obj \
        $(OBJS)\monolib_cmdproc.obj \
        $(OBJS)\monolib_cmndata.obj \
        $(OBJS)\monolib_containr.obj \


@@ -1869,6 +1868,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_bookctrl.obj \
        $(OBJS)\monolib_choiccmn.obj \
        $(OBJS)\monolib_clipcmn.obj \
        $(OBJS)\monolib_bookctrl.obj \
        $(OBJS)\monolib_choiccmn.obj \
        $(OBJS)\monolib_clipcmn.obj \

+       $(OBJS)\monolib_clntdata.obj \

        $(OBJS)\monolib_cmdproc.obj \
        $(OBJS)\monolib_cmndata.obj \
        $(OBJS)\monolib_containr.obj \
        $(OBJS)\monolib_cmdproc.obj \
        $(OBJS)\monolib_cmndata.obj \
        $(OBJS)\monolib_containr.obj \


@@ -2172,6 +2172,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_bookctrl.obj \
        $(OBJS)\coredll_choiccmn.obj \
        $(OBJS)\coredll_clipcmn.obj \
        $(OBJS)\coredll_bookctrl.obj \
        $(OBJS)\coredll_choiccmn.obj \
        $(OBJS)\coredll_clipcmn.obj \

+       $(OBJS)\coredll_clntdata.obj \

        $(OBJS)\coredll_cmdproc.obj \
        $(OBJS)\coredll_cmndata.obj \
        $(OBJS)\coredll_containr.obj \
        $(OBJS)\coredll_cmdproc.obj \
        $(OBJS)\coredll_cmndata.obj \
        $(OBJS)\coredll_containr.obj \


@@ -2367,6 +2368,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_bookctrl.obj \
        $(OBJS)\coredll_choiccmn.obj \
        $(OBJS)\coredll_clipcmn.obj \
        $(OBJS)\coredll_bookctrl.obj \
        $(OBJS)\coredll_choiccmn.obj \
        $(OBJS)\coredll_clipcmn.obj \

+       $(OBJS)\coredll_clntdata.obj \

        $(OBJS)\coredll_cmdproc.obj \
        $(OBJS)\coredll_cmndata.obj \
        $(OBJS)\coredll_containr.obj \
        $(OBJS)\coredll_cmdproc.obj \
        $(OBJS)\coredll_cmndata.obj \
        $(OBJS)\coredll_containr.obj \


@@ -2582,6 +2584,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_bookctrl.obj \
        $(OBJS)\corelib_choiccmn.obj \
        $(OBJS)\corelib_clipcmn.obj \
        $(OBJS)\corelib_bookctrl.obj \
        $(OBJS)\corelib_choiccmn.obj \
        $(OBJS)\corelib_clipcmn.obj \

+       $(OBJS)\corelib_clntdata.obj \

        $(OBJS)\corelib_cmdproc.obj \
        $(OBJS)\corelib_cmndata.obj \
        $(OBJS)\corelib_containr.obj \
        $(OBJS)\corelib_cmdproc.obj \
        $(OBJS)\corelib_cmndata.obj \
        $(OBJS)\corelib_containr.obj \


@@ -2777,6 +2780,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_bookctrl.obj \
        $(OBJS)\corelib_choiccmn.obj \
        $(OBJS)\corelib_clipcmn.obj \
        $(OBJS)\corelib_bookctrl.obj \
        $(OBJS)\corelib_choiccmn.obj \
        $(OBJS)\corelib_clipcmn.obj \

+       $(OBJS)\corelib_clntdata.obj \

        $(OBJS)\corelib_cmdproc.obj \
        $(OBJS)\corelib_cmndata.obj \
        $(OBJS)\corelib_containr.obj \
        $(OBJS)\corelib_cmdproc.obj \
        $(OBJS)\corelib_cmndata.obj \
        $(OBJS)\corelib_containr.obj \


@@ -3923,9 +3927,6 @@ $(OBJS)\monodll_dummy.obj: ..\..\src\msw\dummy.cpp
 $(OBJS)\monodll_appbase.obj: ..\..\src\common\appbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 
 $(OBJS)\monodll_appbase.obj: ..\..\src\common\appbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 

-$(OBJS)\monodll_clntdata.obj: ..\..\src\common\clntdata.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-

 $(OBJS)\monodll_cmdline.obj: ..\..\src\common\cmdline.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 
 $(OBJS)\monodll_cmdline.obj: ..\..\src\common\cmdline.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 


@@ -4964,6 +4965,11 @@ $(OBJS)\monodll_clipcmn.obj: ..\..\src\common\clipcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 !endif
 

+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_clntdata.obj: ..\..\src\common\clntdata.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+

 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_cmdproc.obj: ..\..\src\common\cmdproc.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_cmdproc.obj: ..\..\src\common\cmdproc.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**


@@ -5400,9 +5406,6 @@ $(OBJS)\monolib_dummy.obj: ..\..\src\msw\dummy.cpp
 $(OBJS)\monolib_appbase.obj: ..\..\src\common\appbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 
 $(OBJS)\monolib_appbase.obj: ..\..\src\common\appbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 

-$(OBJS)\monolib_clntdata.obj: ..\..\src\common\clntdata.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-

 $(OBJS)\monolib_cmdline.obj: ..\..\src\common\cmdline.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 
 $(OBJS)\monolib_cmdline.obj: ..\..\src\common\cmdline.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 


@@ -6441,6 +6444,11 @@ $(OBJS)\monolib_clipcmn.obj: ..\..\src\common\clipcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 

+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_clntdata.obj: ..\..\src\common\clntdata.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+

 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_cmdproc.obj: ..\..\src\common\cmdproc.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_cmdproc.obj: ..\..\src\common\cmdproc.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**


@@ -6877,9 +6885,6 @@ $(OBJS)\basedll_dummy.obj: ..\..\src\msw\dummy.cpp
 $(OBJS)\basedll_appbase.obj: ..\..\src\common\appbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
 
 $(OBJS)\basedll_appbase.obj: ..\..\src\common\appbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
 

-$(OBJS)\basedll_clntdata.obj: ..\..\src\common\clntdata.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
-

 $(OBJS)\basedll_cmdline.obj: ..\..\src\common\cmdline.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
 
 $(OBJS)\basedll_cmdline.obj: ..\..\src\common\cmdline.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
 


@@ -7093,9 +7098,6 @@ $(OBJS)\baselib_dummy.obj: ..\..\src\msw\dummy.cpp
 $(OBJS)\baselib_appbase.obj: ..\..\src\common\appbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
 
 $(OBJS)\baselib_appbase.obj: ..\..\src\common\appbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
 

-$(OBJS)\baselib_clntdata.obj: ..\..\src\common\clntdata.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
-

 $(OBJS)\baselib_cmdline.obj: ..\..\src\common\cmdline.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
 
 $(OBJS)\baselib_cmdline.obj: ..\..\src\common\cmdline.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
 


@@ -8071,6 +8073,11 @@ $(OBJS)\coredll_clipcmn.obj: ..\..\src\common\clipcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
 !endif
 

+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_clntdata.obj: ..\..\src\common\clntdata.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+

 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_cmdproc.obj: ..\..\src\common\cmdproc.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_cmdproc.obj: ..\..\src\common\cmdproc.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**


@@ -9197,6 +9204,11 @@ $(OBJS)\corelib_clipcmn.obj: ..\..\src\common\clipcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
 !endif
 

+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_clntdata.obj: ..\..\src\common\clntdata.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+

 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_cmdproc.obj: ..\..\src\common\cmdproc.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_cmdproc.obj: ..\..\src\common\cmdproc.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**

diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat
index 75fcbeb28530641a425048fac58e962db091b35a..2f7f806cbc45c6cee1d2ef07da8ee859d693b199 100644 (file)
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -241,6 +241,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_bookctrl.obj &
        $(OBJS)\monodll_choiccmn.obj &
        $(OBJS)\monodll_clipcmn.obj &
        $(OBJS)\monodll_bookctrl.obj &
        $(OBJS)\monodll_choiccmn.obj &
        $(OBJS)\monodll_clipcmn.obj &

+       $(OBJS)\monodll_clntdata.obj &

        $(OBJS)\monodll_cmdproc.obj &
        $(OBJS)\monodll_cmndata.obj &
        $(OBJS)\monodll_containr.obj &
        $(OBJS)\monodll_cmdproc.obj &
        $(OBJS)\monodll_cmndata.obj &
        $(OBJS)\monodll_containr.obj &


@@ -438,6 +439,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_bookctrl.obj &
        $(OBJS)\monodll_choiccmn.obj &
        $(OBJS)\monodll_clipcmn.obj &
        $(OBJS)\monodll_bookctrl.obj &
        $(OBJS)\monodll_choiccmn.obj &
        $(OBJS)\monodll_clipcmn.obj &

+       $(OBJS)\monodll_clntdata.obj &

        $(OBJS)\monodll_cmdproc.obj &
        $(OBJS)\monodll_cmndata.obj &
        $(OBJS)\monodll_containr.obj &
        $(OBJS)\monodll_cmdproc.obj &
        $(OBJS)\monodll_cmndata.obj &
        $(OBJS)\monodll_containr.obj &


@@ -686,6 +688,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_bookctrl.obj &
        $(OBJS)\monolib_choiccmn.obj &
        $(OBJS)\monolib_clipcmn.obj &
        $(OBJS)\monolib_bookctrl.obj &
        $(OBJS)\monolib_choiccmn.obj &
        $(OBJS)\monolib_clipcmn.obj &

+       $(OBJS)\monolib_clntdata.obj &

        $(OBJS)\monolib_cmdproc.obj &
        $(OBJS)\monolib_cmndata.obj &
        $(OBJS)\monolib_containr.obj &
        $(OBJS)\monolib_cmdproc.obj &
        $(OBJS)\monolib_cmndata.obj &
        $(OBJS)\monolib_containr.obj &


@@ -883,6 +886,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_bookctrl.obj &
        $(OBJS)\monolib_choiccmn.obj &
        $(OBJS)\monolib_clipcmn.obj &
        $(OBJS)\monolib_bookctrl.obj &
        $(OBJS)\monolib_choiccmn.obj &
        $(OBJS)\monolib_clipcmn.obj &

+       $(OBJS)\monolib_clntdata.obj &

        $(OBJS)\monolib_cmdproc.obj &
        $(OBJS)\monolib_cmndata.obj &
        $(OBJS)\monolib_containr.obj &
        $(OBJS)\monolib_cmdproc.obj &
        $(OBJS)\monolib_cmndata.obj &
        $(OBJS)\monolib_containr.obj &


@@ -1116,6 +1120,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_bookctrl.obj &
        $(OBJS)\coredll_choiccmn.obj &
        $(OBJS)\coredll_clipcmn.obj &
        $(OBJS)\coredll_bookctrl.obj &
        $(OBJS)\coredll_choiccmn.obj &
        $(OBJS)\coredll_clipcmn.obj &

+       $(OBJS)\coredll_clntdata.obj &

        $(OBJS)\coredll_cmdproc.obj &
        $(OBJS)\coredll_cmndata.obj &
        $(OBJS)\coredll_containr.obj &
        $(OBJS)\coredll_cmdproc.obj &
        $(OBJS)\coredll_cmndata.obj &
        $(OBJS)\coredll_containr.obj &


@@ -1313,6 +1318,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_bookctrl.obj &
        $(OBJS)\coredll_choiccmn.obj &
        $(OBJS)\coredll_clipcmn.obj &
        $(OBJS)\coredll_bookctrl.obj &
        $(OBJS)\coredll_choiccmn.obj &
        $(OBJS)\coredll_clipcmn.obj &

+       $(OBJS)\coredll_clntdata.obj &

        $(OBJS)\coredll_cmdproc.obj &
        $(OBJS)\coredll_cmndata.obj &
        $(OBJS)\coredll_containr.obj &
        $(OBJS)\coredll_cmdproc.obj &
        $(OBJS)\coredll_cmndata.obj &
        $(OBJS)\coredll_containr.obj &


@@ -1518,6 +1524,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_bookctrl.obj &
        $(OBJS)\corelib_choiccmn.obj &
        $(OBJS)\corelib_clipcmn.obj &
        $(OBJS)\corelib_bookctrl.obj &
        $(OBJS)\corelib_choiccmn.obj &
        $(OBJS)\corelib_clipcmn.obj &

+       $(OBJS)\corelib_clntdata.obj &

        $(OBJS)\corelib_cmdproc.obj &
        $(OBJS)\corelib_cmndata.obj &
        $(OBJS)\corelib_containr.obj &
        $(OBJS)\corelib_cmdproc.obj &
        $(OBJS)\corelib_cmndata.obj &
        $(OBJS)\corelib_containr.obj &


@@ -1715,6 +1722,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_bookctrl.obj &
        $(OBJS)\corelib_choiccmn.obj &
        $(OBJS)\corelib_clipcmn.obj &
        $(OBJS)\corelib_bookctrl.obj &
        $(OBJS)\corelib_choiccmn.obj &
        $(OBJS)\corelib_clipcmn.obj &

+       $(OBJS)\corelib_clntdata.obj &

        $(OBJS)\corelib_cmdproc.obj &
        $(OBJS)\corelib_cmndata.obj &
        $(OBJS)\corelib_containr.obj &
        $(OBJS)\corelib_cmdproc.obj &
        $(OBJS)\corelib_cmndata.obj &
        $(OBJS)\corelib_containr.obj &


@@ -2187,7 +2195,6 @@ MONODLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
 MONODLL_OBJECTS =  &
        $(OBJS)\monodll_dummy.obj &
        $(OBJS)\monodll_appbase.obj &
 MONODLL_OBJECTS =  &
        $(OBJS)\monodll_dummy.obj &
        $(OBJS)\monodll_appbase.obj &

-       $(OBJS)\monodll_clntdata.obj &

        $(OBJS)\monodll_cmdline.obj &
        $(OBJS)\monodll_config.obj &
        $(OBJS)\monodll_datetime.obj &
        $(OBJS)\monodll_cmdline.obj &
        $(OBJS)\monodll_config.obj &
        $(OBJS)\monodll_datetime.obj &


@@ -2285,7 +2292,6 @@ MONOLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
 MONOLIB_OBJECTS =  &
        $(OBJS)\monolib_dummy.obj &
        $(OBJS)\monolib_appbase.obj &
 MONOLIB_OBJECTS =  &
        $(OBJS)\monolib_dummy.obj &
        $(OBJS)\monolib_appbase.obj &

-       $(OBJS)\monolib_clntdata.obj &

        $(OBJS)\monolib_cmdline.obj &
        $(OBJS)\monolib_config.obj &
        $(OBJS)\monolib_datetime.obj &
        $(OBJS)\monolib_cmdline.obj &
        $(OBJS)\monolib_config.obj &
        $(OBJS)\monolib_datetime.obj &


@@ -2384,7 +2390,6 @@ BASEDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
 BASEDLL_OBJECTS =  &
        $(OBJS)\basedll_dummy.obj &
        $(OBJS)\basedll_appbase.obj &
 BASEDLL_OBJECTS =  &
        $(OBJS)\basedll_dummy.obj &
        $(OBJS)\basedll_appbase.obj &

-       $(OBJS)\basedll_clntdata.obj &

        $(OBJS)\basedll_cmdline.obj &
        $(OBJS)\basedll_config.obj &
        $(OBJS)\basedll_datetime.obj &
        $(OBJS)\basedll_cmdline.obj &
        $(OBJS)\basedll_config.obj &
        $(OBJS)\basedll_datetime.obj &


@@ -2468,7 +2473,6 @@ BASELIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
 BASELIB_OBJECTS =  &
        $(OBJS)\baselib_dummy.obj &
        $(OBJS)\baselib_appbase.obj &
 BASELIB_OBJECTS =  &
        $(OBJS)\baselib_dummy.obj &
        $(OBJS)\baselib_appbase.obj &

-       $(OBJS)\baselib_clntdata.obj &

        $(OBJS)\baselib_cmdline.obj &
        $(OBJS)\baselib_config.obj &
        $(OBJS)\baselib_datetime.obj &
        $(OBJS)\baselib_cmdline.obj &
        $(OBJS)\baselib_config.obj &
        $(OBJS)\baselib_datetime.obj &


@@ -3598,9 +3602,6 @@ $(OBJS)\monodll_dummy.obj :  .AUTODEPEND ..\..\src\msw\dummy.cpp
 $(OBJS)\monodll_appbase.obj :  .AUTODEPEND ..\..\src\common\appbase.cpp
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
 $(OBJS)\monodll_appbase.obj :  .AUTODEPEND ..\..\src\common\appbase.cpp
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 

-$(OBJS)\monodll_clntdata.obj :  .AUTODEPEND ..\..\src\common\clntdata.cpp
-       $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-

 $(OBJS)\monodll_cmdline.obj :  .AUTODEPEND ..\..\src\common\cmdline.cpp
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
 $(OBJS)\monodll_cmdline.obj :  .AUTODEPEND ..\..\src\common\cmdline.cpp
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 


@@ -4739,6 +4740,11 @@ $(OBJS)\monodll_clipcmn.obj :  .AUTODEPEND ..\..\src\common\clipcmn.cpp
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 

+!ifeq USE_GUI 1
+$(OBJS)\monodll_clntdata.obj :  .AUTODEPEND ..\..\src\common\clntdata.cpp
+       $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+

 !ifeq USE_GUI 1
 $(OBJS)\monodll_cmdproc.obj :  .AUTODEPEND ..\..\src\common\cmdproc.cpp
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !ifeq USE_GUI 1
 $(OBJS)\monodll_cmdproc.obj :  .AUTODEPEND ..\..\src\common\cmdproc.cpp
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<


@@ -5175,9 +5181,6 @@ $(OBJS)\monolib_dummy.obj :  .AUTODEPEND ..\..\src\msw\dummy.cpp
 $(OBJS)\monolib_appbase.obj :  .AUTODEPEND ..\..\src\common\appbase.cpp
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
 $(OBJS)\monolib_appbase.obj :  .AUTODEPEND ..\..\src\common\appbase.cpp
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 

-$(OBJS)\monolib_clntdata.obj :  .AUTODEPEND ..\..\src\common\clntdata.cpp
-       $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-

 $(OBJS)\monolib_cmdline.obj :  .AUTODEPEND ..\..\src\common\cmdline.cpp
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
 $(OBJS)\monolib_cmdline.obj :  .AUTODEPEND ..\..\src\common\cmdline.cpp
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 


@@ -6316,6 +6319,11 @@ $(OBJS)\monolib_clipcmn.obj :  .AUTODEPEND ..\..\src\common\clipcmn.cpp
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 

+!ifeq USE_GUI 1
+$(OBJS)\monolib_clntdata.obj :  .AUTODEPEND ..\..\src\common\clntdata.cpp
+       $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+

 !ifeq USE_GUI 1
 $(OBJS)\monolib_cmdproc.obj :  .AUTODEPEND ..\..\src\common\cmdproc.cpp
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !ifeq USE_GUI 1
 $(OBJS)\monolib_cmdproc.obj :  .AUTODEPEND ..\..\src\common\cmdproc.cpp
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<


@@ -6752,9 +6760,6 @@ $(OBJS)\basedll_dummy.obj :  .AUTODEPEND ..\..\src\msw\dummy.cpp
 $(OBJS)\basedll_appbase.obj :  .AUTODEPEND ..\..\src\common\appbase.cpp
        $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 
 $(OBJS)\basedll_appbase.obj :  .AUTODEPEND ..\..\src\common\appbase.cpp
        $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 

-$(OBJS)\basedll_clntdata.obj :  .AUTODEPEND ..\..\src\common\clntdata.cpp
-       $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-

 $(OBJS)\basedll_cmdline.obj :  .AUTODEPEND ..\..\src\common\cmdline.cpp
        $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 
 $(OBJS)\basedll_cmdline.obj :  .AUTODEPEND ..\..\src\common\cmdline.cpp
        $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 


@@ -6968,9 +6973,6 @@ $(OBJS)\baselib_dummy.obj :  .AUTODEPEND ..\..\src\msw\dummy.cpp
 $(OBJS)\baselib_appbase.obj :  .AUTODEPEND ..\..\src\common\appbase.cpp
        $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 
 $(OBJS)\baselib_appbase.obj :  .AUTODEPEND ..\..\src\common\appbase.cpp
        $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 

-$(OBJS)\baselib_clntdata.obj :  .AUTODEPEND ..\..\src\common\clntdata.cpp
-       $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-

 $(OBJS)\baselib_cmdline.obj :  .AUTODEPEND ..\..\src\common\cmdline.cpp
        $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 
 $(OBJS)\baselib_cmdline.obj :  .AUTODEPEND ..\..\src\common\cmdline.cpp
        $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 


@@ -8046,6 +8048,11 @@ $(OBJS)\coredll_clipcmn.obj :  .AUTODEPEND ..\..\src\common\clipcmn.cpp
        $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
        $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 

+!ifeq USE_GUI 1
+$(OBJS)\coredll_clntdata.obj :  .AUTODEPEND ..\..\src\common\clntdata.cpp
+       $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
+

 !ifeq USE_GUI 1
 $(OBJS)\coredll_cmdproc.obj :  .AUTODEPEND ..\..\src\common\cmdproc.cpp
        $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !ifeq USE_GUI 1
 $(OBJS)\coredll_cmdproc.obj :  .AUTODEPEND ..\..\src\common\cmdproc.cpp
        $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<


@@ -9272,6 +9279,11 @@ $(OBJS)\corelib_clipcmn.obj :  .AUTODEPEND ..\..\src\common\clipcmn.cpp
        $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
        $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 

+!ifeq USE_GUI 1
+$(OBJS)\corelib_clntdata.obj :  .AUTODEPEND ..\..\src\common\clntdata.cpp
+       $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
+

 !ifeq USE_GUI 1
 $(OBJS)\corelib_cmdproc.obj :  .AUTODEPEND ..\..\src\common\cmdproc.cpp
        $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !ifeq USE_GUI 1
 $(OBJS)\corelib_cmdproc.obj :  .AUTODEPEND ..\..\src\common\cmdproc.cpp
        $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<

diff --git a/build/msw/wx_base.dsp b/build/msw/wx_base.dsp
index 299d104ccf9da3d7d77814d354507213034fbf21..f40e519fb5dc796aebcef5de7b248e3d2f13aeba 100644 (file)
--- a/build/msw/wx_base.dsp
+++ b/build/msw/wx_base.dsp
@@ -456,10 +456,6 @@ SOURCE=..\..\src\common\appbase.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\clntdata.cpp
-# End Source File
-# Begin Source File
-

 SOURCE=..\..\src\common\cmdline.cpp
 # End Source File
 # Begin Source File
 SOURCE=..\..\src\common\cmdline.cpp
 # End Source File
 # Begin Source File


@@ -999,10 +995,6 @@ SOURCE=..\..\include\wx\chkconf.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\clntdata.h
-# End Source File
-# Begin Source File
-

 SOURCE=..\..\include\wx\cmdline.h
 # End Source File
 # Begin Source File
 SOURCE=..\..\include\wx\cmdline.h
 # End Source File
 # Begin Source File

diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp
index ba49c5cf1ad9372dd8946eab0d014818544b10cc..6f0b7d412a6d46a94063cfc928504c5ae937238d 100644 (file)
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -484,6 +484,10 @@ SOURCE=..\..\src\common\clipcmn.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\..\src\common\clntdata.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=..\..\src\common\cmdproc.cpp
 # End Source File
 # Begin Source File
 SOURCE=..\..\src\common\cmdproc.cpp
 # End Source File
 # Begin Source File


@@ -7992,6 +7996,10 @@ SOURCE=..\..\include\wx\clipbrd.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\..\include\wx\clntdata.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\..\include\wx\cmdproc.h
 # End Source File
 # Begin Source File
 SOURCE=..\..\include\wx\cmdproc.h
 # End Source File
 # Begin Source File