Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing compilation process #587

Merged
merged 4 commits into from
Dec 11, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Auto detect text files and perform LF normalization
* text=auto

# Override GitHub language detection
*.bas linguist-language=qb64
*.bi linguist-language=qb64
*.bm linguist-language=qb64
4 changes: 3 additions & 1 deletion source/global/constants.bas
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ IF Debug THEN sp = CHR$(250): sp2 = CHR$(249): sp3 = CHR$(179) 'makes debug outp
DIM SHARED CHR_QUOTE AS STRING * 1: CHR_QUOTE = _CHR_QUOTE
DIM SHARED CHR_TAB AS STRING * 1: CHR_TAB = _CHR_HT 'horizontal tab
DIM SHARED CRLF AS STRING: CRLF = _STR_CRLF 'carriage return + line feed
DIM SHARED NATIVE_LINEENDING AS STRING: NATIVE_LINEENDING = _STR_NAT_EOL

DIM SHARED NATIVE_LINEENDING AS STRING
IF INSTR(_OS$, "WIN") THEN NATIVE_LINEENDING = _STR_CRLF ELSE NATIVE_LINEENDING = _STR_LF

DIM SHARED OS_BITS AS LONG: OS_BITS = 64
IF INSTR(_OS$, "[32BIT]") THEN OS_BITS = 32
Expand Down
2 changes: 2 additions & 0 deletions source/qb64pe.bas
Original file line number Diff line number Diff line change
Expand Up @@ -1675,11 +1675,13 @@ DO

IF temp$ = "$COLOR:0" THEN
SetRCStateVar ColorSet, 1
IF recompile GOTO do_recompile
GOTO finishedlinepp
END IF

IF temp$ = "$COLOR:32" THEN
SetRCStateVar ColorSet, 2
IF recompile GOTO do_recompile
GOTO finishedlinepp
END IF

Expand Down
2 changes: 1 addition & 1 deletion source/utilities/statevars.bas
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ END SUB
SUB SetRCStateVar (stVar AS RCStateVar, setVal%%)
stVar.wanted = setVal%%
IF stVar.actual <> stVar.wanted AND stVar.locked = _FALSE THEN
recompile = 1 'end of pass recompile trigger
recompile = 1 'recompile trigger
END IF
END SUB

Expand Down