Skip to content

Commit 2cb0af7

Browse files
hoffstadthoffstadt
committed
build: fix macos runner env issues
1 parent 08a89e7 commit 2cb0af7

10 files changed

Lines changed: 47 additions & 40 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@ jobs:
124124
MacOS:
125125

126126
runs-on: macos-14
127-
127+
env:
128+
CXX: g++-10
128129
steps:
129130

130131
- name: Checkout

‎examples/build_linux.sh‎

100644100755
File mode changed.

‎examples/build_macos.sh‎

100644100755
File mode changed.

‎scripts/gen_dev.py‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ def add_debug_unity_ext():
151151
pl.add_static_link_libraries("shaderc_combined", "spirv-cross-c", "spirv-cross-core", "spirv-cross-cpp",
152152
"spirv-cross-glsl", "spirv-cross-hlsl", "spirv-cross-msl", "spirv-cross-reflect", "spirv-cross-util")
153153
pl.add_compiler_flags("-Wno-deprecated-declarations")
154+
pl.add_linker_flags("-lstdc++")
154155

155156
def add_release_unity_ext():
156157

@@ -182,6 +183,7 @@ def add_release_unity_ext():
182183
pl.add_static_link_libraries("shaderc_combined", "spirv-cross-c", "spirv-cross-core", "spirv-cross-cpp",
183184
"spirv-cross-glsl", "spirv-cross-hlsl", "spirv-cross-msl", "spirv-cross-reflect", "spirv-cross-util")
184185
pl.add_compiler_flags("-Wno-deprecated-declarations")
186+
pl.add_linker_flags("-lstdc++")
185187

186188
with pl.configuration("debug"): add_debug_unity_ext()
187189
with pl.configuration("release"): add_release_unity_ext()
@@ -192,13 +194,15 @@ def add_release_unity_ext():
192194
with pl.configuration("moltenvk"):
193195
with pl.platform("Darwin"):
194196
with pl.compiler("clang"):
197+
pl.add_linker_flags("-lstdc++")
195198
pl.add_dynamic_link_libraries("pthread", "vulkan")
196-
pl.add_static_link_libraries("libshaderc_combined", "libspirv-cross-c", "libspirv-cross-core", "libspirv-cross-cpp",
197-
"libspirv-cross-glsl", "libspirv-cross-hlsl", "libspirv-cross-msl", "libspirv-cross-reflect", "libspirv-cross-util")
198-
199+
pl.add_static_link_libraries("shaderc_combined", "spirv-cross-c", "spirv-cross-core", "spirv-cross-cpp",
200+
"spirv-cross-glsl", "spirv-cross-hlsl", "spirv-cross-msl", "spirv-cross-reflect", "spirv-cross-util")
201+
199202
with pl.configuration("moltenvk_experimental"):
200203
with pl.platform("Darwin"):
201204
with pl.compiler("clang"):
205+
pl.add_linker_flags("-lstdc++")
202206
pl.add_dynamic_link_libraries("pthread", "vulkan")
203207
pl.add_static_link_libraries("shaderc_combined", "spirv-cross-c", "spirv-cross-core", "spirv-cross-cpp",
204208
"spirv-cross-glsl", "spirv-cross-hlsl", "spirv-cross-msl", "spirv-cross-reflect", "spirv-cross-util")
@@ -240,14 +244,14 @@ def add_script_ext():
240244
# macos
241245
with pl.platform("Darwin"):
242246
with pl.compiler("clang"):
243-
pl.add_static_link_libraries("libshaderc_combined")
247+
pass
244248

245249
with pl.configuration("moltenvk_experimental"):
246250

247251
# macos
248252
with pl.platform("Darwin"):
249253
with pl.compiler("clang"):
250-
pl.add_static_link_libraries("shaderc_combined")
254+
pass
251255

252256
#-----------------------------------------------------------------------------
253257
# [SECTION] platform extension

‎scripts/gen_distribute.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,7 @@
287287
# macos
288288
with pl.platform("Darwin"):
289289
with pl.compiler("clang"):
290+
pl.add_linker_flags("-lstdc++")
290291
pl.add_static_link_libraries("shaderc_combined", "spirv-cross-c", "spirv-cross-core", "spirv-cross-cpp",
291292
"spirv-cross-glsl", "spirv-cross-hlsl", "spirv-cross-msl", "spirv-cross-reflect", "spirv-cross-util")
292293

@@ -315,6 +316,7 @@
315316
# macos
316317
with pl.platform("Darwin"):
317318
with pl.compiler("clang"):
319+
pl.add_linker_flags("-lstdc++")
318320
pl.add_static_link_libraries("shaderc_combined", "spirv-cross-c", "spirv-cross-core", "spirv-cross-cpp",
319321
"spirv-cross-glsl", "spirv-cross-hlsl", "spirv-cross-msl", "spirv-cross-reflect", "spirv-cross-util")
320322

‎src/build_linux.sh‎

100644100755
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ PL_INCLUDE_DIRECTORIES="-I../editor -I../src -I../shaders -I../libs -I../extensi
9494
PL_LINK_DIRECTORIES="-L../out -Wl,-rpath,../out -L/usr/lib/x86_64-linux-gnu -Wl,-rpath,/usr/lib/x86_64-linux-gnu -L$VULKAN_SDK/lib -Wl,-rpath,$VULKAN_SDK/lib "
9595
PL_COMPILER_FLAGS="-std=gnu11 -fPIC --debug -g "
9696
PL_LINKER_FLAGS="-ldl -lm "
97-
PL_STATIC_LINK_LIBRARIES=""
98-
PL_DYNAMIC_LINK_LIBRARIES="-lspirv-cross-c-shared -lshaderc_shared -lxcb -lX11 -lX11-xcb -lxkbcommon -lxcb-cursor -lxcb-xfixes -lxcb-keysyms -lpthread -lvulkan "
97+
PL_STATIC_LINK_LIBRARIES="-l:libshaderc_combined.a -l:libspirv-cross-c.a -l:libspirv-cross-core.a -l:libspirv-cross-cpp.a -l:libspirv-cross-glsl.a -l:libspirv-cross-hlsl.a -l:libspirv-cross-msl.a -l:libspirv-cross-reflect.a -l:libspirv-cross-util.a "
98+
PL_DYNAMIC_LINK_LIBRARIES="-lxcb -lX11 -lX11-xcb -lxkbcommon -lxcb-cursor -lxcb-xfixes -lxcb-keysyms -lpthread -lvulkan "
9999
PL_SOURCES="../extensions/pl_unity_ext.c "
100100

101101
# run compiler (and linker)
@@ -323,8 +323,8 @@ PL_INCLUDE_DIRECTORIES="-I../editor -I../src -I../shaders -I../libs -I../extensi
323323
PL_LINK_DIRECTORIES="-L../out -Wl,-rpath,../out -L/usr/lib/x86_64-linux-gnu -Wl,-rpath,/usr/lib/x86_64-linux-gnu -L$VULKAN_SDK/lib -Wl,-rpath,$VULKAN_SDK/lib "
324324
PL_COMPILER_FLAGS="-std=gnu11 -fPIC "
325325
PL_LINKER_FLAGS="-ldl -lm "
326-
PL_STATIC_LINK_LIBRARIES=""
327-
PL_DYNAMIC_LINK_LIBRARIES="-lspirv-cross-c-shared -lshaderc_shared -lxcb -lX11 -lX11-xcb -lxkbcommon -lxcb-cursor -lxcb-xfixes -lxcb-keysyms -lpthread -lvulkan "
326+
PL_STATIC_LINK_LIBRARIES="-l:libshaderc_combined.a -l:libspirv-cross-c.a -l:libspirv-cross-core.a -l:libspirv-cross-cpp.a -l:libspirv-cross-glsl.a -l:libspirv-cross-hlsl.a -l:libspirv-cross-msl.a -l:libspirv-cross-reflect.a -l:libspirv-cross-util.a "
327+
PL_DYNAMIC_LINK_LIBRARIES="-lxcb -lX11 -lX11-xcb -lxkbcommon -lxcb-cursor -lxcb-xfixes -lxcb-keysyms -lpthread -lvulkan "
328328
PL_SOURCES="../extensions/pl_unity_ext.c "
329329

330330
# run compiler (and linker)
@@ -556,8 +556,8 @@ PL_INCLUDE_DIRECTORIES="-I../editor -I../src -I../shaders -I../libs -I../extensi
556556
PL_LINK_DIRECTORIES="-L../out -Wl,-rpath,../out -L/usr/lib/x86_64-linux-gnu -Wl,-rpath,/usr/lib/x86_64-linux-gnu -L$VULKAN_SDK/lib -Wl,-rpath,$VULKAN_SDK/lib "
557557
PL_COMPILER_FLAGS="-std=gnu11 -fPIC --debug -g "
558558
PL_LINKER_FLAGS="-ldl -lm "
559-
PL_STATIC_LINK_LIBRARIES=""
560-
PL_DYNAMIC_LINK_LIBRARIES="-lspirv-cross-c-shared -lshaderc_shared -lxcb -lX11 -lX11-xcb -lxkbcommon -lxcb-cursor -lxcb-xfixes -lxcb-keysyms -lpthread -lvulkan "
559+
PL_STATIC_LINK_LIBRARIES="-l:libshaderc_combined.a -l:libspirv-cross-c.a -l:libspirv-cross-core.a -l:libspirv-cross-cpp.a -l:libspirv-cross-glsl.a -l:libspirv-cross-hlsl.a -l:libspirv-cross-msl.a -l:libspirv-cross-reflect.a -l:libspirv-cross-util.a "
560+
PL_DYNAMIC_LINK_LIBRARIES="-lxcb -lX11 -lX11-xcb -lxkbcommon -lxcb-cursor -lxcb-xfixes -lxcb-keysyms -lpthread -lvulkan "
561561
PL_SOURCES="../extensions/pl_unity_ext.c "
562562

563563
# run compiler (and linker)
@@ -997,8 +997,8 @@ PL_INCLUDE_DIRECTORIES="-I../editor -I../src -I../shaders -I../libs -I../extensi
997997
PL_LINK_DIRECTORIES="-L../out -Wl,-rpath,../out -L/usr/lib/x86_64-linux-gnu -Wl,-rpath,/usr/lib/x86_64-linux-gnu -L$VULKAN_SDK/lib -Wl,-rpath,$VULKAN_SDK/lib "
998998
PL_COMPILER_FLAGS="-std=gnu11 -fPIC "
999999
PL_LINKER_FLAGS="-ldl -lm "
1000-
PL_STATIC_LINK_LIBRARIES=""
1001-
PL_DYNAMIC_LINK_LIBRARIES="-lspirv-cross-c-shared -lshaderc_shared -lxcb -lX11 -lX11-xcb -lxkbcommon -lxcb-cursor -lxcb-xfixes -lxcb-keysyms -lpthread -lvulkan "
1000+
PL_STATIC_LINK_LIBRARIES="-l:libshaderc_combined.a -l:libspirv-cross-c.a -l:libspirv-cross-core.a -l:libspirv-cross-cpp.a -l:libspirv-cross-glsl.a -l:libspirv-cross-hlsl.a -l:libspirv-cross-msl.a -l:libspirv-cross-reflect.a -l:libspirv-cross-util.a "
1001+
PL_DYNAMIC_LINK_LIBRARIES="-lxcb -lX11 -lX11-xcb -lxkbcommon -lxcb-cursor -lxcb-xfixes -lxcb-keysyms -lpthread -lvulkan "
10021002
PL_SOURCES="../extensions/pl_unity_ext.c "
10031003

10041004
# run compiler (and linker)

‎src/build_macos.sh‎

100644100755
Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ PL_DEFINES="-DPL_UNITY_BUILD -DPL_METAL_BACKEND -DPL_UNITY_BUILD -D_DEBUG -DPL_C
9696
PL_INCLUDE_DIRECTORIES="-I../editor -I../src -I../shaders -I../libs -I../extensions -I../out -I../dependencies/stb -I../dependencies/cgltf -I../dependencies/imgui -I../dependencies/glfw/include "
9797
PL_LINK_DIRECTORIES="-L../out -Wl,-rpath,../out -L/usr/local/lib -Wl,-rpath,/usr/local/lib "
9898
PL_COMPILER_FLAGS="-std=c99 -fmodules -ObjC -fPIC --debug -g -Wno-deprecated-declarations "
99-
PL_LINKER_FLAGS=""
100-
PL_STATIC_LINK_LIBRARIES=""
101-
PL_DYNAMIC_LINK_LIBRARIES="-lspirv-cross-c-shared -lshaderc_shared "
99+
PL_LINKER_FLAGS="-lstdc++ "
100+
PL_STATIC_LINK_LIBRARIES="-lshaderc_combined -lspirv-cross-c -lspirv-cross-core -lspirv-cross-cpp -lspirv-cross-glsl -lspirv-cross-hlsl -lspirv-cross-msl -lspirv-cross-reflect -lspirv-cross-util "
101+
PL_DYNAMIC_LINK_LIBRARIES=""
102102
PL_SOURCES="../extensions/pl_unity_ext.c "
103103
PL_LINK_FRAMEWORKS="-framework Metal -framework MetalKit -framework Cocoa -framework IOKit -framework CoreVideo -framework QuartzCore "
104104

@@ -366,9 +366,9 @@ PL_DEFINES="-DPL_UNITY_BUILD -DPL_METAL_BACKEND -DPL_UNITY_BUILD -DNDEBUG -DPL_C
366366
PL_INCLUDE_DIRECTORIES="-I../editor -I../src -I../shaders -I../libs -I../extensions -I../out -I../dependencies/stb -I../dependencies/cgltf -I../dependencies/imgui -I../dependencies/glfw/include "
367367
PL_LINK_DIRECTORIES="-L../out -Wl,-rpath,../out -L/usr/local/lib -Wl,-rpath,/usr/local/lib "
368368
PL_COMPILER_FLAGS="-std=c99 -fmodules -ObjC -fPIC -Wno-deprecated-declarations "
369-
PL_LINKER_FLAGS=""
370-
PL_STATIC_LINK_LIBRARIES=""
371-
PL_DYNAMIC_LINK_LIBRARIES="-lspirv-cross-c-shared -lshaderc_shared "
369+
PL_LINKER_FLAGS="-lstdc++ "
370+
PL_STATIC_LINK_LIBRARIES="-lshaderc_combined -lspirv-cross-c -lspirv-cross-core -lspirv-cross-cpp -lspirv-cross-glsl -lspirv-cross-hlsl -lspirv-cross-msl -lspirv-cross-reflect -lspirv-cross-util "
371+
PL_DYNAMIC_LINK_LIBRARIES=""
372372
PL_SOURCES="../extensions/pl_unity_ext.c "
373373
PL_LINK_FRAMEWORKS="-framework Metal -framework MetalKit -framework Cocoa -framework IOKit -framework CoreVideo -framework QuartzCore "
374374

@@ -640,9 +640,9 @@ PL_DEFINES="-DPL_UNITY_BUILD -DPL_METAL_BACKEND -DPL_UNITY_BUILD -D_DEBUG -DPL_C
640640
PL_INCLUDE_DIRECTORIES="-I../editor -I../src -I../shaders -I../libs -I../extensions -I../out -I../dependencies/stb -I../dependencies/cgltf -I../dependencies/imgui -I../dependencies/glfw/include "
641641
PL_LINK_DIRECTORIES="-L../out -Wl,-rpath,../out -L/usr/local/lib -Wl,-rpath,/usr/local/lib "
642642
PL_COMPILER_FLAGS="-std=c99 -fmodules -ObjC -fPIC --debug -g -Wno-deprecated-declarations "
643-
PL_LINKER_FLAGS=""
644-
PL_STATIC_LINK_LIBRARIES=""
645-
PL_DYNAMIC_LINK_LIBRARIES="-lspirv-cross-c-shared -lshaderc_shared "
643+
PL_LINKER_FLAGS="-lstdc++ "
644+
PL_STATIC_LINK_LIBRARIES="-lshaderc_combined -lspirv-cross-c -lspirv-cross-core -lspirv-cross-cpp -lspirv-cross-glsl -lspirv-cross-hlsl -lspirv-cross-msl -lspirv-cross-reflect -lspirv-cross-util "
645+
PL_DYNAMIC_LINK_LIBRARIES=""
646646
PL_SOURCES="../extensions/pl_unity_ext.c "
647647
PL_LINK_FRAMEWORKS="-framework Metal -framework MetalKit -framework Cocoa -framework IOKit -framework CoreVideo -framework QuartzCore "
648648

@@ -1141,9 +1141,9 @@ PL_DEFINES="-DPL_UNITY_BUILD -DPL_METAL_BACKEND -DPL_UNITY_BUILD -DNDEBUG -DPL_C
11411141
PL_INCLUDE_DIRECTORIES="-I../editor -I../src -I../shaders -I../libs -I../extensions -I../out -I../dependencies/stb -I../dependencies/cgltf -I../dependencies/imgui -I../dependencies/glfw/include "
11421142
PL_LINK_DIRECTORIES="-L../out -Wl,-rpath,../out -L/usr/local/lib -Wl,-rpath,/usr/local/lib "
11431143
PL_COMPILER_FLAGS="-std=c99 -fmodules -ObjC -fPIC -Wno-deprecated-declarations "
1144-
PL_LINKER_FLAGS=""
1145-
PL_STATIC_LINK_LIBRARIES=""
1146-
PL_DYNAMIC_LINK_LIBRARIES="-lspirv-cross-c-shared -lshaderc_shared "
1144+
PL_LINKER_FLAGS="-lstdc++ "
1145+
PL_STATIC_LINK_LIBRARIES="-lshaderc_combined -lspirv-cross-c -lspirv-cross-core -lspirv-cross-cpp -lspirv-cross-glsl -lspirv-cross-hlsl -lspirv-cross-msl -lspirv-cross-reflect -lspirv-cross-util "
1146+
PL_DYNAMIC_LINK_LIBRARIES=""
11471147
PL_SOURCES="../extensions/pl_unity_ext.c "
11481148
PL_LINK_FRAMEWORKS="-framework Metal -framework MetalKit -framework Cocoa -framework IOKit -framework CoreVideo -framework QuartzCore "
11491149

@@ -1323,7 +1323,7 @@ PL_LINK_DIRECTORIES="-L../out -Wl,-rpath,../out -L$VULKAN_SDK/lib -Wl,-rpath,$VU
13231323
PL_COMPILER_FLAGS="-std=c99 -fmodules -ObjC -fPIC -Wno-deprecated-declarations "
13241324
PL_LINKER_FLAGS=""
13251325
PL_STATIC_LINK_LIBRARIES=""
1326-
PL_DYNAMIC_LINK_LIBRARIES="-lspirv-cross-c-shared -lshaderc_shared -lvulkan "
1326+
PL_DYNAMIC_LINK_LIBRARIES="-lvulkan "
13271327
PL_SOURCES="../dependencies/glfw/src/glfw_unity.c ../dependencies/glfw/src/null_window.c "
13281328
PL_LINK_FRAMEWORKS="-framework Cocoa -framework IOKit -framework CoreFoundation "
13291329

@@ -1638,9 +1638,9 @@ PL_DEFINES="-DPL_UNITY_BUILD -DPL_VULKAN_BACKEND -D_DEBUG -DPL_CONFIG_DEBUG "
16381638
PL_INCLUDE_DIRECTORIES="-I../editor -I../src -I../shaders -I../libs -I../extensions -I../out -I../dependencies/stb -I../dependencies/cgltf -I../dependencies/imgui -I../dependencies/glfw/include "
16391639
PL_LINK_DIRECTORIES="-L../out -Wl,-rpath,../out -L/usr/local/lib -Wl,-rpath,/usr/local/lib "
16401640
PL_COMPILER_FLAGS="-std=c99 -fmodules -ObjC -fPIC --debug -g "
1641-
PL_LINKER_FLAGS=""
1642-
PL_STATIC_LINK_LIBRARIES=""
1643-
PL_DYNAMIC_LINK_LIBRARIES="-lspirv-cross-c-shared -lshaderc_shared -lpthread -lvulkan "
1641+
PL_LINKER_FLAGS="-lstdc++ "
1642+
PL_STATIC_LINK_LIBRARIES="-lshaderc_combined -lspirv-cross-c -lspirv-cross-core -lspirv-cross-cpp -lspirv-cross-glsl -lspirv-cross-hlsl -lspirv-cross-msl -lspirv-cross-reflect -lspirv-cross-util "
1643+
PL_DYNAMIC_LINK_LIBRARIES="-lpthread -lvulkan "
16441644
PL_SOURCES="../extensions/pl_unity_ext.c "
16451645
PL_LINK_FRAMEWORKS="-framework Metal -framework MetalKit -framework Cocoa -framework IOKit -framework CoreVideo -framework QuartzCore "
16461646

@@ -1682,7 +1682,7 @@ PL_LINK_DIRECTORIES="-L../out -Wl,-rpath,../out -L/usr/local/lib -Wl,-rpath,/usr
16821682
PL_COMPILER_FLAGS="-std=c99 -fmodules -ObjC -fPIC --debug -g "
16831683
PL_LINKER_FLAGS=""
16841684
PL_STATIC_LINK_LIBRARIES=""
1685-
PL_DYNAMIC_LINK_LIBRARIES="-lshaderc_shared "
1685+
PL_DYNAMIC_LINK_LIBRARIES=""
16861686
PL_SOURCES="../extensions/pl_script_camera.c "
16871687
PL_LINK_FRAMEWORKS="-framework Metal -framework MetalKit -framework Cocoa -framework IOKit -framework CoreVideo -framework QuartzCore "
16881688

@@ -1912,9 +1912,9 @@ PL_DEFINES="-DPL_UNITY_BUILD -DPL_VULKAN_BACKEND -D_DEBUG -DPL_CONFIG_DEBUG "
19121912
PL_INCLUDE_DIRECTORIES="-I../editor -I../src -I../shaders -I../libs -I../extensions -I../out -I../dependencies/stb -I../dependencies/cgltf -I../dependencies/imgui -I../dependencies/glfw/include "
19131913
PL_LINK_DIRECTORIES="-L../out -Wl,-rpath,../out -L/usr/local/lib -Wl,-rpath,/usr/local/lib "
19141914
PL_COMPILER_FLAGS="-std=c99 -fmodules -ObjC -fPIC --debug -g "
1915-
PL_LINKER_FLAGS=""
1916-
PL_STATIC_LINK_LIBRARIES=""
1917-
PL_DYNAMIC_LINK_LIBRARIES="-lspirv-cross-c-shared -lshaderc_shared -lpthread -lvulkan "
1915+
PL_LINKER_FLAGS="-lstdc++ "
1916+
PL_STATIC_LINK_LIBRARIES="-lshaderc_combined -lspirv-cross-c -lspirv-cross-core -lspirv-cross-cpp -lspirv-cross-glsl -lspirv-cross-hlsl -lspirv-cross-msl -lspirv-cross-reflect -lspirv-cross-util "
1917+
PL_DYNAMIC_LINK_LIBRARIES="-lpthread -lvulkan "
19181918
PL_SOURCES="../extensions/pl_unity_ext.c "
19191919
PL_LINK_FRAMEWORKS="-framework Metal -framework MetalKit -framework Cocoa -framework IOKit -framework CoreVideo -framework QuartzCore "
19201920

@@ -1956,7 +1956,7 @@ PL_LINK_DIRECTORIES="-L../out -Wl,-rpath,../out -L/usr/local/lib -Wl,-rpath,/usr
19561956
PL_COMPILER_FLAGS="-std=c99 -fmodules -ObjC -fPIC --debug -g "
19571957
PL_LINKER_FLAGS=""
19581958
PL_STATIC_LINK_LIBRARIES=""
1959-
PL_DYNAMIC_LINK_LIBRARIES="-lshaderc_shared "
1959+
PL_DYNAMIC_LINK_LIBRARIES=""
19601960
PL_SOURCES="../extensions/pl_script_camera.c "
19611961
PL_LINK_FRAMEWORKS="-framework Metal -framework MetalKit -framework Cocoa -framework IOKit -framework CoreVideo -framework QuartzCore "
19621962

@@ -2094,7 +2094,7 @@ PL_LINK_DIRECTORIES="-L../out -Wl,-rpath,../out -L$VULKAN_SDK/lib -Wl,-rpath,$VU
20942094
PL_COMPILER_FLAGS="-Wno-deprecated-declarations --debug -g -std=c99 -fmodules -ObjC -fPIC "
20952095
PL_LINKER_FLAGS=""
20962096
PL_STATIC_LINK_LIBRARIES=""
2097-
PL_DYNAMIC_LINK_LIBRARIES="-lspirv-cross-c-shared -lshaderc_shared -lvulkan "
2097+
PL_DYNAMIC_LINK_LIBRARIES="-lvulkan "
20982098
PL_SOURCES="../dependencies/glfw/src/glfw_unity.c ../dependencies/glfw/src/null_window.c "
20992099
PL_LINK_FRAMEWORKS="-framework Cocoa -framework IOKit -framework CoreFoundation "
21002100

‎src/build_win32.bat‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
@set PL_LINK_DIRECTORIES=-LIBPATH:"../out" -LIBPATH:"%VULKAN_SDK%\Lib"
9898
@set PL_COMPILER_FLAGS=-Zc:preprocessor -nologo -W4 -WX -wd4201 -wd4100 -wd4996 -wd4505 -wd4189 -wd5105 -wd4115 -permissive- -Od -MDd -Zi -std:c11
9999
@set PL_LINKER_FLAGS=-noimplib -noexp -incremental:no -nodefaultlib:MSVCRT
100-
@set PL_STATIC_LINK_LIBRARIES=shaderc_combined.lib spirv-cross-c-shared.lib vulkan-1.lib
100+
@set PL_STATIC_LINK_LIBRARIES=vulkan-1.lib shaderc_combined.lib spirv-cross-c.lib spirv-cross-core.lib spirv-cross-cpp.lib spirv-cross-glsl.lib spirv-cross-hlsl.lib spirv-cross-msl.lib spirv-cross-reflect.lib spirv-cross-util.lib
101101
@set PL_SOURCES="../extensions/pl_unity_ext.c"
102102

103103
:: run compiler (and linker)
@@ -330,7 +330,7 @@ goto ExitLabel
330330
@set PL_LINK_DIRECTORIES=-LIBPATH:"../out" -LIBPATH:"%VULKAN_SDK%\Lib"
331331
@set PL_COMPILER_FLAGS=-Zc:preprocessor -nologo -W4 -WX -wd4201 -wd4100 -wd4996 -wd4505 -wd4189 -wd5105 -wd4115 -permissive- -O2 -MD -std:c11
332332
@set PL_LINKER_FLAGS=-noimplib -noexp -incremental:no
333-
@set PL_STATIC_LINK_LIBRARIES=shaderc_combined.lib spirv-cross-c-shared.lib vulkan-1.lib
333+
@set PL_STATIC_LINK_LIBRARIES=vulkan-1.lib shaderc_combined.lib spirv-cross-c.lib spirv-cross-core.lib spirv-cross-cpp.lib spirv-cross-glsl.lib spirv-cross-hlsl.lib spirv-cross-msl.lib spirv-cross-reflect.lib spirv-cross-util.lib
334334
@set PL_SOURCES="../extensions/pl_unity_ext.c"
335335

336336
:: run compiler (and linker)
@@ -567,7 +567,7 @@ goto ExitLabel
567567
@set PL_LINK_DIRECTORIES=-LIBPATH:"../out" -LIBPATH:"%VULKAN_SDK%\Lib"
568568
@set PL_COMPILER_FLAGS=-Zc:preprocessor -nologo -W4 -WX -wd4201 -wd4100 -wd4996 -wd4505 -wd4189 -wd5105 -wd4115 -permissive- -Od -MDd -Zi -std:c11
569569
@set PL_LINKER_FLAGS=-noimplib -noexp -incremental:no -nodefaultlib:MSVCRT
570-
@set PL_STATIC_LINK_LIBRARIES=shaderc_combined.lib spirv-cross-c-shared.lib vulkan-1.lib
570+
@set PL_STATIC_LINK_LIBRARIES=vulkan-1.lib shaderc_combined.lib spirv-cross-c.lib spirv-cross-core.lib spirv-cross-cpp.lib spirv-cross-glsl.lib spirv-cross-hlsl.lib spirv-cross-msl.lib spirv-cross-reflect.lib spirv-cross-util.lib
571571
@set PL_SOURCES="../extensions/pl_unity_ext.c"
572572

573573
:: run compiler (and linker)
@@ -969,7 +969,7 @@ goto ExitLabel
969969
@set PL_LINK_DIRECTORIES=-LIBPATH:"../out" -LIBPATH:"%VULKAN_SDK%\Lib"
970970
@set PL_COMPILER_FLAGS=-Zc:preprocessor -nologo -W4 -WX -wd4201 -wd4100 -wd4996 -wd4505 -wd4189 -wd5105 -wd4115 -permissive- -O2 -MD -std:c11
971971
@set PL_LINKER_FLAGS=-noimplib -noexp -incremental:no
972-
@set PL_STATIC_LINK_LIBRARIES=shaderc_combined.lib spirv-cross-c-shared.lib vulkan-1.lib
972+
@set PL_STATIC_LINK_LIBRARIES=vulkan-1.lib shaderc_combined.lib spirv-cross-c.lib spirv-cross-core.lib spirv-cross-cpp.lib spirv-cross-glsl.lib spirv-cross-hlsl.lib spirv-cross-msl.lib spirv-cross-reflect.lib spirv-cross-util.lib
973973
@set PL_SOURCES="../extensions/pl_unity_ext.c"
974974

975975
:: run compiler (and linker)

‎tests/build_linux.sh‎

100644100755
File mode changed.

‎tests/build_macos.sh‎

100644100755
File mode changed.

0 commit comments

Comments
 (0)