X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a989a329db4ca53a51f9c766508b62cf43ca95eb..4d833b7b7f86cc7a182a07b52e96705ca7c4c49f:/build/msw/wx_wxscintilla.dsp diff --git a/build/msw/wx_wxscintilla.dsp b/build/msw/wx_wxscintilla.dsp index ae8e91806b..474972ec42 100644 --- a/build/msw/wx_wxscintilla.dsp +++ b/build/msw/wx_wxscintilla.dsp @@ -17,20 +17,12 @@ CFG=wxscintilla - Win32 Debug !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "wxscintilla - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Static Library") -!MESSAGE "wxscintilla - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Static Library") !MESSAGE "wxscintilla - Win32 DLL Universal Release" (based on "Win32 (x86) Static Library") !MESSAGE "wxscintilla - Win32 DLL Universal Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "wxscintilla - Win32 DLL Unicode Release" (based on "Win32 (x86) Static Library") -!MESSAGE "wxscintilla - Win32 DLL Unicode Debug" (based on "Win32 (x86) Static Library") !MESSAGE "wxscintilla - Win32 DLL Release" (based on "Win32 (x86) Static Library") !MESSAGE "wxscintilla - Win32 DLL Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "wxscintilla - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library") -!MESSAGE "wxscintilla - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library") !MESSAGE "wxscintilla - Win32 Universal Release" (based on "Win32 (x86) Static Library") !MESSAGE "wxscintilla - Win32 Universal Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "wxscintilla - Win32 Unicode Release" (based on "Win32 (x86) Static Library") -!MESSAGE "wxscintilla - Win32 Unicode Debug" (based on "Win32 (x86) Static Library") !MESSAGE "wxscintilla - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "wxscintilla - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE @@ -42,20 +34,20 @@ CFG=wxscintilla - Win32 Debug CPP=cl.exe RSC=rc.exe -!IF "$(CFG)" == "wxscintilla - Win32 DLL Universal Unicode Release" +!IF "$(CFG)" == "wxscintilla - Win32 DLL Universal Release" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\lib\vc_dll" # PROP BASE Intermediate_Dir "vc_mswunivudll\wxscintilla" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 +# PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswunivudll\wxscintilla" # PROP Target_Dir "" -# 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 -# 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 +# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_dll\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c +# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_dll\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -65,7 +57,7 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintilla.lib" # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintilla.lib" -!ELSEIF "$(CFG)" == "wxscintilla - Win32 DLL Universal Unicode Debug" +!ELSEIF "$(CFG)" == "wxscintilla - Win32 DLL Universal Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -77,8 +69,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswunivuddll\wxscintilla" # PROP Target_Dir "" -# 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 -# 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 +# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_dll\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c +# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_dll\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -88,66 +80,20 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintillad.lib" # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintillad.lib" -!ELSEIF "$(CFG)" == "wxscintilla - Win32 DLL Universal Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\..\lib\vc_dll" -# PROP BASE Intermediate_Dir "vc_mswunivdll\wxscintilla" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\lib\vc_dll" -# PROP Intermediate_Dir "vc_mswunivdll\wxscintilla" -# PROP Target_Dir "" -# 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 -# 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 -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintilla.lib" -# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintilla.lib" - -!ELSEIF "$(CFG)" == "wxscintilla - Win32 DLL Universal Debug" +!ELSEIF "$(CFG)" == "wxscintilla - Win32 DLL Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\lib\vc_dll" -# PROP BASE Intermediate_Dir "vc_mswunivddll\wxscintilla" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\lib\vc_dll" -# PROP Intermediate_Dir "vc_mswunivddll\wxscintilla" -# PROP Target_Dir "" -# 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 -# 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 -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintillad.lib" -# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintillad.lib" - -!ELSEIF "$(CFG)" == "wxscintilla - Win32 DLL Unicode Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\..\lib\vc_dll" # PROP BASE Intermediate_Dir "vc_mswudll\wxscintilla" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 +# PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswudll\wxscintilla" # PROP Target_Dir "" -# 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 -# 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 +# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_dll\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c +# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_dll\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -157,7 +103,7 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintilla.lib" # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintilla.lib" -!ELSEIF "$(CFG)" == "wxscintilla - Win32 DLL Unicode Debug" +!ELSEIF "$(CFG)" == "wxscintilla - Win32 DLL Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -169,8 +115,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswuddll\wxscintilla" # PROP Target_Dir "" -# 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 -# 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 +# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_dll\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c +# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_dll\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -180,66 +126,20 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintillad.lib" # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintillad.lib" -!ELSEIF "$(CFG)" == "wxscintilla - Win32 DLL Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\..\lib\vc_dll" -# PROP BASE Intermediate_Dir "vc_mswdll\wxscintilla" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\lib\vc_dll" -# PROP Intermediate_Dir "vc_mswdll\wxscintilla" -# PROP Target_Dir "" -# 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 -# 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 -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintilla.lib" -# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintilla.lib" - -!ELSEIF "$(CFG)" == "wxscintilla - Win32 DLL Debug" +!ELSEIF "$(CFG)" == "wxscintilla - Win32 Universal Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\..\lib\vc_dll" -# PROP BASE Intermediate_Dir "vc_mswddll\wxscintilla" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\lib\vc_dll" -# PROP Intermediate_Dir "vc_mswddll\wxscintilla" -# PROP Target_Dir "" -# 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 -# 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 -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintillad.lib" -# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintillad.lib" - -!ELSEIF "$(CFG)" == "wxscintilla - Win32 Universal Unicode Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\lib\vc_lib" # PROP BASE Intermediate_Dir "vc_mswunivu\wxscintilla" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 +# PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\lib\vc_lib" # PROP Intermediate_Dir "vc_mswunivu\wxscintilla" # PROP Target_Dir "" -# 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 -# 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 +# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_lib\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c +# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_lib\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -249,7 +149,7 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxscintilla.lib" # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxscintilla.lib" -!ELSEIF "$(CFG)" == "wxscintilla - Win32 Universal Unicode Debug" +!ELSEIF "$(CFG)" == "wxscintilla - Win32 Universal Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -261,8 +161,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\..\lib\vc_lib" # PROP Intermediate_Dir "vc_mswunivud\wxscintilla" # PROP Target_Dir "" -# 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 -# 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 +# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_lib\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c +# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_lib\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -272,66 +172,20 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxscintillad.lib" # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxscintillad.lib" -!ELSEIF "$(CFG)" == "wxscintilla - Win32 Universal Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\..\lib\vc_lib" -# PROP BASE Intermediate_Dir "vc_mswuniv\wxscintilla" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\lib\vc_lib" -# PROP Intermediate_Dir "vc_mswuniv\wxscintilla" -# PROP Target_Dir "" -# 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 -# 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 -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxscintilla.lib" -# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxscintilla.lib" - -!ELSEIF "$(CFG)" == "wxscintilla - Win32 Universal Debug" +!ELSEIF "$(CFG)" == "wxscintilla - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\lib\vc_lib" -# PROP BASE Intermediate_Dir "vc_mswunivd\wxscintilla" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\lib\vc_lib" -# PROP Intermediate_Dir "vc_mswunivd\wxscintilla" -# PROP Target_Dir "" -# 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 -# 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 -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxscintillad.lib" -# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxscintillad.lib" - -!ELSEIF "$(CFG)" == "wxscintilla - Win32 Unicode Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\..\lib\vc_lib" # PROP BASE Intermediate_Dir "vc_mswu\wxscintilla" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 +# PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\lib\vc_lib" # PROP Intermediate_Dir "vc_mswu\wxscintilla" # PROP Target_Dir "" -# 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 -# 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 +# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_lib\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c +# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_lib\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -341,7 +195,7 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxscintilla.lib" # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxscintilla.lib" -!ELSEIF "$(CFG)" == "wxscintilla - Win32 Unicode Debug" +!ELSEIF "$(CFG)" == "wxscintilla - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -353,54 +207,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\..\lib\vc_lib" # PROP Intermediate_Dir "vc_mswud\wxscintilla" # PROP Target_Dir "" -# 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 -# 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 -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxscintillad.lib" -# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxscintillad.lib" - -!ELSEIF "$(CFG)" == "wxscintilla - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\..\lib\vc_lib" -# PROP BASE Intermediate_Dir "vc_msw\wxscintilla" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\lib\vc_lib" -# PROP Intermediate_Dir "vc_msw\wxscintilla" -# PROP Target_Dir "" -# 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 -# 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 -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxscintilla.lib" -# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxscintilla.lib" - -!ELSEIF "$(CFG)" == "wxscintilla - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\..\lib\vc_lib" -# PROP BASE Intermediate_Dir "vc_mswd\wxscintilla" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\lib\vc_lib" -# PROP Intermediate_Dir "vc_mswd\wxscintilla" -# PROP Target_Dir "" -# 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 -# 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 +# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_lib\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c +# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_lib\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -414,20 +222,12 @@ LIB32=link.exe -lib # Begin Target -# Name "wxscintilla - Win32 DLL Universal Unicode Release" -# Name "wxscintilla - Win32 DLL Universal Unicode Debug" # Name "wxscintilla - Win32 DLL Universal Release" # Name "wxscintilla - Win32 DLL Universal Debug" -# Name "wxscintilla - Win32 DLL Unicode Release" -# Name "wxscintilla - Win32 DLL Unicode Debug" # Name "wxscintilla - Win32 DLL Release" # Name "wxscintilla - Win32 DLL Debug" -# Name "wxscintilla - Win32 Universal Unicode Release" -# Name "wxscintilla - Win32 Universal Unicode Debug" # Name "wxscintilla - Win32 Universal Release" # Name "wxscintilla - Win32 Universal Debug" -# Name "wxscintilla - Win32 Unicode Release" -# Name "wxscintilla - Win32 Unicode Debug" # Name "wxscintilla - Win32 Release" # Name "wxscintilla - Win32 Debug" # Begin Group "Source Files" @@ -455,6 +255,10 @@ SOURCE=..\..\src\stc\scintilla\src\ContractionState.cxx # End Source File # Begin Source File +SOURCE=..\..\src\stc\scintilla\src\Decoration.cxx +# End Source File +# Begin Source File + SOURCE=..\..\src\stc\scintilla\src\Document.cxx # End Source File # Begin Source File @@ -487,6 +291,10 @@ SOURCE=..\..\src\stc\scintilla\src\LexAPDL.cxx # End Source File # Begin Source File +SOURCE=..\..\src\stc\scintilla\src\LexASY.cxx +# End Source File +# Begin Source File + SOURCE=..\..\src\stc\scintilla\src\LexAU3.cxx # End Source File # Begin Source File @@ -495,6 +303,10 @@ SOURCE=..\..\src\stc\scintilla\src\LexAVE.cxx # End Source File # Begin Source File +SOURCE=..\..\src\stc\scintilla\src\LexAbaqus.cxx +# End Source File +# Begin Source File + SOURCE=..\..\src\stc\scintilla\src\LexAda.cxx # End Source File # Begin Source File @@ -539,6 +351,10 @@ SOURCE=..\..\src\stc\scintilla\src\LexCaml.cxx # End Source File # Begin Source File +SOURCE=..\..\src\stc\scintilla\src\LexCmake.cxx +# End Source File +# Begin Source File + SOURCE=..\..\src\stc\scintilla\src\LexConf.cxx # End Source File # Begin Source File @@ -551,6 +367,10 @@ SOURCE=..\..\src\stc\scintilla\src\LexCsound.cxx # End Source File # Begin Source File +SOURCE=..\..\src\stc\scintilla\src\LexD.cxx +# End Source File +# Begin Source File + SOURCE=..\..\src\stc\scintilla\src\LexEScript.cxx # End Source File # Begin Source File @@ -575,6 +395,10 @@ SOURCE=..\..\src\stc\scintilla\src\LexFortran.cxx # End Source File # Begin Source File +SOURCE=..\..\src\stc\scintilla\src\LexGAP.cxx +# End Source File +# Begin Source File + SOURCE=..\..\src\stc\scintilla\src\LexGui4Cli.cxx # End Source File # Begin Source File @@ -643,6 +467,10 @@ SOURCE=..\..\src\stc\scintilla\src\LexPB.cxx # End Source File # Begin Source File +SOURCE=..\..\src\stc\scintilla\src\LexPLM.cxx +# End Source File +# Begin Source File + SOURCE=..\..\src\stc\scintilla\src\LexPOV.cxx # End Source File # Begin Source File @@ -659,10 +487,18 @@ SOURCE=..\..\src\stc\scintilla\src\LexPerl.cxx # End Source File # Begin Source File +SOURCE=..\..\src\stc\scintilla\src\LexProgress.cxx +# End Source File +# Begin Source File + SOURCE=..\..\src\stc\scintilla\src\LexPython.cxx # End Source File # Begin Source File +SOURCE=..\..\src\stc\scintilla\src\LexR.cxx +# End Source File +# Begin Source File + SOURCE=..\..\src\stc\scintilla\src\LexRebol.cxx # End Source File # Begin Source File @@ -723,6 +559,10 @@ SOURCE=..\..\src\stc\scintilla\src\LineMarker.cxx # End Source File # Begin Source File +SOURCE=..\..\src\stc\scintilla\src\PositionCache.cxx +# End Source File +# Begin Source File + SOURCE=..\..\src\stc\scintilla\src\PropSet.cxx # End Source File # Begin Source File @@ -731,6 +571,10 @@ SOURCE=..\..\src\stc\scintilla\src\RESearch.cxx # End Source File # Begin Source File +SOURCE=..\..\src\stc\scintilla\src\RunStyles.cxx +# End Source File +# Begin Source File + SOURCE=..\..\src\stc\scintilla\src\ScintillaBase.cxx # End Source File # Begin Source File