diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2019-09-04 13:18:49 -0700 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2019-09-04 13:18:49 -0700 |
| commit | a7ef6c4cbf5ef481281917685a633ccd842335d5 (patch) | |
| tree | 44674b0580f41426eb5112e31cdc0245237d1666 /tools/preproc | |
| parent | 1ec2c86089fd933a46ef405da63c131aee52d7e0 (diff) | |
Diffstat (limited to 'tools/preproc')
| -rw-r--r-- | tools/preproc/Makefile | 2 | ||||
| -rw-r--r-- | tools/preproc/asm_file.cpp | 6 | ||||
| -rwxr-xr-x | tools/preproc/preproc.exe | bin | 908180 -> 908692 bytes |
3 files changed, 5 insertions, 3 deletions
diff --git a/tools/preproc/Makefile b/tools/preproc/Makefile index 63dedda..8c48afe 100644 --- a/tools/preproc/Makefile +++ b/tools/preproc/Makefile @@ -1,4 +1,4 @@ -CXX := g++ +CXX ?= g++ CXXFLAGS := -std=c++11 -O2 -Wall -Wno-switch -Werror diff --git a/tools/preproc/asm_file.cpp b/tools/preproc/asm_file.cpp index 383010a..98805c9 100644 --- a/tools/preproc/asm_file.cpp +++ b/tools/preproc/asm_file.cpp @@ -475,9 +475,11 @@ void AsmFile::ExpectEmptyRestOfLine() m_lineStart = m_pos; m_lineNum++; } - else if (m_buffer[m_pos] == '\r') + else if (m_buffer[m_pos] == '\r' && m_buffer[m_pos + 1] == '\n') { - RaiseError("only Unix-style LF newlines are supported"); + m_pos += 2; + m_lineStart = m_pos; + m_lineNum++; } else { diff --git a/tools/preproc/preproc.exe b/tools/preproc/preproc.exe Binary files differindex 92f0f63..4ed5198 100755 --- a/tools/preproc/preproc.exe +++ b/tools/preproc/preproc.exe |