Skip to content
This repository was archived by the owner on Sep 6, 2023. It is now read-only.

Commit c2d6c66

Browse files
rollback SDL2 to 2.0.22 #61
1 parent fe21ae2 commit c2d6c66

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

lib/SDL2

Submodule SDL2 updated 808 files

src/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,15 +73,15 @@ if(WIN32)
7373
if (NOT EXISTS "${CMAKE_BINARY_DIR}/mpv-2.dll")
7474
file(DOWNLOAD "https://www.7-zip.org/a/7zr.exe" "7zr.exe" SHOW_PROGRESS)
7575
file(DOWNLOAD "https://sourceforge.net/projects/mpv-player-windows/files/libmpv/mpv-dev-x86_64-v3-20220925-git-56e24d5.7z/download" "mpv-dev.7z" SHOW_PROGRESS)
76-
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
76+
add_custom_command(TARGET ${PROJECT_NAME} PRE_BUILD
7777
COMMAND "${CMAKE_BINARY_DIR}/7zr.exe" "x" "-y" "mpv-dev.7z" "mpv-2.dll"
7878
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
7979
BYPRODUCTS "${CMAKE_BINARY_DIR}/mpv-2.dll"
8080
DEPENDS "${CMAKE_BINARY_DIR}/mpv-dev.7z")
8181
endif()
8282

8383
# copy mpv-2.dll to bin dir
84-
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
84+
add_custom_command(TARGET ${PROJECT_NAME} PRE_BUILD
8585
COMMAND ${CMAKE_COMMAND} -E copy
8686
"${CMAKE_BINARY_DIR}/mpv-2.dll" "$<TARGET_FILE_DIR:${PROJECT_NAME}>/mpv-2.dll"
8787
DEPENDS "${CMAKE_BINARY_DIR}/mpv-2.dll")

src/OpenFunscripter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1712,8 +1712,8 @@ void OpenFunscripter::Shutdown() noexcept
17121712
OFS_MpvLoader::Unload();
17131713
OFS_FileLogger::Shutdown();
17141714
webApi->Shutdown();
1715-
17161715
controllerInput->Shutdown();
1716+
17171717
SDL_GL_DeleteContext(glContext);
17181718
SDL_DestroyWindow(window);
17191719
SDL_Quit();

0 commit comments

Comments
 (0)