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

Merge branch 'main' into wiki-dev

Browse source
This commit is contained in:
Roland Heyder 2022-05-22 01:04:02 +02:00
parent 3304aab884 88ff173309
commit 77642ba91b
3 changed files with 27 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
internal/source/main.txt
View file

@ -6440,7 +6440,7 @@ sub_shell(qbs_add(FUNC_QUOTEDFILENAME(__STRING_LASTBINARYGENERATED),__STRING_MOD
qbs_cleanup(qbs_tmp_base,0);
if(!qbevent)break;evnt(1088);}while(r);
do{
sub_shell2(qbs_add(qbs_new_txt_len("del ",4),FUNC_QUOTEDFILENAME(__STRING_LASTBINARYGENERATED)),3);
sub_kill(__STRING_LASTBINARYGENERATED);
qbs_cleanup(qbs_tmp_base,0);
if(!qbevent)break;evnt(1089);}while(r);
}else{
@ -6449,7 +6449,7 @@ sub_shell(qbs_add(FUNC_QUOTEDFILENAME(qbs_add(__STRING_PATH__ASCII_CHR_046__EXE,
qbs_cleanup(qbs_tmp_base,0);
if(!qbevent)break;evnt(1091);}while(r);
do{
sub_shell2(qbs_add(qbs_new_txt_len("del ",4),FUNC_QUOTEDFILENAME(qbs_add(__STRING_PATH__ASCII_CHR_046__EXE,__STRING_LASTBINARYGENERATED))),3);
sub_kill(qbs_add(__STRING_PATH__ASCII_CHR_046__EXE,__STRING_LASTBINARYGENERATED));
qbs_cleanup(qbs_tmp_base,0);
if(!qbevent)break;evnt(1092);}while(r);
}

1
setup_win.bat
View file

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

48
source/qb64.bas
View file

@ -1086,10 +1086,10 @@ IF C = 9 THEN 'run
IF os$ = "LNX" THEN
IF LEFT$(lastBinaryGenerated$, LEN(path.exe$)) = path.exe$ THEN
SHELL QuotedFilename$(lastBinaryGenerated$) + ModifyCOMMAND$
SHELL _HIDE _DONTWAIT "del " + QuotedFilename$(lastBinaryGenerated$)
KILL lastBinaryGenerated$
ELSE
SHELL QuotedFilename$(path.exe$ + lastBinaryGenerated$) + ModifyCOMMAND$
SHELL _HIDE _DONTWAIT "del " + QuotedFilename$(path.exe$ + lastBinaryGenerated$)
KILL path.exe$ + lastBinaryGenerated$
END IF
END IF
IF path.exe$ = "./" THEN path.exe$ = ""
@ -3290,12 +3290,12 @@ DO
CASE "FILEVERSION#"
GOSUB ValidateVersion
viFileVersionNum$ = VersionInfoValue$
if viFileVersion$ = "" THEN viFileVersion$ = viFileVersionNum$
IF viFileVersion$ = "" THEN viFileVersion$ = viFileVersionNum$
layout$ = SCase$("$VersionInfo:FILEVERSION#=") + VersionInfoValue$
CASE "PRODUCTVERSION#"
GOSUB ValidateVersion
viProductVersionNum$ = VersionInfoValue$
if viProductVersion$ = "" THEN viProductVersion$ = viProductVersionNum$
IF viProductVersion$ = "" THEN viProductVersion$ = viProductVersionNum$
layout$ = SCase$("$VersionInfo:PRODUCTVERSION#=") + VersionInfoValue$
CASE "COMPANYNAME"
viCompanyName$ = VersionInfoValue$
@ -12378,7 +12378,7 @@ IF ExeIconSet THEN
DIM errNo AS LONG
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
END IF
@ -12484,26 +12484,26 @@ make$ = GetMakeExecutable$
localpath$ = "internal\c\"
IF DEPENDENCY(DEPENDENCY_GL) THEN makedeps$ = makedeps$ + " DEP_GL=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_CONSOLE_ONLY) THEN makedeps$ = makedeps$ + " DEP_CONSOLE_ONLY=y"
IF DEPENDENCY(DEPENDENCY_SOCKETS) THEN makedeps$ = makedeps$ + " DEP_SOCKETS=y"
IF DEPENDENCY(DEPENDENCY_PRINTER) THEN makedeps$ = makedeps$ + " DEP_PRINTER=y"
IF DEPENDENCY(DEPENDENCY_ICON) THEN makedeps$ = makedeps$ + " DEP_ICON=y"
IF DEPENDENCY(DEPENDENCY_SCREENIMAGE) THEN makedeps$ = makedeps$ + " DEP_SCREENIMAGE=y"
IF DEPENDENCY(DEPENDENCY_LOADFONT) THEN makedeps$ = makedeps$ + " DEP_FONT=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_GL) THEN makedeps$ = makedeps$ + " DEP_GL=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_CONSOLE_ONLY) THEN makedeps$ = makedeps$ + " DEP_CONSOLE_ONLY=y"
IF DEPENDENCY(DEPENDENCY_SOCKETS) THEN makedeps$ = makedeps$ + " DEP_SOCKETS=y"
IF DEPENDENCY(DEPENDENCY_PRINTER) THEN makedeps$ = makedeps$ + " DEP_PRINTER=y"
IF DEPENDENCY(DEPENDENCY_ICON) THEN makedeps$ = makedeps$ + " DEP_ICON=y"
IF DEPENDENCY(DEPENDENCY_SCREENIMAGE) THEN makedeps$ = makedeps$ + " DEP_SCREENIMAGE=y"
IF DEPENDENCY(DEPENDENCY_LOADFONT) THEN makedeps$ = makedeps$ + " DEP_FONT=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_CONVERSION) THEN makedeps$ = makedeps$ + " DEP_AUDIO_CONVERSION=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_ZLIB) THEN makedeps$ = makedeps$ + " DEP_ZLIB=y"
IF inline_DATA = 0 AND DataOffset THEN makedeps$ = makedeps$ + " DEP_DATA=y"
IF Console THEN makedeps$ = makedeps$ + " DEP_CONSOLE=y"
IF ExeIconSet OR VersionInfoSet THEN makedeps$ = makedeps$ + " DEP_ICON_RC=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_ZLIB) THEN makedeps$ = makedeps$ + " DEP_ZLIB=y"
IF inline_DATA = 0 AND DataOffset THEN makedeps$ = makedeps$ + " DEP_DATA=y"
IF Console THEN makedeps$ = makedeps$ + " DEP_CONSOLE=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$ = ""
CxxLibsExtra$ = ""
@ -12642,7 +12642,7 @@ IF os$ = "WIN" THEN
END IF
NEXT
If No_C_Compile_Mode = 0 THEN
IF No_C_Compile_Mode = 0 THEN
SHELL _HIDE "cmd /c " + makeline$ + " 1>> " + compilelog$ + " 2>&1"
IF idemode THEN