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

Added to win setup to clean up the mingw compiler after installation.

Browse source 
Fixed the issue where some Linux distros won't clean up the exe when Run Only is selected in the menu bar.

Fixes: #16
Fixes: #54
This commit is contained in:
SteveMcNeill 2022-05-19 08:19:32 -04:00 committed by Matt Kilgore
parent 15622d1f0c
commit c1d12259cb
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

48
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
@ -12484,26 +12484,26 @@ make$ = GetMakeExecutable$
localpath$ = "internal\c\" localpath$ = "internal\c\"
IF DEPENDENCY(DEPENDENCY_GL) THEN makedeps$ = makedeps$ + " DEP_GL=y" IF DEPENDENCY(DEPENDENCY_GL) THEN makedeps$ = makedeps$ + " DEP_GL=y"
IF DEPENDENCY(DEPENDENCY_SCREENIMAGE) THEN makedeps$ = makedeps$ + " DEP_SCREENIMAGE=y" IF DEPENDENCY(DEPENDENCY_SCREENIMAGE) THEN makedeps$ = makedeps$ + " DEP_SCREENIMAGE=y"
IF DEPENDENCY(DEPENDENCY_IMAGE_CODEC) THEN makedeps$ = makedeps$ + " DEP_IMAGE_CODEC=y" IF DEPENDENCY(DEPENDENCY_IMAGE_CODEC) THEN makedeps$ = makedeps$ + " DEP_IMAGE_CODEC=y"
IF DEPENDENCY(DEPENDENCY_CONSOLE_ONLY) THEN makedeps$ = makedeps$ + " DEP_CONSOLE_ONLY=y" IF DEPENDENCY(DEPENDENCY_CONSOLE_ONLY) THEN makedeps$ = makedeps$ + " DEP_CONSOLE_ONLY=y"
IF DEPENDENCY(DEPENDENCY_SOCKETS) THEN makedeps$ = makedeps$ + " DEP_SOCKETS=y" IF DEPENDENCY(DEPENDENCY_SOCKETS) THEN makedeps$ = makedeps$ + " DEP_SOCKETS=y"
IF DEPENDENCY(DEPENDENCY_PRINTER) THEN makedeps$ = makedeps$ + " DEP_PRINTER=y" IF DEPENDENCY(DEPENDENCY_PRINTER) THEN makedeps$ = makedeps$ + " DEP_PRINTER=y"
IF DEPENDENCY(DEPENDENCY_ICON) THEN makedeps$ = makedeps$ + " DEP_ICON=y" IF DEPENDENCY(DEPENDENCY_ICON) THEN makedeps$ = makedeps$ + " DEP_ICON=y"
IF DEPENDENCY(DEPENDENCY_SCREENIMAGE) THEN makedeps$ = makedeps$ + " DEP_SCREENIMAGE=y" IF DEPENDENCY(DEPENDENCY_SCREENIMAGE) THEN makedeps$ = makedeps$ + " DEP_SCREENIMAGE=y"
IF DEPENDENCY(DEPENDENCY_LOADFONT) THEN makedeps$ = makedeps$ + " DEP_FONT=y" IF DEPENDENCY(DEPENDENCY_LOADFONT) THEN makedeps$ = makedeps$ + " DEP_FONT=y"
IF DEPENDENCY(DEPENDENCY_DEVICEINPUT) THEN makedeps$ = makedeps$ + " DEP_DEVICEINPUT=y" IF DEPENDENCY(DEPENDENCY_DEVICEINPUT) THEN makedeps$ = makedeps$ + " DEP_DEVICEINPUT=y"
IF DEPENDENCY(DEPENDENCY_AUDIO_DECODE) THEN makedeps$ = makedeps$ + " DEP_AUDIO_DECODE=y" IF DEPENDENCY(DEPENDENCY_AUDIO_DECODE) THEN makedeps$ = makedeps$ + " DEP_AUDIO_DECODE=y"
IF DEPENDENCY(DEPENDENCY_AUDIO_CONVERSION) THEN makedeps$ = makedeps$ + " DEP_AUDIO_CONVERSION=y" IF DEPENDENCY(DEPENDENCY_AUDIO_CONVERSION) THEN makedeps$ = makedeps$ + " DEP_AUDIO_CONVERSION=y"
IF DEPENDENCY(DEPENDENCY_AUDIO_DECODE) THEN makedeps$ = makedeps$ + " DEP_AUDIO_DECODE=y" IF DEPENDENCY(DEPENDENCY_AUDIO_DECODE) THEN makedeps$ = makedeps$ + " DEP_AUDIO_DECODE=y"
IF DEPENDENCY(DEPENDENCY_AUDIO_OUT) THEN makedeps$ = makedeps$ + " DEP_AUDIO_OUT=y" IF DEPENDENCY(DEPENDENCY_AUDIO_OUT) THEN makedeps$ = makedeps$ + " DEP_AUDIO_OUT=y"
IF DEPENDENCY(DEPENDENCY_ZLIB) THEN makedeps$ = makedeps$ + " DEP_ZLIB=y" IF DEPENDENCY(DEPENDENCY_ZLIB) THEN makedeps$ = makedeps$ + " DEP_ZLIB=y"
IF inline_DATA = 0 AND DataOffset THEN makedeps$ = makedeps$ + " DEP_DATA=y" IF inline_DATA = 0 AND DataOffset THEN makedeps$ = makedeps$ + " DEP_DATA=y"
IF Console THEN makedeps$ = makedeps$ + " DEP_CONSOLE=y" IF Console THEN makedeps$ = makedeps$ + " DEP_CONSOLE=y"
IF ExeIconSet OR VersionInfoSet THEN makedeps$ = makedeps$ + " DEP_ICON_RC=y" IF ExeIconSet OR VersionInfoSet THEN makedeps$ = makedeps$ + " DEP_ICON_RC=y"
IF tempfolderindex > 1 THEN makedeps$ = makedeps$ + " TEMP_ID=" + str2$(tempfolderindex) IF tempfolderindex > 1 THEN makedeps$ = makedeps$ + " TEMP_ID=" + str2$(tempfolderindex)
CxxFlagsExtra$ = "" CxxFlagsExtra$ = ""
CxxLibsExtra$ = "" CxxLibsExtra$ = ""
@ -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