From b589082adc58bf897811e66aaa99a845a7b7639c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 11 Jun 2010 20:42:38 +0000 Subject: [PATCH] Add wx/msgqueue.h to the list of wxBase headers and rebake. This header has somehow never been added to build/bakefiles/files.bkl, do add it now. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64559 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 26 ++++++++------- build/bakefiles/files.bkl | 1 + build/msw/makefile.bcc | 64 ++++++++++++++++++------------------ build/msw/makefile.gcc | 64 ++++++++++++++++++------------------ build/msw/makefile.vc | 64 ++++++++++++++++++------------------ build/msw/makefile.wat | 64 ++++++++++++++++++------------------ build/msw/wx_base.dsp | 4 +++ build/msw/wx_core.dsp | 8 ++--- build/msw/wx_html.dsp | 24 +++++++------- build/msw/wx_vc7_base.vcproj | 3 ++ build/msw/wx_vc7_core.vcproj | 6 ++-- build/msw/wx_vc7_html.vcproj | 18 +++++----- build/msw/wx_vc8_base.vcproj | 4 +++ build/msw/wx_vc8_core.vcproj | 8 ++--- build/msw/wx_vc8_html.vcproj | 24 +++++++------- build/msw/wx_vc9_base.vcproj | 4 +++ build/msw/wx_vc9_core.vcproj | 8 ++--- build/msw/wx_vc9_html.vcproj | 24 +++++++------- wxGTK.spec | 1 + wxMotif.spec | 1 + wxX11.spec | 1 + 21 files changed, 221 insertions(+), 200 deletions(-) diff --git a/Makefile.in b/Makefile.in index fa8349f713..8f0abc7312 100644 --- a/Makefile.in +++ b/Makefile.in @@ -403,6 +403,7 @@ ALL_BASE_HEADERS = \ wx/module.h \ wx/mousestate.h \ wx/msgout.h \ + wx/msgqueue.h \ wx/mstream.h \ wx/object.h \ wx/platform.h \ @@ -570,6 +571,7 @@ ALL_PORTS_BASE_HEADERS = \ wx/module.h \ wx/mousestate.h \ wx/msgout.h \ + wx/msgqueue.h \ wx/mstream.h \ wx/object.h \ wx/platform.h \ @@ -2593,7 +2595,7 @@ COND_TOOLKIT_MSW_LOWLEVEL_HDR = \ @COND_TOOLKIT_MSW@LOWLEVEL_HDR = $(COND_TOOLKIT_MSW_LOWLEVEL_HDR) @COND_TOOLKIT_OSX_CARBON@LOWLEVEL_HDR = @COND_TOOLKIT_OSX_COCOA@LOWLEVEL_HDR = -@COND_TOOLKIT_OSX_IPHONE@LOWLEVEL_HDR = +@COND_TOOLKIT_OSX_IPHONE@LOWLEVEL_HDR = @COND_TOOLKIT_PM@LOWLEVEL_HDR = COND_TOOLKIT_WINCE_LOWLEVEL_HDR = \ wx/msw/ole/activex.h \ @@ -3713,14 +3715,14 @@ COND_WXUNIV_1_ADVANCED_HDR = \ @COND_WXUNIV_1@ADVANCED_HDR = $(COND_WXUNIV_1_ADVANCED_HDR) @COND_TOOLKIT_COCOA@MEDIA_PLATFORM_HDR = @COND_TOOLKIT_GTK@MEDIA_PLATFORM_HDR = -@COND_TOOLKIT_MOTIF@MEDIA_PLATFORM_HDR = -@COND_TOOLKIT_MSW@MEDIA_PLATFORM_HDR = -@COND_TOOLKIT_OSX_CARBON@MEDIA_PLATFORM_HDR = -@COND_TOOLKIT_OSX_COCOA@MEDIA_PLATFORM_HDR = -@COND_TOOLKIT_OSX_IPHONE@MEDIA_PLATFORM_HDR = +@COND_TOOLKIT_MOTIF@MEDIA_PLATFORM_HDR = +@COND_TOOLKIT_MSW@MEDIA_PLATFORM_HDR = +@COND_TOOLKIT_OSX_CARBON@MEDIA_PLATFORM_HDR = +@COND_TOOLKIT_OSX_COCOA@MEDIA_PLATFORM_HDR = +@COND_TOOLKIT_OSX_IPHONE@MEDIA_PLATFORM_HDR = @COND_TOOLKIT_PM@MEDIA_PLATFORM_HDR = -@COND_TOOLKIT_WINCE@MEDIA_PLATFORM_HDR = -@COND_TOOLKIT_X11@MEDIA_PLATFORM_HDR = +@COND_TOOLKIT_WINCE@MEDIA_PLATFORM_HDR = +@COND_TOOLKIT_X11@MEDIA_PLATFORM_HDR = @COND_USE_GUI_1_WXUNIV_0@GUI_CORE_HEADERS = $(GUI_HDR) COND_USE_GUI_1_WXUNIV_1_GUI_CORE_HEADERS = \ wx/generic/accel.h \ @@ -6009,7 +6011,7 @@ COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS = \ @COND_TOOLKIT_OSX_CARBON@__MEDIA_PLATFORM_SRC_OBJECTS \ @COND_TOOLKIT_OSX_CARBON@ = monodll_carbon_mediactrl.o @COND_TOOLKIT_OSX_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS = -@COND_TOOLKIT_OSX_IPHONE@__MEDIA_PLATFORM_SRC_OBJECTS = +@COND_TOOLKIT_OSX_IPHONE@__MEDIA_PLATFORM_SRC_OBJECTS = @COND_TOOLKIT_PM@__MEDIA_PLATFORM_SRC_OBJECTS = @COND_TOOLKIT_WINCE@__MEDIA_PLATFORM_SRC_OBJECTS = \ @COND_TOOLKIT_WINCE@ monodll_mediactrl_am.o monodll_mediactrl_wmp10.o \ @@ -7879,7 +7881,7 @@ COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 = \ @COND_TOOLKIT_OSX_CARBON@__MEDIA_PLATFORM_SRC_OBJECTS_1 \ @COND_TOOLKIT_OSX_CARBON@ = monolib_carbon_mediactrl.o @COND_TOOLKIT_OSX_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_1 = -@COND_TOOLKIT_OSX_IPHONE@__MEDIA_PLATFORM_SRC_OBJECTS_1 = +@COND_TOOLKIT_OSX_IPHONE@__MEDIA_PLATFORM_SRC_OBJECTS_1 = @COND_TOOLKIT_PM@__MEDIA_PLATFORM_SRC_OBJECTS_1 = @COND_TOOLKIT_WINCE@__MEDIA_PLATFORM_SRC_OBJECTS_1 = \ @COND_TOOLKIT_WINCE@ monolib_mediactrl_am.o monolib_mediactrl_wmp10.o \ @@ -11713,7 +11715,7 @@ COND_TOOLKIT_MSW___MEDIA_PLATFORM_SRC_OBJECTS_2 = \ @COND_TOOLKIT_OSX_CARBON@__MEDIA_PLATFORM_SRC_OBJECTS_2 \ @COND_TOOLKIT_OSX_CARBON@ = mediadll_carbon_mediactrl.o @COND_TOOLKIT_OSX_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_2 = -@COND_TOOLKIT_OSX_IPHONE@__MEDIA_PLATFORM_SRC_OBJECTS_2 = +@COND_TOOLKIT_OSX_IPHONE@__MEDIA_PLATFORM_SRC_OBJECTS_2 = @COND_TOOLKIT_PM@__MEDIA_PLATFORM_SRC_OBJECTS_2 = @COND_TOOLKIT_WINCE@__MEDIA_PLATFORM_SRC_OBJECTS_2 = \ @COND_TOOLKIT_WINCE@ mediadll_mediactrl_am.o mediadll_mediactrl_wmp10.o \ @@ -11746,7 +11748,7 @@ COND_TOOLKIT_MSW___MEDIA_PLATFORM_SRC_OBJECTS_3 = \ @COND_TOOLKIT_OSX_CARBON@__MEDIA_PLATFORM_SRC_OBJECTS_3 \ @COND_TOOLKIT_OSX_CARBON@ = medialib_carbon_mediactrl.o @COND_TOOLKIT_OSX_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_3 = -@COND_TOOLKIT_OSX_IPHONE@__MEDIA_PLATFORM_SRC_OBJECTS_3 = +@COND_TOOLKIT_OSX_IPHONE@__MEDIA_PLATFORM_SRC_OBJECTS_3 = @COND_TOOLKIT_PM@__MEDIA_PLATFORM_SRC_OBJECTS_3 = @COND_TOOLKIT_WINCE@__MEDIA_PLATFORM_SRC_OBJECTS_3 = \ @COND_TOOLKIT_WINCE@ medialib_mediactrl_am.o medialib_mediactrl_wmp10.o \ diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 08a5499a17..e13803eb0d 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -488,6 +488,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/module.h wx/mousestate.h wx/msgout.h + wx/msgqueue.h wx/mstream.h wx/object.h wx/platform.h diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index 8fe2aee5cb..909f439912 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -1026,10 +1026,10 @@ HTMLDLL_OBJECTS = \ $(OBJS)\htmldll_m_links.obj \ $(OBJS)\htmldll_m_list.obj \ $(OBJS)\htmldll_m_pre.obj \ - $(OBJS)\htmldll_m_span.obj \ + $(OBJS)\htmldll_m_span.obj \ $(OBJS)\htmldll_m_style.obj \ $(OBJS)\htmldll_m_tables.obj \ - $(OBJS)\htmldll_styleparams.obj \ + $(OBJS)\htmldll_styleparams.obj \ $(OBJS)\htmldll_winpars.obj \ $(OBJS)\htmldll_htmllbox.obj HTMLLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ @@ -1063,10 +1063,10 @@ HTMLLIB_OBJECTS = \ $(OBJS)\htmllib_m_links.obj \ $(OBJS)\htmllib_m_list.obj \ $(OBJS)\htmllib_m_pre.obj \ - $(OBJS)\htmllib_m_span.obj \ + $(OBJS)\htmllib_m_span.obj \ $(OBJS)\htmllib_m_style.obj \ $(OBJS)\htmllib_m_tables.obj \ - $(OBJS)\htmllib_styleparams.obj \ + $(OBJS)\htmllib_styleparams.obj \ $(OBJS)\htmllib_winpars.obj \ $(OBJS)\htmllib_htmllbox.obj QADLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ @@ -1557,10 +1557,10 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_m_links.obj \ $(OBJS)\monodll_m_list.obj \ $(OBJS)\monodll_m_pre.obj \ - $(OBJS)\monodll_m_span.obj \ + $(OBJS)\monodll_m_span.obj \ $(OBJS)\monodll_m_style.obj \ $(OBJS)\monodll_m_tables.obj \ - $(OBJS)\monodll_styleparams.obj \ + $(OBJS)\monodll_styleparams.obj \ $(OBJS)\monodll_winpars.obj \ $(OBJS)\monodll_htmllbox.obj \ $(OBJS)\monodll_debugrpt.obj \ @@ -2266,10 +2266,10 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_m_links.obj \ $(OBJS)\monolib_m_list.obj \ $(OBJS)\monolib_m_pre.obj \ - $(OBJS)\monolib_m_span.obj \ + $(OBJS)\monolib_m_span.obj \ $(OBJS)\monolib_m_style.obj \ $(OBJS)\monolib_m_tables.obj \ - $(OBJS)\monolib_styleparams.obj \ + $(OBJS)\monolib_styleparams.obj \ $(OBJS)\monolib_winpars.obj \ $(OBJS)\monolib_htmllbox.obj \ $(OBJS)\monolib_debugrpt.obj \ @@ -6436,18 +6436,18 @@ $(OBJS)\monodll_m_list.obj: ..\..\src\html\m_list.cpp $(OBJS)\monodll_m_pre.obj: ..\..\src\html\m_pre.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_pre.cpp -$(OBJS)\monodll_m_span.obj: ..\..\src\html\m_span.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_span.cpp - +$(OBJS)\monodll_m_span.obj: ..\..\src\html\m_span.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_span.cpp + $(OBJS)\monodll_m_style.obj: ..\..\src\html\m_style.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_style.cpp $(OBJS)\monodll_m_tables.obj: ..\..\src\html\m_tables.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_tables.cpp -$(OBJS)\monodll_styleparams.obj: ..\..\src\html\styleparams.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\html\styleparams.cpp - +$(OBJS)\monodll_styleparams.obj: ..\..\src\html\styleparams.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\html\styleparams.cpp + $(OBJS)\monodll_winpars.obj: ..\..\src\html\winpars.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\html\winpars.cpp @@ -8643,18 +8643,18 @@ $(OBJS)\monolib_m_list.obj: ..\..\src\html\m_list.cpp $(OBJS)\monolib_m_pre.obj: ..\..\src\html\m_pre.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_pre.cpp -$(OBJS)\monolib_m_span.obj: ..\..\src\html\m_span.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_span.cpp - +$(OBJS)\monolib_m_span.obj: ..\..\src\html\m_span.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_span.cpp + $(OBJS)\monolib_m_style.obj: ..\..\src\html\m_style.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_style.cpp $(OBJS)\monolib_m_tables.obj: ..\..\src\html\m_tables.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_tables.cpp -$(OBJS)\monolib_styleparams.obj: ..\..\src\html\styleparams.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\styleparams.cpp - +$(OBJS)\monolib_styleparams.obj: ..\..\src\html\styleparams.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\styleparams.cpp + $(OBJS)\monolib_winpars.obj: ..\..\src\html\winpars.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\winpars.cpp @@ -13765,18 +13765,18 @@ $(OBJS)\htmldll_m_list.obj: ..\..\src\html\m_list.cpp $(OBJS)\htmldll_m_pre.obj: ..\..\src\html\m_pre.cpp $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_pre.cpp -$(OBJS)\htmldll_m_span.obj: ..\..\src\html\m_span.cpp - $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_span.cpp - +$(OBJS)\htmldll_m_span.obj: ..\..\src\html\m_span.cpp + $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_span.cpp + $(OBJS)\htmldll_m_style.obj: ..\..\src\html\m_style.cpp $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_style.cpp $(OBJS)\htmldll_m_tables.obj: ..\..\src\html\m_tables.cpp $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_tables.cpp -$(OBJS)\htmldll_styleparams.obj: ..\..\src\html\styleparams.cpp - $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\styleparams.cpp - +$(OBJS)\htmldll_styleparams.obj: ..\..\src\html\styleparams.cpp + $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\styleparams.cpp + $(OBJS)\htmldll_winpars.obj: ..\..\src\html\winpars.cpp $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\winpars.cpp @@ -13846,18 +13846,18 @@ $(OBJS)\htmllib_m_list.obj: ..\..\src\html\m_list.cpp $(OBJS)\htmllib_m_pre.obj: ..\..\src\html\m_pre.cpp $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_pre.cpp -$(OBJS)\htmllib_m_span.obj: ..\..\src\html\m_span.cpp - $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_span.cpp - +$(OBJS)\htmllib_m_span.obj: ..\..\src\html\m_span.cpp + $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_span.cpp + $(OBJS)\htmllib_m_style.obj: ..\..\src\html\m_style.cpp $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_style.cpp $(OBJS)\htmllib_m_tables.obj: ..\..\src\html\m_tables.cpp $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_tables.cpp -$(OBJS)\htmllib_styleparams.obj: ..\..\src\html\styleparams.cpp - $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\styleparams.cpp - +$(OBJS)\htmllib_styleparams.obj: ..\..\src\html\styleparams.cpp + $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\styleparams.cpp + $(OBJS)\htmllib_winpars.obj: ..\..\src\html\winpars.cpp $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\winpars.cpp diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index 2c4b833b7b..954fa6d8bf 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -1023,10 +1023,10 @@ HTMLDLL_OBJECTS = \ $(OBJS)\htmldll_m_links.o \ $(OBJS)\htmldll_m_list.o \ $(OBJS)\htmldll_m_pre.o \ - $(OBJS)\htmldll_m_span.o \ + $(OBJS)\htmldll_m_span.o \ $(OBJS)\htmldll_m_style.o \ $(OBJS)\htmldll_m_tables.o \ - $(OBJS)\htmldll_styleparams.o \ + $(OBJS)\htmldll_styleparams.o \ $(OBJS)\htmldll_winpars.o \ $(OBJS)\htmldll_htmllbox.o HTMLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ @@ -1060,10 +1060,10 @@ HTMLLIB_OBJECTS = \ $(OBJS)\htmllib_m_links.o \ $(OBJS)\htmllib_m_list.o \ $(OBJS)\htmllib_m_pre.o \ - $(OBJS)\htmllib_m_span.o \ + $(OBJS)\htmllib_m_span.o \ $(OBJS)\htmllib_m_style.o \ $(OBJS)\htmllib_m_tables.o \ - $(OBJS)\htmllib_styleparams.o \ + $(OBJS)\htmllib_styleparams.o \ $(OBJS)\htmllib_winpars.o \ $(OBJS)\htmllib_htmllbox.o QADLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ @@ -1566,10 +1566,10 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_m_links.o \ $(OBJS)\monodll_m_list.o \ $(OBJS)\monodll_m_pre.o \ - $(OBJS)\monodll_m_span.o \ + $(OBJS)\monodll_m_span.o \ $(OBJS)\monodll_m_style.o \ $(OBJS)\monodll_m_tables.o \ - $(OBJS)\monodll_styleparams.o \ + $(OBJS)\monodll_styleparams.o \ $(OBJS)\monodll_winpars.o \ $(OBJS)\monodll_htmllbox.o \ $(OBJS)\monodll_debugrpt.o \ @@ -2281,10 +2281,10 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_m_links.o \ $(OBJS)\monolib_m_list.o \ $(OBJS)\monolib_m_pre.o \ - $(OBJS)\monolib_m_span.o \ + $(OBJS)\monolib_m_span.o \ $(OBJS)\monolib_m_style.o \ $(OBJS)\monolib_m_tables.o \ - $(OBJS)\monolib_styleparams.o \ + $(OBJS)\monolib_styleparams.o \ $(OBJS)\monolib_winpars.o \ $(OBJS)\monolib_htmllbox.o \ $(OBJS)\monolib_debugrpt.o \ @@ -6585,18 +6585,18 @@ $(OBJS)\monodll_m_list.o: ../../src/html/m_list.cpp $(OBJS)\monodll_m_pre.o: ../../src/html/m_pre.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monodll_m_span.o: ../../src/html/m_span.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - +$(OBJS)\monodll_m_span.o: ../../src/html/m_span.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monodll_m_style.o: ../../src/html/m_style.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\monodll_m_tables.o: ../../src/html/m_tables.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monodll_styleparams.o: ../../src/html/styleparams.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - +$(OBJS)\monodll_styleparams.o: ../../src/html/styleparams.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monodll_winpars.o: ../../src/html/winpars.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -8792,18 +8792,18 @@ $(OBJS)\monolib_m_list.o: ../../src/html/m_list.cpp $(OBJS)\monolib_m_pre.o: ../../src/html/m_pre.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monolib_m_span.o: ../../src/html/m_span.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - +$(OBJS)\monolib_m_span.o: ../../src/html/m_span.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monolib_m_style.o: ../../src/html/m_style.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\monolib_m_tables.o: ../../src/html/m_tables.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monolib_styleparams.o: ../../src/html/styleparams.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - +$(OBJS)\monolib_styleparams.o: ../../src/html/styleparams.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monolib_winpars.o: ../../src/html/winpars.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -13914,18 +13914,18 @@ $(OBJS)\htmldll_m_list.o: ../../src/html/m_list.cpp $(OBJS)\htmldll_m_pre.o: ../../src/html/m_pre.cpp $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\htmldll_m_span.o: ../../src/html/m_span.cpp - $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $< - +$(OBJS)\htmldll_m_span.o: ../../src/html/m_span.cpp + $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\htmldll_m_style.o: ../../src/html/m_style.cpp $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\htmldll_m_tables.o: ../../src/html/m_tables.cpp $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\htmldll_styleparams.o: ../../src/html/styleparams.cpp - $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $< - +$(OBJS)\htmldll_styleparams.o: ../../src/html/styleparams.cpp + $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\htmldll_winpars.o: ../../src/html/winpars.cpp $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $< @@ -13995,18 +13995,18 @@ $(OBJS)\htmllib_m_list.o: ../../src/html/m_list.cpp $(OBJS)\htmllib_m_pre.o: ../../src/html/m_pre.cpp $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\htmllib_m_span.o: ../../src/html/m_span.cpp - $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $< - +$(OBJS)\htmllib_m_span.o: ../../src/html/m_span.cpp + $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\htmllib_m_style.o: ../../src/html/m_style.cpp $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\htmllib_m_tables.o: ../../src/html/m_tables.cpp $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\htmllib_styleparams.o: ../../src/html/styleparams.cpp - $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $< - +$(OBJS)\htmllib_styleparams.o: ../../src/html/styleparams.cpp + $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\htmllib_winpars.o: ../../src/html/winpars.cpp $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $< diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index a7c8632dbc..370a2fe81b 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -1080,10 +1080,10 @@ HTMLDLL_OBJECTS = \ $(OBJS)\htmldll_m_links.obj \ $(OBJS)\htmldll_m_list.obj \ $(OBJS)\htmldll_m_pre.obj \ - $(OBJS)\htmldll_m_span.obj \ + $(OBJS)\htmldll_m_span.obj \ $(OBJS)\htmldll_m_style.obj \ $(OBJS)\htmldll_m_tables.obj \ - $(OBJS)\htmldll_styleparams.obj \ + $(OBJS)\htmldll_styleparams.obj \ $(OBJS)\htmldll_winpars.obj \ $(OBJS)\htmldll_htmllbox.obj HTMLDLL_RESOURCES = \ @@ -1121,10 +1121,10 @@ HTMLLIB_OBJECTS = \ $(OBJS)\htmllib_m_links.obj \ $(OBJS)\htmllib_m_list.obj \ $(OBJS)\htmllib_m_pre.obj \ - $(OBJS)\htmllib_m_span.obj \ + $(OBJS)\htmllib_m_span.obj \ $(OBJS)\htmllib_m_style.obj \ $(OBJS)\htmllib_m_tables.obj \ - $(OBJS)\htmllib_styleparams.obj \ + $(OBJS)\htmllib_styleparams.obj \ $(OBJS)\htmllib_winpars.obj \ $(OBJS)\htmllib_htmllbox.obj QADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_333)$(__DEBUGRUNTIME) /DWIN32 \ @@ -1765,10 +1765,10 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_m_links.obj \ $(OBJS)\monodll_m_list.obj \ $(OBJS)\monodll_m_pre.obj \ - $(OBJS)\monodll_m_span.obj \ + $(OBJS)\monodll_m_span.obj \ $(OBJS)\monodll_m_style.obj \ $(OBJS)\monodll_m_tables.obj \ - $(OBJS)\monodll_styleparams.obj \ + $(OBJS)\monodll_styleparams.obj \ $(OBJS)\monodll_winpars.obj \ $(OBJS)\monodll_htmllbox.obj \ $(OBJS)\monodll_debugrpt.obj \ @@ -2480,10 +2480,10 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_m_links.obj \ $(OBJS)\monolib_m_list.obj \ $(OBJS)\monolib_m_pre.obj \ - $(OBJS)\monolib_m_span.obj \ + $(OBJS)\monolib_m_span.obj \ $(OBJS)\monolib_m_style.obj \ $(OBJS)\monolib_m_tables.obj \ - $(OBJS)\monolib_styleparams.obj \ + $(OBJS)\monolib_styleparams.obj \ $(OBJS)\monolib_winpars.obj \ $(OBJS)\monolib_htmllbox.obj \ $(OBJS)\monolib_debugrpt.obj \ @@ -7016,18 +7016,18 @@ $(OBJS)\monodll_m_list.obj: ..\..\src\html\m_list.cpp $(OBJS)\monodll_m_pre.obj: ..\..\src\html\m_pre.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_pre.cpp -$(OBJS)\monodll_m_span.obj: ..\..\src\html\m_span.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_span.cpp - +$(OBJS)\monodll_m_span.obj: ..\..\src\html\m_span.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_span.cpp + $(OBJS)\monodll_m_style.obj: ..\..\src\html\m_style.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_style.cpp $(OBJS)\monodll_m_tables.obj: ..\..\src\html\m_tables.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_tables.cpp -$(OBJS)\monodll_styleparams.obj: ..\..\src\html\styleparams.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\styleparams.cpp - +$(OBJS)\monodll_styleparams.obj: ..\..\src\html\styleparams.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\styleparams.cpp + $(OBJS)\monodll_winpars.obj: ..\..\src\html\winpars.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\winpars.cpp @@ -9223,18 +9223,18 @@ $(OBJS)\monolib_m_list.obj: ..\..\src\html\m_list.cpp $(OBJS)\monolib_m_pre.obj: ..\..\src\html\m_pre.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_pre.cpp -$(OBJS)\monolib_m_span.obj: ..\..\src\html\m_span.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_span.cpp - +$(OBJS)\monolib_m_span.obj: ..\..\src\html\m_span.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_span.cpp + $(OBJS)\monolib_m_style.obj: ..\..\src\html\m_style.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_style.cpp $(OBJS)\monolib_m_tables.obj: ..\..\src\html\m_tables.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_tables.cpp -$(OBJS)\monolib_styleparams.obj: ..\..\src\html\styleparams.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\styleparams.cpp - +$(OBJS)\monolib_styleparams.obj: ..\..\src\html\styleparams.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\styleparams.cpp + $(OBJS)\monolib_winpars.obj: ..\..\src\html\winpars.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\winpars.cpp @@ -14345,18 +14345,18 @@ $(OBJS)\htmldll_m_list.obj: ..\..\src\html\m_list.cpp $(OBJS)\htmldll_m_pre.obj: ..\..\src\html\m_pre.cpp $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_pre.cpp -$(OBJS)\htmldll_m_span.obj: ..\..\src\html\m_span.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_span.cpp - +$(OBJS)\htmldll_m_span.obj: ..\..\src\html\m_span.cpp + $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_span.cpp + $(OBJS)\htmldll_m_style.obj: ..\..\src\html\m_style.cpp $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_style.cpp $(OBJS)\htmldll_m_tables.obj: ..\..\src\html\m_tables.cpp $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_tables.cpp -$(OBJS)\htmldll_styleparams.obj: ..\..\src\html\styleparams.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\styleparams.cpp - +$(OBJS)\htmldll_styleparams.obj: ..\..\src\html\styleparams.cpp + $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\styleparams.cpp + $(OBJS)\htmldll_winpars.obj: ..\..\src\html\winpars.cpp $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\winpars.cpp @@ -14426,18 +14426,18 @@ $(OBJS)\htmllib_m_list.obj: ..\..\src\html\m_list.cpp $(OBJS)\htmllib_m_pre.obj: ..\..\src\html\m_pre.cpp $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_pre.cpp -$(OBJS)\htmllib_m_span.obj: ..\..\src\html\m_span.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_span.cpp - +$(OBJS)\htmllib_m_span.obj: ..\..\src\html\m_span.cpp + $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_span.cpp + $(OBJS)\htmllib_m_style.obj: ..\..\src\html\m_style.cpp $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_style.cpp $(OBJS)\htmllib_m_tables.obj: ..\..\src\html\m_tables.cpp $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_tables.cpp -$(OBJS)\htmllib_styleparams.obj: ..\..\src\html\styleparams.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\styleparams.cpp - +$(OBJS)\htmllib_styleparams.obj: ..\..\src\html\styleparams.cpp + $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\styleparams.cpp + $(OBJS)\htmllib_winpars.obj: ..\..\src\html\winpars.cpp $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\winpars.cpp diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat index 62ce320d17..271393573a 100644 --- a/build/msw/makefile.wat +++ b/build/msw/makefile.wat @@ -123,10 +123,10 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_m_links.obj & $(OBJS)\monodll_m_list.obj & $(OBJS)\monodll_m_pre.obj & - $(OBJS)\monodll_m_span.obj & + $(OBJS)\monodll_m_span.obj & $(OBJS)\monodll_m_style.obj & $(OBJS)\monodll_m_tables.obj & - $(OBJS)\monodll_styleparams.obj & + $(OBJS)\monodll_styleparams.obj & $(OBJS)\monodll_winpars.obj & $(OBJS)\monodll_htmllbox.obj & $(OBJS)\monodll_debugrpt.obj & @@ -843,10 +843,10 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_m_links.obj & $(OBJS)\monolib_m_list.obj & $(OBJS)\monolib_m_pre.obj & - $(OBJS)\monolib_m_span.obj & + $(OBJS)\monolib_m_span.obj & $(OBJS)\monolib_m_style.obj & $(OBJS)\monolib_m_tables.obj & - $(OBJS)\monolib_styleparams.obj & + $(OBJS)\monolib_styleparams.obj & $(OBJS)\monolib_winpars.obj & $(OBJS)\monolib_htmllbox.obj & $(OBJS)\monolib_debugrpt.obj & @@ -4231,10 +4231,10 @@ HTMLDLL_OBJECTS = & $(OBJS)\htmldll_m_links.obj & $(OBJS)\htmldll_m_list.obj & $(OBJS)\htmldll_m_pre.obj & - $(OBJS)\htmldll_m_span.obj & + $(OBJS)\htmldll_m_span.obj & $(OBJS)\htmldll_m_style.obj & $(OBJS)\htmldll_m_tables.obj & - $(OBJS)\htmldll_styleparams.obj & + $(OBJS)\htmldll_styleparams.obj & $(OBJS)\htmldll_winpars.obj & $(OBJS)\htmldll_htmllbox.obj HTMLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & @@ -4268,10 +4268,10 @@ HTMLLIB_OBJECTS = & $(OBJS)\htmllib_m_links.obj & $(OBJS)\htmllib_m_list.obj & $(OBJS)\htmllib_m_pre.obj & - $(OBJS)\htmllib_m_span.obj & + $(OBJS)\htmllib_m_span.obj & $(OBJS)\htmllib_m_style.obj & $(OBJS)\htmllib_m_tables.obj & - $(OBJS)\htmllib_styleparams.obj & + $(OBJS)\htmllib_styleparams.obj & $(OBJS)\htmllib_winpars.obj & $(OBJS)\htmllib_htmllbox.obj QADLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & @@ -6843,18 +6843,18 @@ $(OBJS)\monodll_m_list.obj : .AUTODEPEND ..\..\src\html\m_list.cpp $(OBJS)\monodll_m_pre.obj : .AUTODEPEND ..\..\src\html\m_pre.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_m_span.obj : .AUTODEPEND ..\..\src\html\m_span.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - +$(OBJS)\monodll_m_span.obj : .AUTODEPEND ..\..\src\html\m_span.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_m_style.obj : .AUTODEPEND ..\..\src\html\m_style.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(OBJS)\monodll_m_tables.obj : .AUTODEPEND ..\..\src\html\m_tables.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_styleparams.obj : .AUTODEPEND ..\..\src\html\styleparams.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - +$(OBJS)\monodll_styleparams.obj : .AUTODEPEND ..\..\src\html\styleparams.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_winpars.obj : .AUTODEPEND ..\..\src\html\winpars.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -9050,18 +9050,18 @@ $(OBJS)\monolib_m_list.obj : .AUTODEPEND ..\..\src\html\m_list.cpp $(OBJS)\monolib_m_pre.obj : .AUTODEPEND ..\..\src\html\m_pre.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_m_span.obj : .AUTODEPEND ..\..\src\html\m_span.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - +$(OBJS)\monolib_m_span.obj : .AUTODEPEND ..\..\src\html\m_span.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_m_style.obj : .AUTODEPEND ..\..\src\html\m_style.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(OBJS)\monolib_m_tables.obj : .AUTODEPEND ..\..\src\html\m_tables.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_styleparams.obj : .AUTODEPEND ..\..\src\html\styleparams.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - +$(OBJS)\monolib_styleparams.obj : .AUTODEPEND ..\..\src\html\styleparams.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_winpars.obj : .AUTODEPEND ..\..\src\html\winpars.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -14172,18 +14172,18 @@ $(OBJS)\htmldll_m_list.obj : .AUTODEPEND ..\..\src\html\m_list.cpp $(OBJS)\htmldll_m_pre.obj : .AUTODEPEND ..\..\src\html\m_pre.cpp $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< -$(OBJS)\htmldll_m_span.obj : .AUTODEPEND ..\..\src\html\m_span.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - +$(OBJS)\htmldll_m_span.obj : .AUTODEPEND ..\..\src\html\m_span.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< + $(OBJS)\htmldll_m_style.obj : .AUTODEPEND ..\..\src\html\m_style.cpp $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< $(OBJS)\htmldll_m_tables.obj : .AUTODEPEND ..\..\src\html\m_tables.cpp $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< -$(OBJS)\htmldll_styleparams.obj : .AUTODEPEND ..\..\src\html\styleparams.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - +$(OBJS)\htmldll_styleparams.obj : .AUTODEPEND ..\..\src\html\styleparams.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< + $(OBJS)\htmldll_winpars.obj : .AUTODEPEND ..\..\src\html\winpars.cpp $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< @@ -14253,18 +14253,18 @@ $(OBJS)\htmllib_m_list.obj : .AUTODEPEND ..\..\src\html\m_list.cpp $(OBJS)\htmllib_m_pre.obj : .AUTODEPEND ..\..\src\html\m_pre.cpp $(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< -$(OBJS)\htmllib_m_span.obj : .AUTODEPEND ..\..\src\html\m_span.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - +$(OBJS)\htmllib_m_span.obj : .AUTODEPEND ..\..\src\html\m_span.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< + $(OBJS)\htmllib_m_style.obj : .AUTODEPEND ..\..\src\html\m_style.cpp $(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< $(OBJS)\htmllib_m_tables.obj : .AUTODEPEND ..\..\src\html\m_tables.cpp $(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< -$(OBJS)\htmllib_styleparams.obj : .AUTODEPEND ..\..\src\html\styleparams.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - +$(OBJS)\htmllib_styleparams.obj : .AUTODEPEND ..\..\src\html\styleparams.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< + $(OBJS)\htmllib_winpars.obj : .AUTODEPEND ..\..\src\html\winpars.cpp $(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< diff --git a/build/msw/wx_base.dsp b/build/msw/wx_base.dsp index ab89738141..fcb0246ac4 100644 --- a/build/msw/wx_base.dsp +++ b/build/msw/wx_base.dsp @@ -1403,6 +1403,10 @@ SOURCE=..\..\include\wx\msgout.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\msgqueue.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\mstream.h # End Source File # Begin Source File diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp index cd967f3707..373752784b 100644 --- a/build/msw/wx_core.dsp +++ b/build/msw/wx_core.dsp @@ -5722,10 +5722,10 @@ SOURCE=..\..\include\wx\html\m_templ.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\html\styleparams.h -# End Source File -# Begin Source File - +SOURCE=..\..\include\wx\html\styleparams.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\html\winpars.h # End Source File # End Group diff --git a/build/msw/wx_html.dsp b/build/msw/wx_html.dsp index bd3585020c..344c0def0f 100644 --- a/build/msw/wx_html.dsp +++ b/build/msw/wx_html.dsp @@ -381,10 +381,10 @@ SOURCE=..\..\src\html\m_pre.cpp # End Source File # Begin Source File -SOURCE=..\..\src\html\m_span.cpp -# End Source File -# Begin Source File - +SOURCE=..\..\src\html\m_span.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\html\m_style.cpp # End Source File # Begin Source File @@ -393,10 +393,10 @@ SOURCE=..\..\src\html\m_tables.cpp # End Source File # Begin Source File -SOURCE=..\..\src\html\styleparams.cpp -# End Source File -# Begin Source File - +SOURCE=..\..\src\html\styleparams.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\html\winpars.cpp # End Source File # End Group @@ -702,10 +702,10 @@ SOURCE=..\..\include\wx\html\m_templ.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\html\styleparams.h -# End Source File -# Begin Source File - +SOURCE=..\..\include\wx\html\styleparams.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\html\winpars.h # End Source File # End Group diff --git a/build/msw/wx_vc7_base.vcproj b/build/msw/wx_vc7_base.vcproj index 4948436c67..14b0613c64 100644 --- a/build/msw/wx_vc7_base.vcproj +++ b/build/msw/wx_vc7_base.vcproj @@ -1484,6 +1484,9 @@ + + diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj index 7140616f8b..54f8b70874 100644 --- a/build/msw/wx_vc7_core.vcproj +++ b/build/msw/wx_vc7_core.vcproj @@ -4897,9 +4897,9 @@ RelativePath="..\..\include\wx\html\m_templ.h"> - - + + diff --git a/build/msw/wx_vc7_html.vcproj b/build/msw/wx_vc7_html.vcproj index d63f1fcfd8..24c0aa97de 100644 --- a/build/msw/wx_vc7_html.vcproj +++ b/build/msw/wx_vc7_html.vcproj @@ -670,18 +670,18 @@ RelativePath="..\..\src\html\m_pre.cpp"> - - + + - - + + @@ -911,9 +911,9 @@ RelativePath="..\..\include\wx\html\m_templ.h"> - - + + diff --git a/build/msw/wx_vc8_base.vcproj b/build/msw/wx_vc8_base.vcproj index ccb6393d44..a54045eda0 100644 --- a/build/msw/wx_vc8_base.vcproj +++ b/build/msw/wx_vc8_base.vcproj @@ -1997,6 +1997,10 @@ RelativePath="..\..\include\wx\msgout.h" > + + diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj index 68dd8aa2cf..eab882b2da 100644 --- a/build/msw/wx_vc8_core.vcproj +++ b/build/msw/wx_vc8_core.vcproj @@ -6547,10 +6547,10 @@ > - - + + diff --git a/build/msw/wx_vc8_html.vcproj b/build/msw/wx_vc8_html.vcproj index 71e523a04f..71361ec5b8 100644 --- a/build/msw/wx_vc8_html.vcproj +++ b/build/msw/wx_vc8_html.vcproj @@ -926,10 +926,10 @@ > - - + + @@ -938,10 +938,10 @@ > - - + + @@ -1233,10 +1233,10 @@ > - - + + diff --git a/build/msw/wx_vc9_base.vcproj b/build/msw/wx_vc9_base.vcproj index 2f4ff8b5e9..4a8a4dc9c9 100644 --- a/build/msw/wx_vc9_base.vcproj +++ b/build/msw/wx_vc9_base.vcproj @@ -1993,6 +1993,10 @@ RelativePath="..\..\include\wx\msgout.h" > + + diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj index 1530323594..6728a3e828 100644 --- a/build/msw/wx_vc9_core.vcproj +++ b/build/msw/wx_vc9_core.vcproj @@ -6543,10 +6543,10 @@ > - - + + diff --git a/build/msw/wx_vc9_html.vcproj b/build/msw/wx_vc9_html.vcproj index d6ade79ba2..b2c8d9aa83 100644 --- a/build/msw/wx_vc9_html.vcproj +++ b/build/msw/wx_vc9_html.vcproj @@ -922,10 +922,10 @@ > - - + + @@ -934,10 +934,10 @@ > - - + + @@ -1229,10 +1229,10 @@ > - - + + diff --git a/wxGTK.spec b/wxGTK.spec index 987857ebe6..724fee3a4f 100644 --- a/wxGTK.spec +++ b/wxGTK.spec @@ -285,6 +285,7 @@ wx/mimetype.h wx/module.h wx/mousestate.h wx/msgout.h +wx/msgqueue.h wx/mstream.h wx/object.h wx/platform.h diff --git a/wxMotif.spec b/wxMotif.spec index 708fe15c05..bb516bbf43 100644 --- a/wxMotif.spec +++ b/wxMotif.spec @@ -190,6 +190,7 @@ wx/mimetype.h wx/module.h wx/mousestate.h wx/msgout.h +wx/msgqueue.h wx/mstream.h wx/object.h wx/platform.h diff --git a/wxX11.spec b/wxX11.spec index 3480e31486..46ee82ce44 100644 --- a/wxX11.spec +++ b/wxX11.spec @@ -214,6 +214,7 @@ wx/mimetype.h wx/module.h wx/mousestate.h wx/msgout.h +wx/msgqueue.h wx/mstream.h wx/object.h wx/platform.h -- 2.45.2