wxHTML 8.3 convention

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3806 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-03 17:56:02 +00:00
parent 275abf24e1
commit 2131a664df
6 changed files with 74 additions and 77 deletions
--- a/distrib/msw/tmake/vc.t
+++ b/distrib/msw/tmake/vc.t
@@ -41,6 +41,14 @@
        $file =~ s/cp?p?$/obj/;
        $project{"WXMSWOBJS"} .= '$D\\' . $file . " ";
    }
+
+    foreach $file (sort keys %wxHTML) {
+        next if $wxHTML{$file} =~ /\b16\b/;
+
+        $file =~ s/cp?p?$/obj/;
+        $project{"WXHTMLOBJS"} .= "..\\html\\\$D\\" . $file . " "
+    }
+
 #$}
 # This file was automatically generated by tmake at #$ Now()
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
@@ -139,25 +147,8 @@ COMMONOBJS = \

 MSWOBJS = #$ ExpandList("WXMSWOBJS");

-HTMLOBJS = \
-  ..\html\$D\helpdata.obj \
-  ..\html\$D\helpfrm.obj \
-  ..\html\$D\helpctrl.obj \
-  ..\html\$D\htmlcell.obj \
-  ..\html\$D\htmlfilter.obj \
-  ..\html\$D\htmlparser.obj \
-  ..\html\$D\htmltag.obj \
-  ..\html\$D\htmlwin.obj \
-  ..\html\$D\htmlwinparser.obj \
-  ..\html\$D\mod_fonts.obj \
-  ..\html\$D\mod_hline.obj \
-  ..\html\$D\mod_image.obj \
-  ..\html\$D\mod_layout.obj \
-  ..\html\$D\mod_links.obj \
-  ..\html\$D\mod_list.obj \
-  ..\html\$D\mod_pre.obj \
-  ..\html\$D\mod_tables.obj \
-  ..\html\$D\search.obj
+HTMLOBJS = #$ ExpandList("WXHTMLOBJS");
+

 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
 # Add $(HTMLOBJS) if wanting wxHTML classes
--- a/distrib/msw/tmake/vc6.t
+++ b/distrib/msw/tmake/vc6.t
@@ -30,6 +30,11 @@
        my $tag = $wxMSW{$file} =~ /\bO\b/ ? "WXOLESRCS" : "WXMSWSRCS";
        $project{$tag} .= $file . " "
    }
+
+    foreach $file (sort keys %wxHTML) {
+        next if $wxHTML{$file} =~ /\b16\b/;
+        $project{"WXHTMLSRCS"} .= $file . " "
+    }
 #$}
 # Microsoft Developer Studio Project File - Name="wxWindows" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
@@ -125,6 +130,7 @@ SOURCE=.\src\msw\dummy.cpp
 #$ ExpandGlue("WXGENERICSRCS", "# Begin Source File\n\nSOURCE=.\\src\\generic\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\generic\\", "\n# End Source File\n");
 #$ ExpandGlue("WXCOMMONSRCS", "# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# End Source File\n");
 #$ ExpandGlue("WXCSRCS", "# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n");
+#$ ExpandGlue("WXHTMLSRCS", "# Begin Source File\n\nSOURCE=.\\src\\html\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\html\\", "\n# End Source File\n");

 # Begin Source File

--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 20:06, 1999/10/02
+# This file was automatically generated by tmake at 18:29, 1999/10/03
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!

 # File:     makefile.vc
@@ -305,25 +305,25 @@ MSWOBJS = ..\msw\$D\accel.obj \
 		..\msw\$D\window.obj \
 		..\msw\$D\xpmhand.obj

-HTMLOBJS = \
-  ..\html\$D\helpdata.obj \
-  ..\html\$D\helpfrm.obj \
-  ..\html\$D\helpctrl.obj \
-  ..\html\$D\htmlcell.obj \
-  ..\html\$D\htmlfilter.obj \
-  ..\html\$D\htmlparser.obj \
-  ..\html\$D\htmltag.obj \
-  ..\html\$D\htmlwin.obj \
-  ..\html\$D\htmlwinparser.obj \
-  ..\html\$D\mod_fonts.obj \
-  ..\html\$D\mod_hline.obj \
-  ..\html\$D\mod_image.obj \
-  ..\html\$D\mod_layout.obj \
-  ..\html\$D\mod_links.obj \
-  ..\html\$D\mod_list.obj \
-  ..\html\$D\mod_pre.obj \
-  ..\html\$D\mod_tables.obj \
-  ..\html\$D\search.obj
+HTMLOBJS = ..\html\$D\helpctrl.obj \
+		..\html\$D\helpdata.obj \
+		..\html\$D\helpfrm.obj \
+		..\html\$D\htmlcell.obj \
+		..\html\$D\htmlfilt.obj \
+		..\html\$D\htmlpars.obj \
+		..\html\$D\htmltag.obj \
+		..\html\$D\htmlwin.obj \
+		..\html\$D\m_fonts.obj \
+		..\html\$D\m_hline.obj \
+		..\html\$D\m_image.obj \
+		..\html\$D\m_layout.obj \
+		..\html\$D\m_links.obj \
+		..\html\$D\m_list.obj \
+		..\html\$D\m_pre.obj \
+		..\html\$D\m_tables.obj \
+		..\html\$D\search.obj \
+		..\html\$D\winpars.obj
+

 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
 # Add $(HTMLOBJS) if wanting wxHTML classes
--- a/src/wxvc.dsp
+++ b/src/wxvc.dsp
@@ -547,11 +547,11 @@ SOURCE=.\html\htmlcell.cpp
 # End Source File
 # Begin Source File

-SOURCE=.\html\htmlfilter.cpp
+SOURCE=.\html\htmlfilt.cpp
 # End Source File
 # Begin Source File

-SOURCE=.\html\htmlparser.cpp
+SOURCE=.\html\htmlpars.cpp
 # End Source File
 # Begin Source File

@@ -563,39 +563,39 @@ SOURCE=.\html\htmlwin.cpp
 # End Source File
 # Begin Source File

-SOURCE=.\html\htmlwinparser.cpp
+SOURCE=.\html\winpars.cpp
 # End Source File
 # Begin Source File

-SOURCE=.\html\mod_fonts.cpp
+SOURCE=.\html\m_fonts.cpp
 # End Source File
 # Begin Source File

-SOURCE=.\html\mod_hline.cpp
+SOURCE=.\html\m_hline.cpp
 # End Source File
 # Begin Source File

-SOURCE=.\html\mod_image.cpp
+SOURCE=.\html\m_image.cpp
 # End Source File
 # Begin Source File

-SOURCE=.\html\mod_layout.cpp
+SOURCE=.\html\m_layout.cpp
 # End Source File
 # Begin Source File

-SOURCE=.\html\mod_links.cpp
+SOURCE=.\html\m_links.cpp
 # End Source File
 # Begin Source File

-SOURCE=.\html\mod_list.cpp
+SOURCE=.\html\m_list.cpp
 # End Source File
 # Begin Source File

-SOURCE=.\html\mod_pre.cpp
+SOURCE=.\html\m_pre.cpp
 # End Source File
 # Begin Source File

-SOURCE=.\html\mod_tables.cpp
+SOURCE=.\html\m_tables.cpp
 # End Source File
 # Begin Source File

--- a/src/wxvc6.dsp
+++ b/src/wxvc6.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O1 /Ob2 /I "../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
 # ADD BASE RSC /l 0x809
 # ADD RSC /l 0x809
 BSC32=bscmake.exe
@@ -64,7 +64,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /Z7 /Od /I "../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /Z7 /Od /I "../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
 # ADD BASE RSC /l 0x809
 # ADD RSC /l 0x809
 BSC32=bscmake.exe
@@ -562,11 +562,11 @@ SOURCE=.\html\htmlcell.cpp
 # End Source File
 # Begin Source File

-SOURCE=.\html\htmlfilter.cpp
+SOURCE=.\html\htmlfilt.cpp
 # End Source File
 # Begin Source File

-SOURCE=.\html\htmlparser.cpp
+SOURCE=.\html\htmlpars.cpp
 # End Source File
 # Begin Source File

@@ -578,44 +578,44 @@ SOURCE=.\html\htmlwin.cpp
 # End Source File
 # Begin Source File

-SOURCE=.\html\htmlwinparser.cpp
+SOURCE=.\html\m_fonts.cpp
 # End Source File
 # Begin Source File

-SOURCE=.\html\mod_fonts.cpp
+SOURCE=.\html\m_hline.cpp
 # End Source File
 # Begin Source File

-SOURCE=.\html\mod_hline.cpp
+SOURCE=.\html\m_image.cpp
 # End Source File
 # Begin Source File

-SOURCE=.\html\mod_image.cpp
+SOURCE=.\html\m_layout.cpp
 # End Source File
 # Begin Source File

-SOURCE=.\html\mod_layout.cpp
+SOURCE=.\html\m_links.cpp
 # End Source File
 # Begin Source File

-SOURCE=.\html\mod_links.cpp
+SOURCE=.\html\m_list.cpp
 # End Source File
 # Begin Source File

-SOURCE=.\html\mod_list.cpp
+SOURCE=.\html\m_pre.cpp
 # End Source File
 # Begin Source File

-SOURCE=.\html\mod_pre.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\html\mod_tables.cpp
+SOURCE=.\html\m_tables.cpp
 # End Source File
 # Begin Source File

 SOURCE=.\html\search.cpp
 # End Source File
+# Begin Source File
+
+SOURCE=.\html\winpars.cpp
+# End Source File
 # End Group
 # Begin Group "MSW Files"

--- a/src/wxvc_dll.dsp
+++ b/src/wxvc_dll.dsp
@@ -555,11 +555,11 @@ SOURCE=.\html\htmlcell.cpp
 # End Source File
 # Begin Source File

-SOURCE=.\html\htmlfilter.cpp
+SOURCE=.\html\htmlfilt.cpp
 # End Source File
 # Begin Source File

-SOURCE=.\html\htmlparser.cpp
+SOURCE=.\html\htmlpars.cpp
 # End Source File
 # Begin Source File

@@ -571,39 +571,39 @@ SOURCE=.\html\htmlwin.cpp
 # End Source File
 # Begin Source File

-SOURCE=.\html\htmlwinparser.cpp
+SOURCE=.\html\winpars.cpp
 # End Source File
 # Begin Source File

-SOURCE=.\html\mod_fonts.cpp
+SOURCE=.\html\m_fonts.cpp
 # End Source File
 # Begin Source File

-SOURCE=.\html\mod_hline.cpp
+SOURCE=.\html\m_hline.cpp
 # End Source File
 # Begin Source File

-SOURCE=.\html\mod_image.cpp
+SOURCE=.\html\m_image.cpp
 # End Source File
 # Begin Source File

-SOURCE=.\html\mod_layout.cpp
+SOURCE=.\html\m_layout.cpp
 # End Source File
 # Begin Source File

-SOURCE=.\html\mod_links.cpp
+SOURCE=.\html\m_links.cpp
 # End Source File
 # Begin Source File

-SOURCE=.\html\mod_list.cpp
+SOURCE=.\html\m_list.cpp
 # End Source File
 # Begin Source File

-SOURCE=.\html\mod_pre.cpp
+SOURCE=.\html\m_pre.cpp
 # End Source File
 # Begin Source File

-SOURCE=.\html\mod_tables.cpp
+SOURCE=.\html\m_tables.cpp
 # End Source File
 # Begin Source File