From c5d72846c471f1e8b417a1e9fe75b77b30ea86e0 Mon Sep 17 00:00:00 2001 From: Ron Tseytlin Date: Sat, 31 Dec 2022 02:32:54 +0200 Subject: [PATCH 1/3] Allow Canvas:renderTo to accept varargs The varargs will be forwarded to the function. --- src/modules/graphics/wrap_Canvas.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/modules/graphics/wrap_Canvas.cpp b/src/modules/graphics/wrap_Canvas.cpp index fa020f485..3fb085097 100644 --- a/src/modules/graphics/wrap_Canvas.cpp +++ b/src/modules/graphics/wrap_Canvas.cpp @@ -42,6 +42,8 @@ int w_Canvas_renderTo(lua_State *L) { Graphics::RenderTarget rt(luax_checkcanvas(L, 1)); + int args = lua_gettop(L); + int startidx = 2; if (rt.canvas->getTextureType() != TEXTURE_2D) @@ -67,8 +69,7 @@ int w_Canvas_renderTo(lua_State *L) luax_catchexcept(L, [&](){ graphics->setCanvas(rt, false); }); - lua_settop(L, 2); // make sure the function is on top of the stack - int status = lua_pcall(L, 0, 0, 0); + int status = lua_pcall(L, args - startidx, 0, 0); graphics->setCanvas(oldtargets); From 6a3031f35757ae61a4756e5c28b3c39716f965e6 Mon Sep 17 00:00:00 2001 From: Sasha Szpakowski Date: Fri, 6 Jan 2023 17:03:38 -0400 Subject: [PATCH 2/3] Remove very old unused nsis installer file. CMake is used instead these days. --- extra/nsis/love.nsi | 120 -------------------------------------------- 1 file changed, 120 deletions(-) delete mode 100644 extra/nsis/love.nsi diff --git a/extra/nsis/love.nsi b/extra/nsis/love.nsi deleted file mode 100644 index aa75fd6e8..000000000 --- a/extra/nsis/love.nsi +++ /dev/null @@ -1,120 +0,0 @@ -!include "MUI2.nsh" # Modern look, plxz - -Name "LOVE" - -OutFile ${LOVEEXE} - -InstallDir $PROGRAMFILES\LOVE -InstallDirRegKey HKCU "Software\LOVE" "" - -# Graphics -!define MUI_ICON "${LOVEICODIR}\love.ico" -!define MUI_UNICON "${LOVEICODIR}\love.ico" -!define MUI_ABORTWARNING -!define MUI_HEADERIMAGE -!define MUI_HEADERIMAGE_BITMAP "${LOVEICODIR}\top.bmp" # optional -!define MUI_WELCOMEFINISHPAGE_BITMAP "${LOVEICODIR}\left.bmp" -!define MUI_UNWELCOMEFINISHPAGE_BITMAP "${LOVEICODIR}\left.bmp" - -!define MUI_WELCOMEPAGE_TITLE "LÖVE Setup" -!define MUI_WELCOMEPAGE_TEXT "This will install LÖVE, the unquestionably awesome Lua game framework." - -# Pages -!insertmacro MUI_PAGE_WELCOME -!insertmacro MUI_PAGE_LICENSE "${LOVELICDIR}\license.txt" -!insertmacro MUI_PAGE_COMPONENTS -!insertmacro MUI_PAGE_DIRECTORY -!insertmacro MUI_PAGE_INSTFILES - -!insertmacro MUI_UNPAGE_WELCOME -!insertmacro MUI_UNPAGE_CONFIRM -!insertmacro MUI_UNPAGE_INSTFILES - -# Languages -!insertmacro MUI_LANGUAGE "English" - -# Main Program -Section "LOVE" MainProg - - SectionIn RO - SetOutPath $INSTDIR - File "${LOVEBINDIR}\love.exe" - File "${LOVEBINDIR}\DevIL.dll" - File "${LOVEBINDIR}\SDL.dll" - File "${LOVEBINDIR}\OpenAL32.dll" - File "${LOVEBINDIR}\libmpg123.dll" - File "${LOVEBINDIR}\gme.dll" - # File "${LOVEBINDIR}\lua51.dll" - File "${LOVEICODIR}\love.ico" - File "${LOVEICODIR}\game.ico" - - # Uninstaller - WriteUninstaller $INSTDIR\Uninstall.exe - - # Add new start menu items - CreateDirectory "$SMPROGRAMS\LOVE" - CreateShortCut "$SMPROGRAMS\LOVE\LOVE.lnk" "$INSTDIR\love.exe" - CreateShortCut "$SMPROGRAMS\LOVE\Uninstall.lnk" "$INSTDIR\Uninstall.exe" - WriteINIStr "$SMPROGRAMS\LOVE\Documentation.url" "InternetShortcut" "URL" "http://love2d.org/wiki/" - - # Desktop - CreateShortCut "$DESKTOP\LOVE.lnk" "$INSTDIR\love.exe" "" - - # Registry - WriteRegStr HKCU "Software\LOVE" "" $INSTDIR - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\LOVE" "DisplayName" "LOVE (remove only)" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\LOVE" "UninstallString" "$INSTDIR\Uninstall.exe" - - # love file association - WriteRegStr HKCR ".love" "" "LOVE" - WriteRegStr HKCR "LOVE" "" "LOVE Game File" - WriteRegStr HKCR "LOVE\DefaultIcon" "" "$INSTDIR\game.ico" - WriteRegStr HKCR "LOVE\shell" "" "open" - WriteRegStr HKCR "LOVE\shell\open" "" "Open in LOVE" - WriteRegStr HKCR "LOVE\shell\open\command" "" "$INSTDIR\love.exe $\"%1$\"" - # Refresh shell icons - System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)' - -SectionEnd - -# Descriptions -LangString DESC_MainProg ${LANG_ENGLISH} "Main program." - -# Assign language strings to sections -!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN - !insertmacro MUI_DESCRIPTION_TEXT ${MainProg} $(DESC_MainProg) -!insertmacro MUI_FUNCTION_DESCRIPTION_END - -# Uninstall -Section "Uninstall" - Delete $INSTDIR\"DevIL.dll" - Delete $INSTDIR\"SDL.dll" - Delete $INSTDIR\"love.exe" - Delete $INSTDIR\"OpenAL32.dll" - Delete $INSTDIR\"libmpg123.dll" - Delete $INSTDIR\"gme.dll" - # Delete $INSTDIR\"lua51.dll" - Delete $INSTDIR\"game.ico" - Delete $INSTDIR\"love.ico" - RMDir $INSTDIR - - # Start menu - Delete "$SMPROGRAMS\LOVE\LOVE.lnk" - Delete "$SMPROGRAMS\LOVE\Uninstall.lnk" - Delete "$SMPROGRAMS\LOVE\Documentation.url" - RMDir "$SMPROGRAMS\LOVE" - - # Desktop - Delete "$DESKTOP\LOVE.lnk" - - # Uninstall keys - DeleteRegKey /ifempty HKCU "Software\LOVE" - DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\LOVE" - - # love file association - DeleteRegKey HKCR "LOVE" - DeleteRegKey HKCR ".love" - # Refresh shell icons - System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)' - -SectionEnd From 52fa5cf8f07a6f5b4e55535e21a0d65d4d2541cd Mon Sep 17 00:00:00 2001 From: Sasha Szpakowski Date: Fri, 6 Jan 2023 17:12:01 -0400 Subject: [PATCH 3/3] CI: update repository URL for love-appimage-source --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1ee0e83ff..97115f1e7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,7 @@ jobs: - name: Checkout love-appimage-source uses: actions/checkout@v2 with: - repository: MikuAuahDark/love-appimage-source + repository: love2d/love-appimage-source - name: Checkout LĂ–VE uses: actions/checkout@v2 with: