Skip to content
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

Jump to bottom

introduce miniz submodule #288

Merged
merged 1 commit into from
Jul 10, 2024
Merged

introduce miniz submodule #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,6 @@
[submodule "deps/pcre2"]
path = deps/pcre2
url = https://github.com/PCRE2Project/pcre2
[submodule "deps/miniz"]
path = deps/miniz
url = https://github.com/richgel999/miniz
8 changes: 8 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,16 @@ if (WITH_LUA_ENGINE STREQUAL Lua)
endif ()

include(LuaAddExecutable)

# TODO: define MINIZ_NO_STDIO for small size
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this important to do before merging?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, I hope to make PR to miniz to support MINIZ_NO_STDIO build with cmake later, miniz cmake without MINIZ_NO_STDIO options now. So let's merge, and fix this TODO after miniz with this feature.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The miniz PR is richgel999/miniz#316

add_subdirectory(deps/miniz miniz.dir)
set(lminiz src/lminiz.c)
include_directories(deps/miniz)
list(APPEND LUVI_LIBRARIES miniz)

lua_add_executable(luvi
${winsvc}
${lminiz}
src/main.c
src/luvi_compat.c
src/lua/init.lua
Expand Down
1 change: 1 addition & 0 deletions deps/miniz
Open in desktop
Submodule miniz added at bf7a1f
Loading