QB64/qb64
QB64/qb64
1
1
Fork 0
mirror of https://github.com/QB64Official/qb64.git synced 2024-07-05 00:40:26 +00:00
Code Releases Wiki Activity

Tweaks to $EXEICON implementation

Browse source 
No error message if not Windows, proper error message if icon.o can't be generated.
This commit is contained in:
FellippeHeitor 2016-08-18 07:25:56 -03:00 committed by GitHub
parent 127c4acd88
commit 26a6c94f63
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
source/qb64.bas
View file

@ -3190,19 +3190,21 @@ DO
END IF
IF LEFT$(a3u$, 8) = "$EXEICON" THEN
IF INSTR(_OS$, "WIN") THEN
IF ExeIconSet THEN a$ = "$EXEICON already defined": GOTO errmes
FirstDelimiter = INSTR(a3u$, "'")
IF FirstDelimiter = 0 THEN
a$ = "Expected $EXEICON:'filename'": GOTO errmes
ELSE
SecondDelimiter = INSTR(FirstDelimiter + 1, a3u$, "'")
IF SecondDelimiter = 0 THEN a$ = "Expected $EXEICON:'filename'": GOTO errmes
END IF
ExeIconFile$ = RTRIM$(LTRIM$(MID$(a3$, FirstDelimiter + 1, SecondDelimiter - FirstDelimiter - 1)))
IF LEN(ExeIconFile$) = 0 THEN a$ = "Expected $EXEICON:'filename'": GOTO errmes
layout$ = "$EXEICON:'" + ExeIconFile$ + "'" + MID$(a3$, SecondDelimiter + 1)
'Basic syntax check. Multi-platform.
IF ExeIconSet THEN a$ = "$EXEICON already defined": GOTO errmes
FirstDelimiter = INSTR(a3u$, "'")
IF FirstDelimiter = 0 THEN
a$ = "Expected $EXEICON:'filename'": GOTO errmes
ELSE
SecondDelimiter = INSTR(FirstDelimiter + 1, a3u$, "'")
IF SecondDelimiter = 0 THEN a$ = "Expected $EXEICON:'filename'": GOTO errmes
END IF
ExeIconFile$ = RTRIM$(LTRIM$(MID$(a3$, FirstDelimiter + 1, SecondDelimiter - FirstDelimiter - 1)))
IF LEN(ExeIconFile$) = 0 THEN a$ = "Expected $EXEICON:'filename'": GOTO errmes
layout$ = "$EXEICON:'" + ExeIconFile$ + "'" + MID$(a3$, SecondDelimiter + 1)
IF INSTR(_OS$, "WIN") THEN
'Actual metacommand processing. Windows only.
'Expand relative path to full path:
IconPath$ = ""
IF LEFT$(ExeIconFile$, 2) = "./" OR LEFT$(ExeIconFile$, 2) = ".\" THEN
@ -3245,12 +3247,10 @@ DO
CLOSE #iconfilehandle
IF E = 1 THEN a$ = "Error creating icon resource file": GOTO errmes
ON ERROR GOTO qberror
ExeIconSet = linenumber
END IF
ELSE
a$ = "Feature not available (Windows only)": GOTO errmes
END IF
ExeIconSet = linenumber
GOTO finishednonexec
END IF
@ -11506,7 +11506,7 @@ IF os$ = "WIN" THEN
CLOSE #ffh
SHELL _HIDE tmpdir$ + "call_windres.bat"
IF _FILEEXISTS(tmpdir$ + "icon.o") = 0 THEN
a$ = "Error creating icon resource file": GOTO errmes
a$ = "Bad icon file": GOTO errmes
END IF
END IF
END IF