From 4e65e573e664207a4bfbe652eefafec47a568cfc Mon Sep 17 00:00:00 2001 From: chrisws Date: Sun, 19 Feb 2023 10:28:38 +1030 Subject: [PATCH] COMMON: Fixed "make dist" --- Makefile.am | 237 +++++++++++++++++++++-------------- src/platform/sdl/runtime.cpp | 2 +- 2 files changed, 141 insertions(+), 98 deletions(-) diff --git a/Makefile.am b/Makefile.am index 32e9ae6e..d5423882 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,100 +68,143 @@ appImage: ~/apps/linuxdeploy-x86_64.AppImage --appdir=AppDir --executable=./src/platform/fltk/sbasici && \ ~/apps/appimagetool-x86_64.AppImage AppDir -EXTRA_DIST = \ -src/languages/chars.en.h \ -src/languages/keywords.en.c \ -src/languages/messages.en.h \ -src/include/module.h \ -src/include/osd.h \ -src/include/var.h \ -src/include/var_map.h \ -src/lib/jsmn/jsmn.h \ -src/lib/lodepng/lodepng.cpp \ -src/lib/lodepng/lodepng.h \ -src/lib/miniaudio/miniaudio.h \ -src/lib/stb/stb_textedit.h \ -src/platform/android/Makefile.am \ -src/platform/android/app/src/main/assets/main.bas \ -src/platform/android/app/src/main/assets/samples/welcome.bas \ -src/platform/android/jni/Android.mk \ -src/platform/android/jni/Application.mk \ -src/platform/android/jni/common/Android.mk \ -src/platform/android/jni/display.cpp \ -src/platform/android/jni/display.h \ -src/platform/android/jni/freetype/Android.mk \ -src/platform/android/jni/main.cpp \ -src/platform/android/jni/runtime.cpp \ -src/platform/android/jni/runtime.h \ -src/platform/android/webui/package.json \ -src/platform/android/webui/src/App.js \ -src/platform/android/webui/src/index.js \ -src/platform/console/Makefile.am \ -src/platform/console/decomp.c \ -src/platform/console/device.cpp \ -src/platform/console/image.cpp \ -src/platform/console/input.cpp \ -src/platform/console/io.github.smallbasic.appdata.xml \ -src/platform/console/io.github.smallbasic.desktop \ -src/platform/console/main.cpp \ -src/platform/emcc/Makefile.am \ -src/platform/emcc/canvas.cpp \ -src/platform/emcc/canvas.h \ -src/platform/emcc/icon.h \ -src/platform/emcc/keymap.h \ -src/platform/emcc/main.cpp \ -src/platform/emcc/main_bas.h \ -src/platform/emcc/runtime.cpp \ -src/platform/emcc/runtime.h \ -src/platform/emcc/sbasic.html \ -src/platform/emcc/shell.html \ -src/platform/fltk/BasicEditor.cxx \ -src/platform/fltk/BasicEditor.h \ -src/platform/fltk/EditorWidget.cxx \ -src/platform/fltk/EditorWidget.h \ -src/platform/fltk/FileWidget.cxx \ -src/platform/fltk/FileWidget.h \ -src/platform/fltk/HelpView.cxx \ -src/platform/fltk/HelpView.h \ -src/platform/fltk/HelpWidget.cxx \ -src/platform/fltk/HelpWidget.h \ -src/platform/fltk/MainWindow.cxx \ -src/platform/fltk/MainWindow.h \ -src/platform/fltk/Makefile.am \ -src/platform/fltk/Profile.cxx \ -src/platform/fltk/Profile.h \ -src/platform/fltk/TtyWidget.cxx \ -src/platform/fltk/TtyWidget.h \ -src/platform/fltk/build_kwp.cxx \ -src/platform/fltk/display.cxx \ -src/platform/fltk/display.h \ -src/platform/fltk/icon.h \ -src/platform/fltk/io.github.smallbasic.appdata.xml \ -src/platform/fltk/io.github.smallbasic.desktop \ -src/platform/fltk/kwp.h \ -src/platform/fltk/runtime.cxx \ -src/platform/fltk/runtime.h \ -src/platform/fltk/utils.cxx \ -src/platform/fltk/utils.h \ -src/platform/fltk/win.rc \ -src/platform/sdl/Makefile.am \ -src/platform/sdl/display.cpp \ -src/platform/sdl/display.h \ -src/platform/sdl/editor.cpp \ -src/platform/sdl/icon.h \ -src/platform/sdl/io.github.smallbasic.appdata.xml \ -src/platform/sdl/io.github.smallbasic.desktop \ -src/platform/sdl/keymap.h \ -src/platform/sdl/main.cpp \ -src/platform/sdl/main_bas.h \ -src/platform/sdl/runtime.cpp \ -src/platform/sdl/runtime.h \ -src/platform/sdl/settings.cpp \ -src/platform/sdl/settings.h \ -src/platform/sdl/syswm.cpp \ -src/platform/sdl/syswm.h \ -src/platform/sdl/win.rc \ -src/platform/web/Makefile.am \ -src/platform/web/canvas.cpp \ -src/platform/web/canvas.h \ -src/platform/web/main.cpp +EXTRA_DIST = \ +documentation/build_kwp.cpp \ +documentation/sbasic_ref.csv \ +images/sb-desktop-128x128.png \ +src/common/hotspots.h \ +src/common/inet2.c \ +src/include/module.h \ +src/include/osd.h \ +src/include/var.h \ +src/include/var_map.h \ +src/languages/chars.en.h \ +src/languages/keywords.en.c \ +src/languages/messages.en.h \ +src/lib/jsmn/jsmn.h \ +src/lib/lodepng/lodepng.cpp \ +src/lib/lodepng/lodepng.h \ +src/lib/maapi.h \ +src/lib/match.c \ +src/lib/match.h \ +src/lib/matrix.c \ +src/lib/miniaudio/miniaudio.h \ +src/lib/stb/stb_textedit.h \ +src/lib/str.c \ +src/lib/str.h \ +src/lib/xpm.c \ +src/platform/android/Makefile.am \ +src/platform/android/Makefile.in \ +src/platform/android/app/src/main/assets/main.bas \ +src/platform/android/app/src/main/assets/samples/welcome.bas \ +src/platform/android/jni/Android.mk \ +src/platform/android/jni/Application.mk \ +src/platform/android/jni/common/Android.mk \ +src/platform/android/jni/display.cpp \ +src/platform/android/jni/display.h \ +src/platform/android/jni/freetype/Android.mk \ +src/platform/android/jni/main.cpp \ +src/platform/android/jni/runtime.cpp \ +src/platform/android/jni/runtime.h \ +src/platform/android/webui/package.json \ +src/platform/android/webui/src/App.js \ +src/platform/android/webui/src/index.js \ +src/platform/console/Makefile.am \ +src/platform/console/Makefile.in \ +src/platform/console/decomp.c \ +src/platform/console/device.cpp \ +src/platform/console/image.cpp \ +src/platform/console/input.cpp \ +src/platform/console/io.github.smallbasic.appdata.xml \ +src/platform/console/io.github.smallbasic.desktop \ +src/platform/console/main.cpp \ +src/platform/emcc/Makefile.am \ +src/platform/emcc/Makefile.in \ +src/platform/emcc/canvas.cpp \ +src/platform/emcc/canvas.h \ +src/platform/emcc/icon.h \ +src/platform/emcc/keymap.h \ +src/platform/emcc/main.cpp \ +src/platform/emcc/main_bas.h \ +src/platform/emcc/runtime.cpp \ +src/platform/emcc/runtime.h \ +src/platform/emcc/sbasic.html \ +src/platform/emcc/shell.html \ +src/platform/fltk/BasicEditor.cxx \ +src/platform/fltk/BasicEditor.h \ +src/platform/fltk/EditorWidget.cxx \ +src/platform/fltk/EditorWidget.h \ +src/platform/fltk/FileWidget.cxx \ +src/platform/fltk/FileWidget.h \ +src/platform/fltk/HelpView.cxx \ +src/platform/fltk/HelpView.h \ +src/platform/fltk/HelpWidget.cxx \ +src/platform/fltk/HelpWidget.h \ +src/platform/fltk/MainWindow.cxx \ +src/platform/fltk/MainWindow.h \ +src/platform/fltk/Makefile.am \ +src/platform/fltk/Makefile.in \ +src/platform/fltk/Profile.cxx \ +src/platform/fltk/Profile.h \ +src/platform/fltk/TtyWidget.cxx \ +src/platform/fltk/TtyWidget.h \ +src/platform/fltk/build_kwp.cxx \ +src/platform/fltk/display.cxx \ +src/platform/fltk/display.h \ +src/platform/fltk/icon.h \ +src/platform/fltk/io.github.smallbasic.appdata.xml \ +src/platform/fltk/io.github.smallbasic.desktop \ +src/platform/fltk/kwp.h \ +src/platform/fltk/runtime.cxx \ +src/platform/fltk/runtime.h \ +src/platform/fltk/utils.cxx \ +src/platform/fltk/utils.h \ +src/platform/fltk/win.rc \ +src/platform/sdl/Makefile.am \ +src/platform/sdl/Makefile.in \ +src/platform/sdl/display.cpp \ +src/platform/sdl/display.h \ +src/platform/sdl/editor.cpp \ +src/platform/sdl/icon.h \ +src/platform/sdl/io.github.smallbasic.appdata.xml \ +src/platform/sdl/io.github.smallbasic.desktop \ +src/platform/sdl/keymap.h \ +src/platform/sdl/main.cpp \ +src/platform/sdl/main_bas.h \ +src/platform/sdl/runtime.cpp \ +src/platform/sdl/runtime.h \ +src/platform/sdl/settings.cpp \ +src/platform/sdl/settings.h \ +src/platform/sdl/syswm.cpp \ +src/platform/sdl/syswm.h \ +src/platform/sdl/win.rc \ +src/platform/web/Makefile.am \ +src/platform/web/Makefile.in \ +src/platform/web/canvas.cpp \ +src/platform/web/canvas.h \ +src/platform/web/main.cpp \ +src/ui/ansiwidget.cpp \ +src/ui/ansiwidget.h \ +src/ui/audio.cpp \ +src/ui/audio.h \ +src/ui/canvas.h \ +src/ui/form.cpp \ +src/ui/graphics.cpp \ +src/ui/graphics.h \ +src/ui/image.cpp \ +src/ui/image.h \ +src/ui/inputs.cpp \ +src/ui/inputs.h \ +src/ui/rgb.h \ +src/ui/screen.cpp \ +src/ui/screen.h \ +src/ui/shape.h \ +src/ui/strlib.cpp \ +src/ui/strlib.h \ +src/ui/system.cpp \ +src/ui/system.h \ +src/ui/textedit.cpp \ +src/ui/textedit.h \ +src/ui/theme.h \ +src/ui/utils.h \ +src/ui/window.cpp diff --git a/src/platform/sdl/runtime.cpp b/src/platform/sdl/runtime.cpp index 69ae61cf..5bd62d7f 100644 --- a/src/platform/sdl/runtime.cpp +++ b/src/platform/sdl/runtime.cpp @@ -616,7 +616,7 @@ void Runtime::setWindowRect(int x, int y, int width, int height) { logEntered(); if (width > 0 && height > 0) { SDL_SetWindowSize(_window, width, height); - onResize(width, height); + pause(10); } if (x > 0 && y > 0) { SDL_SetWindowPosition(_window, x, y);