1
1
Fork 0
mirror of https://github.com/QB64-Phoenix-Edition/QB64pe.git synced 2024-09-20 06:44:44 +00:00

Merge branch 'main' into fix-auto-quote-adding

This commit is contained in:
Matt Kilgore 2024-02-22 19:18:20 -05:00 committed by GitHub
commit bc073d5e29
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 3 additions and 3 deletions

View file

@ -1,4 +1,4 @@
g++ -no-pie -std=gnu++17 -fno-strict-aliasing -Wno-conversion-null -DFREEGLUT_STATIC -I./internal/c/libqb/include -I./internal/c/parts/core/freeglut/include -I./internal/c/parts/core/glew/include -DDEPENDENCY_SOCKETS -DDEPENDENCY_NO_PRINTER -DDEPENDENCY_ICON -DDEPENDENCY_NO_SCREENIMAGE internal/c/qbx.cpp -c -o internal/c/qbx.o g++ -no-pie -std=gnu++17 -fno-strict-aliasing -Wno-conversion-null -DFREEGLUT_STATIC -I./internal/c/libqb/include -I./internal/c/parts/core/freeglut/include -I./internal/c/parts/core/glew/include -DDEPENDENCY_SOCKETS -DDEPENDENCY_NO_PRINTER -DDEPENDENCY_ICON -DDEPENDENCY_NO_SCREENIMAGE internal/c/qbx.cpp -c -o internal/c/qbx.o
g++ -no-pie -std=gnu++17 -fno-strict-aliasing -Wno-conversion-null -DFREEGLUT_STATIC -I./internal/c/libqb/include -I./internal/c/parts/core/freeglut/include -I./internal/c/parts/core/glew/include -DDEPENDENCY_SOCKETS -DDEPENDENCY_NO_PRINTER -DDEPENDENCY_ICON -DDEPENDENCY_NO_SCREENIMAGE ./internal/c/libqb_make_000101000.o ./internal/c/qbx.o -o "/home/runner/work/QB64pe/QB64pe/qb64pe" ./internal/c/libqb/src/threading.o ./internal/c/libqb/src/buffer.o ./internal/c/libqb/src/bitops.o ./internal/c/libqb/src/command.o ./internal/c/libqb/src/environ.o ./internal/c/libqb/src/file-fields.o ./internal/c/libqb/src/filepath.o ./internal/c/libqb/src/filesystem.o ./internal/c/libqb/src/datetime.o ./internal/c/libqb/src/error_handle.o ./internal/c/libqb/src/gfs.o ./internal/c/libqb/src/qblist.o ./internal/c/libqb/src/mem.o ./internal/c/libqb/src/math.o ./internal/c/libqb/src/rounding.o ./internal/c/libqb/src/shell.o ./internal/c/libqb/src/qbs.o ./internal/c/libqb/src/qbs_str.o ./internal/c/libqb/src/qbs_cmem.o ./internal/c/libqb/src/qbs_mk_cv.o ./internal/c/libqb/src/string_functions.o ./internal/c/libqb/src/http.o ./internal/c/libqb/src/threading-posix.o ./internal/c/libqb/src/glut-main-thread.o ./internal/c/libqb/src/glut-message.o ./internal/c/libqb/src/glut-msg-queue.o ./internal/c/parts/gui/tinyfiledialogs.o ./internal/c/parts/gui/gui.o ./internal/c/parts/video/font/font.o ./internal/c/parts/video/font/freetype/freetype.a ./internal/c/parts/audio/stub_audio.o ./internal/c/parts/compression/miniz.o ./internal/c/parts/compression/compression.o ./internal/c/parts/core/freeglut.a ./internal/c/parts/core/glew/glew.o -lGL -lGLU -lX11 -lpthread -ldl -lrt -lcurl g++ -no-pie -std=gnu++17 -fno-strict-aliasing -Wno-conversion-null -DFREEGLUT_STATIC -I./internal/c/libqb/include -I./internal/c/parts/core/freeglut/include -I./internal/c/parts/core/glew/include -DDEPENDENCY_SOCKETS -DDEPENDENCY_NO_PRINTER -DDEPENDENCY_ICON -DDEPENDENCY_NO_SCREENIMAGE ./internal/c/libqb_make_000101000.o ./internal/c/qbx.o -o "/home/runner/work/QB64pe/QB64pe/qb64pe" ./internal/c/libqb/src/threading.o ./internal/c/libqb/src/buffer.o ./internal/c/libqb/src/bitops.o ./internal/c/libqb/src/command.o ./internal/c/libqb/src/environ.o ./internal/c/libqb/src/file-fields.o ./internal/c/libqb/src/filepath.o ./internal/c/libqb/src/filesystem.o ./internal/c/libqb/src/datetime.o ./internal/c/libqb/src/error_handle.o ./internal/c/libqb/src/gfs.o ./internal/c/libqb/src/qblist.o ./internal/c/libqb/src/hexoctbin.o ./internal/c/libqb/src/mem.o ./internal/c/libqb/src/math.o ./internal/c/libqb/src/rounding.o ./internal/c/libqb/src/shell.o ./internal/c/libqb/src/qbs.o ./internal/c/libqb/src/qbs_str.o ./internal/c/libqb/src/qbs_cmem.o ./internal/c/libqb/src/qbs_mk_cv.o ./internal/c/libqb/src/string_functions.o ./internal/c/libqb/src/http.o ./internal/c/libqb/src/threading-posix.o ./internal/c/libqb/src/glut-main-thread.o ./internal/c/libqb/src/glut-message.o ./internal/c/libqb/src/glut-msg-queue.o ./internal/c/parts/gui/tinyfiledialogs.o ./internal/c/parts/gui/gui.o ./internal/c/parts/video/font/font.o ./internal/c/parts/video/font/freetype/freetype.a ./internal/c/parts/audio/stub_audio.o ./internal/c/parts/compression/miniz.o ./internal/c/parts/compression/compression.o ./internal/c/parts/core/freeglut.a ./internal/c/parts/core/glew/glew.o -lGL -lGLU -lX11 -lpthread -ldl -lrt -lcurl
objcopy --only-keep-debug "/home/runner/work/QB64pe/QB64pe/qb64pe" "./internal/temp/qb64pe.sym" objcopy --only-keep-debug "/home/runner/work/QB64pe/QB64pe/qb64pe" "./internal/temp/qb64pe.sym"
objcopy --strip-unneeded "/home/runner/work/QB64pe/QB64pe/qb64pe" objcopy --strip-unneeded "/home/runner/work/QB64pe/QB64pe/qb64pe"

View file

@ -55140,7 +55140,7 @@ qbs_cleanup(qbs_tmp_base,0);
if(!qbevent)break;evnt(13412);}while(r); if(!qbevent)break;evnt(13412);}while(r);
do{ do{
tqbs=qbs_new(0,0); tqbs=qbs_new(0,0);
qbs_set(tqbs,qbs_new_txt_len(" -f:StripDebugSymbols=[true|false] (Stirp C++ debug symbols, default true)",80)); qbs_set(tqbs,qbs_new_txt_len(" -f:StripDebugSymbols=[true|false] (Strip C++ debug symbols, default true)",80));
if (is_error_pending()) goto skip2250; if (is_error_pending()) goto skip2250;
makefit(tqbs); makefit(tqbs);
qbs_print(tqbs,0); qbs_print(tqbs,0);

View file

@ -13410,7 +13410,7 @@ SUB PrintTemporarySettingsHelpAndExit (errstr$)
PRINT PRINT
PRINT "Valid settings:" PRINT "Valid settings:"
PRINT " -f:OptimizeCppProgram=[true|false] (Use C++ Optimization flag, default false)" PRINT " -f:OptimizeCppProgram=[true|false] (Use C++ Optimization flag, default false)"
PRINT " -f:StripDebugSymbols=[true|false] (Stirp C++ debug symbols, default true)" PRINT " -f:StripDebugSymbols=[true|false] (Strip C++ debug symbols, default true)"
PRINT " -f:ExtraCppFlags=[string] (Extra flags to pass to the C++ compiler)" PRINT " -f:ExtraCppFlags=[string] (Extra flags to pass to the C++ compiler)"
PRINT " -f:ExtraLinkerFlags=[string] (Extra flags to pass at link time)" PRINT " -f:ExtraLinkerFlags=[string] (Extra flags to pass at link time)"
PRINT " -f:MaxCompilerProcesses=[integer] (Max C++ compiler processes to start in parallel)" PRINT " -f:MaxCompilerProcesses=[integer] (Max C++ compiler processes to start in parallel)"