Skip to content

Prep for migrating premake-ninja into core #2493

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
samsinsane merged 1 commit into from
Jul 3, 2025
Merged

Prep for migrating premake-ninja into core #2493

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 .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ Makefile
.settings
.buildpath
*.vs
*.ninja
*.ninja_deps
*.ninja_log

*.bbprojectsettings
Scratchpad.txt
Expand Down
2 changes: 1 addition & 1 deletion contrib/libzip/premake5.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ project "zip-lib"
"**.c"
}

filter "toolset:gcc or clang or cosmocc"
filter { "toolset:gcc or clang or cosmocc", "system:not windows" }
defines { "HAVE_SSIZE_T_LIBZIP", "HAVE_CONFIG_H" }
forceincludes { "unistd.h" }

Expand Down
8 changes: 7 additions & 1 deletion premake5.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@
filter { "system:windows", "options:arch=x86_64 or arch=x64" }
platforms { "x64" }

filter { "system:windows", "options:not arch" }
filter { "system:windows", "options:arch=" }
platforms { "x86", "x64" }

filter "configurations:Debug"
Expand All @@ -288,6 +288,9 @@
-- MinGW AR does not handle LTO out of the box and need a plugin to be setup
filter { "system:windows", "configurations:Release", "toolset:not mingw" }
flags { "LinkTimeOptimization" }

filter { "system:windows", "configurations:Release", "toolset:clang", "action:not vs*" }
linkoptions { "-fuse-ld=lld" }

filter { "system:uwp" }
systemversion "latest:latest"
Expand Down Expand Up @@ -352,6 +355,9 @@
filter "toolset:mingw"
links { "crypt32", "bcrypt" }

filter { "system:windows", "toolset:clang", "action:not vs*" }
links { "crypt32", "bcrypt" }

filter "system:linux or bsd or hurd"
defines { "LUA_USE_POSIX", "LUA_USE_DLOPEN" }
links { "m" }
Expand Down
Loading