regenerated makefiles

[wxWidgets.git] / build / msw / wx_htmldll.dsp

diff --git a/build/msw/wx_htmldll.dsp b/build/msw/wx_htmldll.dsp
index 4c3456cb7973c18e67861b7090d3ac30a8a9be3d..e101a27cb66806eab9304963a9c384e568c9201d 100644 (file)
--- a/build/msw/wx_htmldll.dsp
+++ b/build/msw/wx_htmldll.dsp
@@ -21,10 +21,10 @@ CFG=htmldll - Win32 DLL Debug
 !MESSAGE "htmldll - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "htmldll - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "htmldll - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "htmldll - Win32 DLL wxUniv Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "htmldll - Win32 DLL wxUniv Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "htmldll - Win32 DLL wxUniv Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "htmldll - Win32 DLL wxUniv Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "htmldll - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "htmldll - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "htmldll - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "htmldll - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -135,7 +135,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_mswudll\wxmsw25u_core.lib ..\..\lib\vc_mswudll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_mswudll\wxmsw250u_html_vc_custom.dll" /libpath:"..\..\lib\vc_mswudll" /implib:"..\..\lib\vc_mswudll\wxmsw25u_html.lib"
 # ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_mswudll\wxmsw25u_core.lib ..\..\lib\vc_mswudll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_mswudll\wxmsw250u_html_vc_custom.dll" /libpath:"..\..\lib\vc_mswudll" /implib:"..\..\lib\vc_mswudll\wxmsw25u_html.lib"
 
-!ELSEIF  "$(CFG)" == "htmldll - Win32 DLL wxUniv Debug"
+!ELSEIF  "$(CFG)" == "htmldll - Win32 DLL Universal Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -160,7 +160,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_mswunivddll\wxmswuniv25d_core.lib ..\..\lib\vc_mswunivddll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_mswunivddll\wxmswuniv250d_html_vc_custom.dll" /libpath:"..\..\lib\vc_mswunivddll" /implib:"..\..\lib\vc_mswunivddll\wxmswuniv25d_html.lib" /debug
 # ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_mswunivddll\wxmswuniv25d_core.lib ..\..\lib\vc_mswunivddll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_mswunivddll\wxmswuniv250d_html_vc_custom.dll" /libpath:"..\..\lib\vc_mswunivddll" /implib:"..\..\lib\vc_mswunivddll\wxmswuniv25d_html.lib" /debug
 
-!ELSEIF  "$(CFG)" == "htmldll - Win32 DLL wxUniv Release"
+!ELSEIF  "$(CFG)" == "htmldll - Win32 DLL Universal Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -185,7 +185,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_mswunivdll\wxmswuniv25_core.lib ..\..\lib\vc_mswunivdll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_mswunivdll\wxmswuniv250_html_vc_custom.dll" /libpath:"..\..\lib\vc_mswunivdll" /implib:"..\..\lib\vc_mswunivdll\wxmswuniv25_html.lib"
 # ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_mswunivdll\wxmswuniv25_core.lib ..\..\lib\vc_mswunivdll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_mswunivdll\wxmswuniv250_html_vc_custom.dll" /libpath:"..\..\lib\vc_mswunivdll" /implib:"..\..\lib\vc_mswunivdll\wxmswuniv25_html.lib"
 
-!ELSEIF  "$(CFG)" == "htmldll - Win32 DLL wxUniv Unicode Debug"
+!ELSEIF  "$(CFG)" == "htmldll - Win32 DLL Universal Unicode Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -210,7 +210,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_mswunivuddll\wxmswuniv25ud_core.lib ..\..\lib\vc_mswunivuddll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_mswunivuddll\wxmswuniv250ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_mswunivuddll" /implib:"..\..\lib\vc_mswunivuddll\wxmswuniv25ud_html.lib" /debug
 # ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_mswunivuddll\wxmswuniv25ud_core.lib ..\..\lib\vc_mswunivuddll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_mswunivuddll\wxmswuniv250ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_mswunivuddll" /implib:"..\..\lib\vc_mswunivuddll\wxmswuniv25ud_html.lib" /debug
 
-!ELSEIF  "$(CFG)" == "htmldll - Win32 DLL wxUniv Unicode Release"
+!ELSEIF  "$(CFG)" == "htmldll - Win32 DLL Universal Unicode Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -243,10 +243,10 @@ LINK32=link.exe
 # Name "htmldll - Win32 DLL Release"
 # Name "htmldll - Win32 DLL Unicode Debug"
 # Name "htmldll - Win32 DLL Unicode Release"
-# Name "htmldll - Win32 DLL wxUniv Debug"
-# Name "htmldll - Win32 DLL wxUniv Release"
-# Name "htmldll - Win32 DLL wxUniv Unicode Debug"
-# Name "htmldll - Win32 DLL wxUniv Unicode Release"
+# Name "htmldll - Win32 DLL Universal Debug"
+# Name "htmldll - Win32 DLL Universal Release"
+# Name "htmldll - Win32 DLL Universal Unicode Debug"
+# Name "htmldll - Win32 DLL Universal Unicode Release"
 # Begin Group "Common Headers"
 
 # PROP Default_Filter ""
@@ -280,10 +280,6 @@ SOURCE=..\..\include\wx\html\htmlfilt.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\htmllbox.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\wx\html\htmlpars.h
 # End Source File
 # Begin Source File
@@ -312,6 +308,10 @@ SOURCE=..\..\include\wx\html\winpars.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\htmllbox.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\wxhtml.h
 # End Source File
 # End Group