more cleanup

This commit is contained in:
Matthew 2026-05-13 03:35:39 +10:00
parent d2d93f9e86
commit d6b3e7444e
4 changed files with 7 additions and 14 deletions

View File

@ -2,8 +2,7 @@ module dlib.assets;
import dlib.aliases; import dlib.aliases;
static if(NativeTarget) static if(NativeTarget) version(DLIB_ASSETS):
{
import dlibincludes : cgltf_result, import dlibincludes : cgltf_result,
cgltf_memory_options, cgltf_memory_options,
@ -817,4 +816,3 @@ GenerateDefaultMaterial()
return mat; return mat;
} }
}

View File

@ -23,16 +23,9 @@
# define VK_USE_PLATFORM_WIN32_KHR # define VK_USE_PLATFORM_WIN32_KHR
#endif #endif
#if !defined(NO_STBI) && !defined(BUILD_WASM) #ifdef BUILD_ASSETS
# include "../external/stb/stb_image.h" # include "../external/stb/stb_image.h"
# include "../external/stb/stb_image_write.h" # include "../external/stb/stb_image_write.h"
#endif
#ifdef DLIB_INCLUDE_VULKAN
# include "../../VulkanRenderer/vulkan_includes.c"
#endif
#ifndef BUILD_WASM
# include "../external/cgltf/cgltf.h" # include "../external/cgltf/cgltf.h"
#endif #endif

View File

@ -12,7 +12,7 @@ declare -a shared_src=(
dlib/alloc.d dlib/alloc.d
dlib/assets.d dlib/assets.d
dlib/externdecl.d dlib/externdecl.d
stb_truetype.d dlib/stb_truetype.d
) )
if [ "$1" == "wasm" ]; then if [ "$1" == "wasm" ]; then
@ -73,7 +73,9 @@ else
-L-lstdc++ -L-lstdc++
-Jbuild -Jbuild
-d-version=VULKAN_RENDERER_TEST -d-version=VULKAN_RENDERER_TEST
-d-version=DLIB_ASSETS
-Xcc=-DBUILD_VULKAN -Xcc=-DBUILD_VULKAN
-Xcc=-DBUILD_ASSETS
) )
# Test for compilation # Test for compilation

View File

@ -10,7 +10,7 @@ import std.stdio;
import std.algorithm.comparison; import std.algorithm.comparison;
import std.algorithm.searching : canFind; import std.algorithm.searching : canFind;
import std.traits : isPointer, isArray; import std.traits : isPointer, isArray;
import core.stdc.string : strcmp, memcpy; import core.stdc.string : strcmp, memcpy, strlen;
import core.stdc.stdio : Printf = printf; import core.stdc.stdio : Printf = printf;
import std.format : sformat; import std.format : sformat;
import std.math.rounding : Ceil = ceil; import std.math.rounding : Ceil = ceil;