Skip to content

Commit 5b34979

Browse files
Prep for migrating premake-ninja into core (premake#2493)
1 parent ba2c383 commit 5b34979

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ Makefile
3737
.settings
3838
.buildpath
3939
*.vs
40+
*.ninja
41+
*.ninja_deps
42+
*.ninja_log
4043

4144
*.bbprojectsettings
4245
Scratchpad.txt

contrib/libzip/premake5.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ project "zip-lib"
1111
"**.c"
1212
}
1313

14-
filter "toolset:gcc or clang or cosmocc"
14+
filter { "toolset:gcc or clang or cosmocc", "system:not windows" }
1515
defines { "HAVE_SSIZE_T_LIBZIP", "HAVE_CONFIG_H" }
1616
forceincludes { "unistd.h" }
1717

premake5.lua

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@
267267
filter { "system:windows", "options:arch=x86_64 or arch=x64" }
268268
platforms { "x64" }
269269

270-
filter { "system:windows", "options:not arch" }
270+
filter { "system:windows", "options:arch=" }
271271
platforms { "x86", "x64" }
272272

273273
filter "configurations:Debug"
@@ -288,6 +288,9 @@
288288
-- MinGW AR does not handle LTO out of the box and need a plugin to be setup
289289
filter { "system:windows", "configurations:Release", "toolset:not mingw" }
290290
flags { "LinkTimeOptimization" }
291+
292+
filter { "system:windows", "configurations:Release", "toolset:clang", "action:not vs*" }
293+
linkoptions { "-fuse-ld=lld" }
291294

292295
filter { "system:uwp" }
293296
systemversion "latest:latest"
@@ -352,6 +355,9 @@
352355
filter "toolset:mingw"
353356
links { "crypt32", "bcrypt" }
354357

358+
filter { "system:windows", "toolset:clang", "action:not vs*" }
359+
links { "crypt32", "bcrypt" }
360+
355361
filter "system:linux or bsd or hurd"
356362
defines { "LUA_USE_POSIX", "LUA_USE_DLOPEN" }
357363
links { "m" }

0 commit comments

Comments
 (0)