supporting alignment in single line controls, see #14452

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

diff --git a/build/msw/wx_wxscintilla.dsp b/build/msw/wx_wxscintilla.dsp
index ae8e91806b4388163ad67abe1b2ef89d26668126..2aa565df435b8a7a3a6f849fbc4dfce3c0bfab3a 100644 (file)
--- a/build/msw/wx_wxscintilla.dsp
+++ b/build/msw/wx_wxscintilla.dsp
@@ -17,20 +17,12 @@ CFG=wxscintilla - Win32 Debug
 !MESSAGE \r
 !MESSAGE Possible choices for configuration are:\r
 !MESSAGE \r
-!MESSAGE "wxscintilla - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Static Library")\r
-!MESSAGE "wxscintilla - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "wxscintilla - Win32 DLL Universal Release" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "wxscintilla - Win32 DLL Universal Debug" (based on "Win32 (x86) Static Library")\r
-!MESSAGE "wxscintilla - Win32 DLL Unicode Release" (based on "Win32 (x86) Static Library")\r
-!MESSAGE "wxscintilla - Win32 DLL Unicode Debug" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "wxscintilla - Win32 DLL Release" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "wxscintilla - Win32 DLL Debug" (based on "Win32 (x86) Static Library")\r
-!MESSAGE "wxscintilla - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")\r
-!MESSAGE "wxscintilla - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "wxscintilla - Win32 Universal Release" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "wxscintilla - Win32 Universal Debug" (based on "Win32 (x86) Static Library")\r
-!MESSAGE "wxscintilla - Win32 Unicode Release" (based on "Win32 (x86) Static Library")\r
-!MESSAGE "wxscintilla - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "wxscintilla - Win32 Release" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "wxscintilla - Win32 Debug" (based on "Win32 (x86) Static Library")\r
 !MESSAGE \r
@@ -42,20 +34,20 @@ CFG=wxscintilla - Win32 Debug
 CPP=cl.exe\r
 RSC=rc.exe\r
 \r
-!IF  "$(CFG)" == "wxscintilla - Win32 DLL Universal Unicode Release"\r
+!IF  "$(CFG)" == "wxscintilla - Win32 DLL Universal Release"\r
 \r
 # PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
+# PROP BASE Use_Debug_Libraries 1\r
 # PROP BASE Output_Dir "..\..\lib\vc_dll"\r
 # PROP BASE Intermediate_Dir "vc_mswunivudll\wxscintilla"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
+# PROP Use_Debug_Libraries 1\r
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\wxscintilla"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Fd..\..\lib\vc_dll\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Fd..\..\lib\vc_dll\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /Zi /Fd..\..\lib\vc_dll\wxscintilla.pdb /opt:ref /opt:icf /D "WIN32" /D "_LIB" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c\r
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /Zi /Fd..\..\lib\vc_dll\wxscintilla.pdb /opt:ref /opt:icf /D "WIN32" /D "_LIB" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c\r
 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
@@ -65,7 +57,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintilla.lib"\r
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintilla.lib"\r
 \r
-!ELSEIF  "$(CFG)" == "wxscintilla - Win32 DLL Universal Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "wxscintilla - Win32 DLL Universal Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
@@ -77,8 +69,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswunivuddll\wxscintilla"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /Zi /Fd..\..\lib\vc_dll\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c\r
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /Zi /Fd..\..\lib\vc_dll\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c\r
 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
@@ -88,66 +80,20 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintillad.lib"\r
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintillad.lib"\r
 \r
-!ELSEIF  "$(CFG)" == "wxscintilla - Win32 DLL Universal Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_dll"\r
-# PROP BASE Intermediate_Dir "vc_mswunivdll\wxscintilla"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\lib\vc_dll"\r
-# PROP Intermediate_Dir "vc_mswunivdll\wxscintilla"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Fd..\..\lib\vc_dll\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Fd..\..\lib\vc_dll\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
-# ADD BASE RSC /l 0x409\r
-# ADD RSC /l 0x409\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintilla.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintilla.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "wxscintilla - Win32 DLL Universal Debug"\r
+!ELSEIF  "$(CFG)" == "wxscintilla - Win32 DLL Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
 # PROP BASE Output_Dir "..\..\lib\vc_dll"\r
-# PROP BASE Intermediate_Dir "vc_mswunivddll\wxscintilla"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\lib\vc_dll"\r
-# PROP Intermediate_Dir "vc_mswunivddll\wxscintilla"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
-# ADD BASE RSC /l 0x409\r
-# ADD RSC /l 0x409\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintillad.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintillad.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "wxscintilla - Win32 DLL Unicode Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_dll"\r
 # PROP BASE Intermediate_Dir "vc_mswudll\wxscintilla"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
+# PROP Use_Debug_Libraries 1\r
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswudll\wxscintilla"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Fd..\..\lib\vc_dll\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Fd..\..\lib\vc_dll\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /Zi /Fd..\..\lib\vc_dll\wxscintilla.pdb /opt:ref /opt:icf /D "WIN32" /D "_LIB" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "__WXMSW__" /D "_UNICODE" /c\r
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /Zi /Fd..\..\lib\vc_dll\wxscintilla.pdb /opt:ref /opt:icf /D "WIN32" /D "_LIB" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "__WXMSW__" /D "_UNICODE" /c\r
 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
@@ -157,7 +103,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintilla.lib"\r
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintilla.lib"\r
 \r
-!ELSEIF  "$(CFG)" == "wxscintilla - Win32 DLL Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "wxscintilla - Win32 DLL Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
@@ -169,8 +115,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswuddll\wxscintilla"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /Zi /Fd..\..\lib\vc_dll\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "__WXMSW__" /D "_UNICODE" /c\r
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /Zi /Fd..\..\lib\vc_dll\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "__WXMSW__" /D "_UNICODE" /c\r
 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
@@ -180,66 +126,20 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintillad.lib"\r
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintillad.lib"\r
 \r
-!ELSEIF  "$(CFG)" == "wxscintilla - Win32 DLL Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_dll"\r
-# PROP BASE Intermediate_Dir "vc_mswdll\wxscintilla"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\lib\vc_dll"\r
-# PROP Intermediate_Dir "vc_mswdll\wxscintilla"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Fd..\..\lib\vc_dll\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Fd..\..\lib\vc_dll\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
-# ADD BASE RSC /l 0x409\r
-# ADD RSC /l 0x409\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintilla.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintilla.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "wxscintilla - Win32 DLL Debug"\r
+!ELSEIF  "$(CFG)" == "wxscintilla - Win32 Universal Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "..\..\lib\vc_dll"\r
-# PROP BASE Intermediate_Dir "vc_mswddll\wxscintilla"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\lib\vc_dll"\r
-# PROP Intermediate_Dir "vc_mswddll\wxscintilla"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
-# ADD BASE RSC /l 0x409\r
-# ADD RSC /l 0x409\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintillad.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintillad.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "wxscintilla - Win32 Universal Unicode Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
 # PROP BASE Output_Dir "..\..\lib\vc_lib"\r
 # PROP BASE Intermediate_Dir "vc_mswunivu\wxscintilla"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
+# PROP Use_Debug_Libraries 1\r
 # PROP Output_Dir "..\..\lib\vc_lib"\r
 # PROP Intermediate_Dir "vc_mswunivu\wxscintilla"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Fd..\..\lib\vc_lib\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Fd..\..\lib\vc_lib\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /Zi /Fd..\..\lib\vc_lib\wxscintilla.pdb /opt:ref /opt:icf /D "WIN32" /D "_LIB" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c\r
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /Zi /Fd..\..\lib\vc_lib\wxscintilla.pdb /opt:ref /opt:icf /D "WIN32" /D "_LIB" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c\r
 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
@@ -249,7 +149,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxscintilla.lib"\r
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxscintilla.lib"\r
 \r
-!ELSEIF  "$(CFG)" == "wxscintilla - Win32 Universal Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "wxscintilla - Win32 Universal Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
@@ -261,8 +161,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_lib"\r
 # PROP Intermediate_Dir "vc_mswunivud\wxscintilla"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /Zi /Fd..\..\lib\vc_lib\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c\r
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /Zi /Fd..\..\lib\vc_lib\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c\r
 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
@@ -272,66 +172,20 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxscintillad.lib"\r
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxscintillad.lib"\r
 \r
-!ELSEIF  "$(CFG)" == "wxscintilla - Win32 Universal Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_lib"\r
-# PROP BASE Intermediate_Dir "vc_mswuniv\wxscintilla"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\lib\vc_lib"\r
-# PROP Intermediate_Dir "vc_mswuniv\wxscintilla"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Fd..\..\lib\vc_lib\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Fd..\..\lib\vc_lib\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
-# ADD BASE RSC /l 0x409\r
-# ADD RSC /l 0x409\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxscintilla.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxscintilla.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "wxscintilla - Win32 Universal Debug"\r
+!ELSEIF  "$(CFG)" == "wxscintilla - Win32 Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
 # PROP BASE Output_Dir "..\..\lib\vc_lib"\r
-# PROP BASE Intermediate_Dir "vc_mswunivd\wxscintilla"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\lib\vc_lib"\r
-# PROP Intermediate_Dir "vc_mswunivd\wxscintilla"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
-# ADD BASE RSC /l 0x409\r
-# ADD RSC /l 0x409\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxscintillad.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxscintillad.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "wxscintilla - Win32 Unicode Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_lib"\r
 # PROP BASE Intermediate_Dir "vc_mswu\wxscintilla"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
+# PROP Use_Debug_Libraries 1\r
 # PROP Output_Dir "..\..\lib\vc_lib"\r
 # PROP Intermediate_Dir "vc_mswu\wxscintilla"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Fd..\..\lib\vc_lib\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Fd..\..\lib\vc_lib\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /Zi /Fd..\..\lib\vc_lib\wxscintilla.pdb /opt:ref /opt:icf /D "WIN32" /D "_LIB" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "__WXMSW__" /D "_UNICODE" /c\r
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /Zi /Fd..\..\lib\vc_lib\wxscintilla.pdb /opt:ref /opt:icf /D "WIN32" /D "_LIB" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "__WXMSW__" /D "_UNICODE" /c\r
 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
@@ -341,7 +195,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxscintilla.lib"\r
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxscintilla.lib"\r
 \r
-!ELSEIF  "$(CFG)" == "wxscintilla - Win32 Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "wxscintilla - Win32 Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
@@ -353,54 +207,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_lib"\r
 # PROP Intermediate_Dir "vc_mswud\wxscintilla"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
-# ADD BASE RSC /l 0x409\r
-# ADD RSC /l 0x409\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxscintillad.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxscintillad.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "wxscintilla - Win32 Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_lib"\r
-# PROP BASE Intermediate_Dir "vc_msw\wxscintilla"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\lib\vc_lib"\r
-# PROP Intermediate_Dir "vc_msw\wxscintilla"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Fd..\..\lib\vc_lib\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Fd..\..\lib\vc_lib\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
-# ADD BASE RSC /l 0x409\r
-# ADD RSC /l 0x409\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxscintilla.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxscintilla.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "wxscintilla - Win32 Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "..\..\lib\vc_lib"\r
-# PROP BASE Intermediate_Dir "vc_mswd\wxscintilla"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\lib\vc_lib"\r
-# PROP Intermediate_Dir "vc_mswd\wxscintilla"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /Zi /Fd..\..\lib\vc_lib\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "__WXMSW__" /D "_UNICODE" /c\r
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /Zi /Fd..\..\lib\vc_lib\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "__WXMSW__" /D "_UNICODE" /c\r
 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
@@ -414,20 +222,12 @@ LIB32=link.exe -lib
 \r
 # Begin Target\r
 \r
-# Name "wxscintilla - Win32 DLL Universal Unicode Release"\r
-# Name "wxscintilla - Win32 DLL Universal Unicode Debug"\r
 # Name "wxscintilla - Win32 DLL Universal Release"\r
 # Name "wxscintilla - Win32 DLL Universal Debug"\r
-# Name "wxscintilla - Win32 DLL Unicode Release"\r
-# Name "wxscintilla - Win32 DLL Unicode Debug"\r
 # Name "wxscintilla - Win32 DLL Release"\r
 # Name "wxscintilla - Win32 DLL Debug"\r
-# Name "wxscintilla - Win32 Universal Unicode Release"\r
-# Name "wxscintilla - Win32 Universal Unicode Debug"\r
 # Name "wxscintilla - Win32 Universal Release"\r
 # Name "wxscintilla - Win32 Universal Debug"\r
-# Name "wxscintilla - Win32 Unicode Release"\r
-# Name "wxscintilla - Win32 Unicode Debug"\r
 # Name "wxscintilla - Win32 Release"\r
 # Name "wxscintilla - Win32 Debug"\r
 # Begin Group "Source Files"\r
@@ -455,6 +255,10 @@ SOURCE=..\..\src\stc\scintilla\src\ContractionState.cxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\stc\scintilla\src\Decoration.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\stc\scintilla\src\Document.cxx\r
 # End Source File\r
 # Begin Source File\r
@@ -487,6 +291,10 @@ SOURCE=..\..\src\stc\scintilla\src\LexAPDL.cxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\stc\scintilla\src\LexASY.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\stc\scintilla\src\LexAU3.cxx\r
 # End Source File\r
 # Begin Source File\r
@@ -495,6 +303,10 @@ SOURCE=..\..\src\stc\scintilla\src\LexAVE.cxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\stc\scintilla\src\LexAbaqus.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\stc\scintilla\src\LexAda.cxx\r
 # End Source File\r
 # Begin Source File\r
@@ -527,6 +339,10 @@ SOURCE=..\..\src\stc\scintilla\src\LexCLW.cxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\stc\scintilla\src\LexCOBOL.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\stc\scintilla\src\LexCPP.cxx\r
 # End Source File\r
 # Begin Source File\r
@@ -539,6 +355,10 @@ SOURCE=..\..\src\stc\scintilla\src\LexCaml.cxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\stc\scintilla\src\LexCmake.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\stc\scintilla\src\LexConf.cxx\r
 # End Source File\r
 # Begin Source File\r
@@ -551,6 +371,10 @@ SOURCE=..\..\src\stc\scintilla\src\LexCsound.cxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\stc\scintilla\src\LexD.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\stc\scintilla\src\LexEScript.cxx\r
 # End Source File\r
 # Begin Source File\r
@@ -575,6 +399,10 @@ SOURCE=..\..\src\stc\scintilla\src\LexFortran.cxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\stc\scintilla\src\LexGAP.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\stc\scintilla\src\LexGui4Cli.cxx\r
 # End Source File\r
 # Begin Source File\r
@@ -619,6 +447,14 @@ SOURCE=..\..\src\stc\scintilla\src\LexMSSQL.cxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\stc\scintilla\src\LexMagik.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\stc\scintilla\src\LexMarkdown.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\stc\scintilla\src\LexMatlab.cxx\r
 # End Source File\r
 # Begin Source File\r
@@ -627,6 +463,14 @@ SOURCE=..\..\src\stc\scintilla\src\LexMetapost.cxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\stc\scintilla\src\LexMySQL.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\stc\scintilla\src\LexNimrod.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\stc\scintilla\src\LexNsis.cxx\r
 # End Source File\r
 # Begin Source File\r
@@ -643,6 +487,10 @@ SOURCE=..\..\src\stc\scintilla\src\LexPB.cxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\stc\scintilla\src\LexPLM.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\stc\scintilla\src\LexPOV.cxx\r
 # End Source File\r
 # Begin Source File\r
@@ -659,10 +507,26 @@ SOURCE=..\..\src\stc\scintilla\src\LexPerl.cxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\stc\scintilla\src\LexPowerPro.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\stc\scintilla\src\LexPowerShell.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\stc\scintilla\src\LexProgress.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\stc\scintilla\src\LexPython.cxx\r
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\stc\scintilla\src\LexR.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\stc\scintilla\src\LexRebol.cxx\r
 # End Source File\r
 # Begin Source File\r
@@ -671,6 +535,10 @@ SOURCE=..\..\src\stc\scintilla\src\LexRuby.cxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\stc\scintilla\src\LexSML.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\stc\scintilla\src\LexSQL.cxx\r
 # End Source File\r
 # Begin Source File\r
@@ -683,6 +551,10 @@ SOURCE=..\..\src\stc\scintilla\src\LexSmalltalk.cxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\stc\scintilla\src\LexSorcus.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\stc\scintilla\src\LexSpecman.cxx\r
 # End Source File\r
 # Begin Source File\r
@@ -691,10 +563,18 @@ SOURCE=..\..\src\stc\scintilla\src\LexSpice.cxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\stc\scintilla\src\LexTACL.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\stc\scintilla\src\LexTADS3.cxx\r
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\stc\scintilla\src\LexTAL.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\stc\scintilla\src\LexTCL.cxx\r
 # End Source File\r
 # Begin Source File\r
@@ -723,6 +603,14 @@ SOURCE=..\..\src\stc\scintilla\src\LineMarker.cxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\stc\scintilla\src\PerLine.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\stc\scintilla\src\PositionCache.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\stc\scintilla\src\PropSet.cxx\r
 # End Source File\r
 # Begin Source File\r
@@ -731,10 +619,18 @@ SOURCE=..\..\src\stc\scintilla\src\RESearch.cxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\stc\scintilla\src\RunStyles.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\stc\scintilla\src\ScintillaBase.cxx\r
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\stc\scintilla\src\Selection.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\stc\scintilla\src\Style.cxx\r
 # End Source File\r
 # Begin Source File\r
@@ -756,6 +652,239 @@ SOURCE=..\..\src\stc\scintilla\src\WindowAccessor.cxx
 # Begin Source File\r
 \r
 SOURCE=..\..\src\stc\scintilla\src\XPM.cxx\r
+# End Source File\r
+# End Group\r
+# Begin Group "Header Files"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\msw\genrcdefs.h\r
+\r
+!IF  "$(CFG)" == "wxscintilla - Win32 DLL Universal Release"\r
+\r
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h\r
+InputPath=..\..\include\wx\msw\genrcdefs.h\r
+\r
+"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivu\wx\msw"\r
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "wxscintilla - Win32 DLL Universal Debug"\r
+\r
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h\r
+InputPath=..\..\include\wx\msw\genrcdefs.h\r
+\r
+"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivud\wx\msw"\r
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "wxscintilla - Win32 DLL Release"\r
+\r
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h\r
+InputPath=..\..\include\wx\msw\genrcdefs.h\r
+\r
+"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswu\wx\msw"\r
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "wxscintilla - Win32 DLL Debug"\r
+\r
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h\r
+InputPath=..\..\include\wx\msw\genrcdefs.h\r
+\r
+"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswud\wx\msw"\r
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "wxscintilla - Win32 Universal Release"\r
+\r
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h\r
+InputPath=..\..\include\wx\msw\genrcdefs.h\r
+\r
+"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivu\wx\msw"\r
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "wxscintilla - Win32 Universal Debug"\r
+\r
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h\r
+InputPath=..\..\include\wx\msw\genrcdefs.h\r
+\r
+"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivud\wx\msw"\r
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "wxscintilla - Win32 Release"\r
+\r
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h\r
+InputPath=..\..\include\wx\msw\genrcdefs.h\r
+\r
+"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswu\wx\msw"\r
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "wxscintilla - Win32 Debug"\r
+\r
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h\r
+InputPath=..\..\include\wx\msw\genrcdefs.h\r
+\r
+"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswud\wx\msw"\r
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
+\r
+# End Custom Build\r
+\r
+!ENDIF\r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\msw\setup.h\r
+\r
+!IF  "$(CFG)" == "wxscintilla - Win32 DLL Universal Release"\r
+\r
+# Begin Custom Build - \r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "wxscintilla - Win32 DLL Universal Debug"\r
+\r
+# Begin Custom Build - \r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "wxscintilla - Win32 DLL Release"\r
+\r
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h\r
+InputPath=..\..\include\wx\msw\setup.h\r
+\r
+"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h\r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "wxscintilla - Win32 DLL Debug"\r
+\r
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h\r
+InputPath=..\..\include\wx\msw\setup.h\r
+\r
+"..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h\r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "wxscintilla - Win32 Universal Release"\r
+\r
+# Begin Custom Build - \r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "wxscintilla - Win32 Universal Debug"\r
+\r
+# Begin Custom Build - \r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "wxscintilla - Win32 Release"\r
+\r
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h\r
+InputPath=..\..\include\wx\msw\setup.h\r
+\r
+"..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h\r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "wxscintilla - Win32 Debug"\r
+\r
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h\r
+InputPath=..\..\include\wx\msw\setup.h\r
+\r
+"..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h\r
+\r
+# End Custom Build\r
+\r
+!ENDIF\r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\univ\setup.h\r
+\r
+!IF  "$(CFG)" == "wxscintilla - Win32 DLL Universal Release"\r
+\r
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h\r
+InputPath=..\..\include\wx\univ\setup.h\r
+\r
+"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h\r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "wxscintilla - Win32 DLL Universal Debug"\r
+\r
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h\r
+InputPath=..\..\include\wx\univ\setup.h\r
+\r
+"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h\r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "wxscintilla - Win32 DLL Release"\r
+\r
+# Begin Custom Build - \r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "wxscintilla - Win32 DLL Debug"\r
+\r
+# Begin Custom Build - \r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "wxscintilla - Win32 Universal Release"\r
+\r
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h\r
+InputPath=..\..\include\wx\univ\setup.h\r
+\r
+"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h\r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "wxscintilla - Win32 Universal Debug"\r
+\r
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h\r
+InputPath=..\..\include\wx\univ\setup.h\r
+\r
+"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h\r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "wxscintilla - Win32 Release"\r
+\r
+# Begin Custom Build - \r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "wxscintilla - Win32 Debug"\r
+\r
+# Begin Custom Build - \r
+\r
+# End Custom Build\r
+\r
+!ENDIF\r
+\r
 # End Source File\r
 # End Group\r
 # End Target\r