Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-10-27 16:38:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

premake4 minor fix.

Browse Source 
TextDocument minor fix for CLRF.
This commit is contained in:
Martín Lucas Golini
2021-05-02 13:16:51 -03:00
parent c4d544f0b2
commit 6b28df02b3
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
premake4.lua
+5 -1
View File
@@ -496,7 +496,11 @@ end
function generate_os_links()
if os.is_real("linux") then
multiple_insert( os_links, { "rt", "pthread", "X11", "openal", "GL", "Xcursor" } )
multiple_insert( os_links, { "rt", "pthread", "X11", "GL" } )
if not _OPTIONS["with-mojoal"] then
table.insert( os_links, "openal" )
end
if _OPTIONS["with-static-eepp"] then
table.insert( os_links, "dl" )
src/eepp/ui/doc/textdocument.cpp
+7 -5
View File
@@ -109,16 +109,18 @@ bool TextDocument::loadFromStream( IOStream& file, std::string path, bool callRe
lineBuffer += ptrGetLine( bufferPtr, consume, position );
bufferPtr += position;
consume -= position;
size_t lineBufferSize = lineBuffer.size();
if ( lineBuffer[lineBuffer.size() - 1] == '\n' || !consume ) {
if ( mLines.empty() && lineBuffer.size() > 1 &&
lineBuffer[lineBuffer.size() - 2] == '\r' ) {
if ( lineBuffer[lineBufferSize - 1] == '\n' || !consume ) {
if ( mLines.empty() && lineBufferSize > 1 &&
lineBuffer[lineBufferSize - 2] == '\r' ) {
mLineEnding = LineEnding::CRLF;
}
if ( mLineEnding == LineEnding::CRLF && lineBuffer.size() > 1 ) {
if ( mLineEnding == LineEnding::CRLF && lineBufferSize > 1 &&
lineBuffer[lineBufferSize - 1] == '\n' ) {
lineBuffer[lineBuffer.size() - 2] = '\n';
lineBuffer.resize( lineBuffer.size() - 1 );
lineBuffer.resize( lineBufferSize - 1 );
}
mLines.push_back( lineBuffer );