diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index a7ef4b9..91f6e5f 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -5,6 +5,7 @@ "includePath": [ "${workspaceFolder}/source", "${workspaceFolder}/source/external", + "${workspaceFolder}/build/generated_shaders", "${env:HOMEBREW_PREFIX}/include", "/opt/homebrew/include" ], @@ -25,6 +26,7 @@ "includePath": [ "${workspaceFolder}/source", "${workspaceFolder}/source/external", + "${workspaceFolder}/build/generated_shaders", "/usr/include", "/usr/local/include" ], @@ -41,6 +43,7 @@ "includePath": [ "${workspaceFolder}/source", "${workspaceFolder}/source/external", + "${workspaceFolder}/build/generated_shaders", "C:/mingw/include" ], "defines": [ diff --git a/release/windows/vibe3.rc b/release/windows/vibe3.rc index 96efd69..1af78a6 100644 --- a/release/windows/vibe3.rc +++ b/release/windows/vibe3.rc @@ -1,2 +1,2 @@ // coffee.rc -IDI_ICON1 ICON "icon.ico" +IDI_ICON1 ICON "release/icons/icon.ico" diff --git a/source/gpu/gpu_pipeline.cpp b/source/gpu/gpu_pipeline.cpp index 50f187a..618d19f 100644 --- a/source/gpu/gpu_pipeline.cpp +++ b/source/gpu/gpu_pipeline.cpp @@ -15,6 +15,7 @@ #include "ball_vert_spv.h" #endif +#ifdef __APPLE__ // ============================================================================ // MSL Shaders (Metal Shading Language, macOS) // ============================================================================ @@ -197,6 +198,7 @@ vertex BallVOut ball_instanced_vs(BallInstance inst [[stage_in]], return out; } )"; +#endif // __APPLE__ // ============================================================================ // GpuPipeline implementation