Skip to content

Replace msf_gif submodule with single header (–711 MiB) + macOS build fix #2833

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nesbox merged 2 commits into from
Sep 12, 2025
Merged

Replace msf_gif submodule with single header (–711 MiB) + macOS build fix #2833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04785cf
Includes the msf_gif.h in the project instead of using the full repo …
imsys Sep 11, 2025
5da586b
fix macos build
imsys Sep 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ jobs:
- name: Build
run: |
cd build
cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_STATIC=ON -DBUILD_SDLGPU=On -DBUILD_WITH_ALL=ON ..
cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_STATIC=ON -DBUILD_SDLGPU=On -DBUILD_WITH_ALL=ON -DCMAKE_POLICY_VERSION_MINIMUM=3.5 ..
cmake --build . --parallel

- name: Deploy
Expand All @@ -384,7 +384,7 @@ jobs:
- name: Build Pro
run: |
cd build
cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SDLGPU=On -DBUILD_PRO=On -DBUILD_WITH_ALL=ON ..
cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SDLGPU=On -DBUILD_PRO=On -DBUILD_WITH_ALL=ON -DCMAKE_POLICY_VERSION_MINIMUM=3.5 ..
cmake --build . --parallel

# === MacOS 14 / arm64 ===
Expand Down
5 changes: 0 additions & 5 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,6 @@
path = vendor/naett
url = https://github.com/erkkah/naett.git
shallow = true
[submodule "vendor/msf_gif"]
path = vendor/msf_gif
url = https://github.com/notnullnotvoid/msf_gif.git
shallow = true
[submodule "vendor/dlfcn"]
path = vendor/dlfcn
url = https://github.com/dlfcn-win32/dlfcn-win32.git
Expand All @@ -86,7 +82,6 @@
path = vendor/pocketpy
url = https://github.com/pocketpy/pocketpy.git
shallow = true

[submodule "vendor/lpeg"]
path = vendor/lpeg
url = https://github.com/roberto-ieru/LPeg.git
5 changes: 2 additions & 3 deletions cmake/gif.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ if(PREFER_SYSTEM_LIBRARIES)
add_library(giflib UNKNOWN IMPORTED GLOBAL)
set_target_properties(giflib PROPERTIES
IMPORTED_LOCATION "${giflib_LIBRARY}"
INTERFACE_INCLUDE_DIRECTORIES "${giflib_INCLUDE_DIR};${THIRDPARTY_DIR}/msf_gif"
INTERFACE_INCLUDE_DIRECTORIES "${giflib_INCLUDE_DIR}"
)
message(STATUS "Use system library: giflib")
return()
Expand All @@ -32,5 +32,4 @@ add_library(giflib STATIC ${GIFLIB_SRC})
target_include_directories(giflib
PRIVATE ${GIFLIB_DIR}
INTERFACE
${THIRDPARTY_DIR}/giflib
${THIRDPARTY_DIR}/msf_gif)
${THIRDPARTY_DIR}/giflib)
Loading
Loading