QB64/QB64-PE
QB64/QB64-PE
1
1
Fork 0
mirror of https://github.com/QB64-Phoenix-Edition/QB64pe.git synced 2024-07-06 00:00:22 +00:00
Code Issues Releases Wiki Activity

Merge pull request #74 from mkilgore/steves-changes

Browse source 
Steve's changes in #73, with fixed history.
This commit is contained in:
Steve McNeill 2022-05-21 18:51:39 -04:00 committed by GitHub
parent 15622d1f0c c1d12259cb
commit a5099bfdd6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
setup_win.bat
View file

@ -16,6 +16,7 @@ curl %url% -o %MINGW%
echo Extracting %MINGW% as C++ Compiler echo Extracting %MINGW% as C++ Compiler
@echo off @echo off
%MINGW% -y -o"./internal/c/c_compiler/" %MINGW% -y -o"./internal/c/c_compiler/"
del %MINGW%
:skipccompsetup :skipccompsetup

12
source/qb64.bas
View file

@ -1086,10 +1086,10 @@ IF C = 9 THEN 'run
IF os$ = "LNX" THEN IF os$ = "LNX" THEN
IF LEFT$(lastBinaryGenerated$, LEN(path.exe$)) = path.exe$ THEN IF LEFT$(lastBinaryGenerated$, LEN(path.exe$)) = path.exe$ THEN
SHELL QuotedFilename$(lastBinaryGenerated$) + ModifyCOMMAND$ SHELL QuotedFilename$(lastBinaryGenerated$) + ModifyCOMMAND$
SHELL _HIDE _DONTWAIT "del " + QuotedFilename$(lastBinaryGenerated$) KILL lastBinaryGenerated$
ELSE ELSE
SHELL QuotedFilename$(path.exe$ + lastBinaryGenerated$) + ModifyCOMMAND$ SHELL QuotedFilename$(path.exe$ + lastBinaryGenerated$) + ModifyCOMMAND$
SHELL _HIDE _DONTWAIT "del " + QuotedFilename$(path.exe$ + lastBinaryGenerated$) KILL path.exe$ + lastBinaryGenerated$
END IF END IF
END IF END IF
IF path.exe$ = "./" THEN path.exe$ = "" IF path.exe$ = "./" THEN path.exe$ = ""
@ -3290,12 +3290,12 @@ DO
CASE "FILEVERSION#" CASE "FILEVERSION#"
GOSUB ValidateVersion GOSUB ValidateVersion
viFileVersionNum$ = VersionInfoValue$ viFileVersionNum$ = VersionInfoValue$
if viFileVersion$ = "" THEN viFileVersion$ = viFileVersionNum$ IF viFileVersion$ = "" THEN viFileVersion$ = viFileVersionNum$
layout$ = SCase$("$VersionInfo:FILEVERSION#=") + VersionInfoValue$ layout$ = SCase$("$VersionInfo:FILEVERSION#=") + VersionInfoValue$
CASE "PRODUCTVERSION#" CASE "PRODUCTVERSION#"
GOSUB ValidateVersion GOSUB ValidateVersion
viProductVersionNum$ = VersionInfoValue$ viProductVersionNum$ = VersionInfoValue$
if viProductVersion$ = "" THEN viProductVersion$ = viProductVersionNum$ IF viProductVersion$ = "" THEN viProductVersion$ = viProductVersionNum$
layout$ = SCase$("$VersionInfo:PRODUCTVERSION#=") + VersionInfoValue$ layout$ = SCase$("$VersionInfo:PRODUCTVERSION#=") + VersionInfoValue$
CASE "COMPANYNAME" CASE "COMPANYNAME"
viCompanyName$ = VersionInfoValue$ viCompanyName$ = VersionInfoValue$
@ -12378,7 +12378,7 @@ IF ExeIconSet THEN
DIM errNo AS LONG DIM errNo AS LONG
errNo = CopyFile&(ExeIconFile$, tmpdir$ + "icon.ico") errNo = CopyFile&(ExeIconFile$, tmpdir$ + "icon.ico")
if errNo <> 0 THEN a$ = "Error copying " + QuotedFilename$(ExeIconFile$) + " to temp directory": GOTO errmes IF errNo <> 0 THEN a$ = "Error copying " + QuotedFilename$(ExeIconFile$) + " to temp directory": GOTO errmes
ON ERROR GOTO qberror ON ERROR GOTO qberror
END IF END IF
@ -12642,7 +12642,7 @@ IF os$ = "WIN" THEN
END IF END IF
NEXT NEXT
If No_C_Compile_Mode = 0 THEN IF No_C_Compile_Mode = 0 THEN
SHELL _HIDE "cmd /c " + makeline$ + " 1>> " + compilelog$ + " 2>&1" SHELL _HIDE "cmd /c " + makeline$ + " 1>> " + compilelog$ + " 2>&1"
IF idemode THEN IF idemode THEN