diff --git a/CMakeLists.txt b/CMakeLists.txt index d150757b..968134c4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,8 +16,13 @@ set(DL_VULKAN_DIR AUTO) #set(DL_VULKAN_DIR D:/VulkanSDK/1.3.268.0) #set(DL_VULKAN_DIR D:/VulkanSDK/1.3.250.0) message("------------------dl option------------------") -# 设为true禁用绘图 -if(false) + +# 传递 DL_EASY 禁用绘图 +if(NOT DEFINED DL_EASY) + set(DL_EASY false) +endif() + +if(DL_EASY) set(DL_DISABLE_RENDER true) set(DL_DISABLE_AUDIO true) set(DL_DISABLE_OPENSSL false) @@ -105,7 +110,8 @@ endif() message("------------------OpenXLSX xlsx格式库-----------") add_subdirectory ("third/OpenXLSX") -if (NOT CMAKE_SYSTEM_NAME MATCHES "Android") +if (NOT CMAKE_SYSTEM_NAME MATCHES "Android" + AND NOT DL_DISABLE_RENDER) message("------------------glfw 窗口库------------------") add_subdirectory ("third/glfw") endif() diff --git a/dl/io/dl_input.h b/dl/io/dl_input.h index 966b4b72..2ac231e2 100644 --- a/dl/io/dl_input.h +++ b/dl/io/dl_input.h @@ -9,7 +9,6 @@ */ #pragma once -#ifndef DL_DISABLE_RENDER #include #include "dl_type.h" @@ -466,5 +465,3 @@ private: extern Input* g_input; } - -#endif \ No newline at end of file diff --git a/dl/misc/dl_mod.cpp b/dl/misc/dl_mod.cpp index 1695ff78..34678006 100644 --- a/dl/misc/dl_mod.cpp +++ b/dl/misc/dl_mod.cpp @@ -1,5 +1,6 @@ #include "dl_mod.h" +#ifndef DL_DISABLE_RENDER #include "base/dl_string.h" #include "io/dl_file.h" #include "render/dl_factory.h" @@ -75,3 +76,4 @@ void ModManager::LoadModAll(std::string_view path) } } +#endif \ No newline at end of file diff --git a/dl/misc/dl_mod.h b/dl/misc/dl_mod.h index 39be20ae..4c456edc 100644 --- a/dl/misc/dl_mod.h +++ b/dl/misc/dl_mod.h @@ -11,6 +11,7 @@ */ #pragma once +#ifndef DL_DISABLE_RENDER #include "io/dl_json.h" namespace dl @@ -59,3 +60,4 @@ private: extern ModManager* g_mod; } +#endif \ No newline at end of file diff --git a/dl/render/dl_factory.h b/dl/render/dl_factory.h index 3d83b0a9..552f5865 100644 --- a/dl/render/dl_factory.h +++ b/dl/render/dl_factory.h @@ -12,6 +12,7 @@ */ #pragma once +#ifndef DL_DISABLE_RENDER #include #include @@ -487,3 +488,4 @@ private: extern Factory* g_factory; } +#endif \ No newline at end of file diff --git a/dl/render/dl_model_data.cpp b/dl/render/dl_model_data.cpp index a9eaad76..02f0ca7c 100644 --- a/dl/render/dl_model_data.cpp +++ b/dl/render/dl_model_data.cpp @@ -1,5 +1,6 @@ #include "dl_model_data.h" +#ifndef DL_DISABLE_RENDER #include "vk/dl_vk.h" namespace dl @@ -267,4 +268,5 @@ namespace dl } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/dl/render/dl_model_loader.cpp b/dl/render/dl_model_loader.cpp index 4e4eb748..0f073eb4 100644 --- a/dl/render/dl_model_loader.cpp +++ b/dl/render/dl_model_loader.cpp @@ -1,5 +1,6 @@ #include "dl_model_loader.h" +#ifndef DL_DISABLE_RENDER #define TINYOBJLOADER_IMPLEMENTATION #include #define TINYGLTF_IMPLEMENTATION @@ -985,4 +986,5 @@ namespace dl return ret; } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/dl/render/dl_model_loader.h b/dl/render/dl_model_loader.h index c2891e63..76835074 100644 --- a/dl/render/dl_model_loader.h +++ b/dl/render/dl_model_loader.h @@ -11,6 +11,7 @@ */ #pragma once +#ifndef DL_DISABLE_RENDER #include #include @@ -119,3 +120,4 @@ private: extern ModelLoader* g_modelLoader; } +#endif \ No newline at end of file diff --git a/dl/script/dl_as_register.cpp b/dl/script/dl_as_register.cpp index 286c8051..83ad5f70 100644 --- a/dl/script/dl_as_register.cpp +++ b/dl/script/dl_as_register.cpp @@ -54,6 +54,7 @@ namespace dl } void as_register_ui(AngelScript* as) { +#ifndef DL_DISABLE_RENDER asIScriptEngine* eng = as->GetEngine(); int r = -1; r = eng->SetDefaultNamespace("UI"); assert(r >= 0); @@ -80,6 +81,7 @@ namespace dl r = eng->SetDefaultNamespace(""); assert(r >= 0); r = eng->RegisterGlobalProperty("UI::Manager@ g_ui", &g_ui); assert(r >= 0); +#endif } } \ No newline at end of file diff --git a/dl/script/dl_lua_register.cpp b/dl/script/dl_lua_register.cpp index ae288752..dfcba07c 100644 --- a/dl/script/dl_lua_register.cpp +++ b/dl/script/dl_lua_register.cpp @@ -76,6 +76,7 @@ namespace dl void lua_register_system(lua_State* L) { +#ifndef DL_DISABLE_RENDER luabridge::getGlobalNamespace(L) .beginClass("ParamWindow") .addConstructor() // 忽略这个构造会出错…… @@ -90,6 +91,7 @@ namespace dl auto result = luabridge::push(L, g_system); lua_setglobal(L, "g_system"); +#endif } void lua_register_file(lua_State* L) @@ -124,6 +126,7 @@ namespace dl void lua_register_gfx(lua_State* L) { +#ifndef DL_DISABLE_RENDER luabridge::getGlobalNamespace(L) .beginClass("Graphics") .addFunction("Rectangle2D", &Graphics::Rectangle2D) @@ -131,10 +134,12 @@ namespace dl auto result = luabridge::push(L, g_gfx); lua_setglobal(L, "g_gfx"); +#endif } void lua_register_ui(lua_State* L) { +#ifndef DL_DISABLE_RENDER using namespace UI; luabridge::getGlobalNamespace(L) .beginClass("UIPanel") @@ -156,6 +161,7 @@ namespace dl auto result = luabridge::push(L, g_ui); lua_setglobal(L, "g_ui"); +#endif } void lua_register_factory(lua_State* L) diff --git a/dl/system/dl_engine.cpp b/dl/system/dl_engine.cpp index 236e4ee9..229ac188 100644 --- a/dl/system/dl_engine.cpp +++ b/dl/system/dl_engine.cpp @@ -86,13 +86,13 @@ void Engine::Init() g_ui = new UI::Manager; g_gfx = new Graphics; g_scene = _param._useScene ? new UI::SceneManager : nullptr; + g_mod = new ModManager; #endif //g_lang = new Language; g_physics = _param._useFreetype ? new Physics : nullptr; g_script = new ScriptSystem; g_as = _param._useAngelScript ? new AngelScript : nullptr; g_lua = _param._useLua ? new LuaScript : nullptr; - g_mod = new ModManager; #ifndef DL_DISABLE_AUDIO g_audio = new Audio(_param._useAudio); #endif @@ -138,11 +138,11 @@ void Engine::Release() #endif delete g_action; delete g_net; - delete g_mod; delete g_lua; delete g_as; delete g_script; #ifndef DL_DISABLE_RENDER + delete g_mod; delete g_scene; delete g_gfx; delete g_ui; diff --git a/dl/tool/dl_tool_ctrl_2d.h b/dl/tool/dl_tool_ctrl_2d.h index 777159c2..1a42e0f1 100644 --- a/dl/tool/dl_tool_ctrl_2d.h +++ b/dl/tool/dl_tool_ctrl_2d.h @@ -11,6 +11,7 @@ */ #pragma once +#ifndef DL_DISABLE_RENDER #include namespace dl::Tool @@ -89,4 +90,5 @@ private: Cpt::Drag _drag; }; -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/dl/tool/dl_tool_manager.cpp b/dl/tool/dl_tool_manager.cpp index f97d7c81..11869d20 100644 --- a/dl/tool/dl_tool_manager.cpp +++ b/dl/tool/dl_tool_manager.cpp @@ -1,5 +1,6 @@ #include "dl_tool_manager.h" +#ifndef DL_DISABLE_RENDER namespace dl::Tool { @@ -105,4 +106,5 @@ namespace dl::Tool g_system->ScreenShot("screen_shot.png"); } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/dl/ui/dl_ui_menu.cpp b/dl/ui/dl_ui_menu.cpp index 9a085d0e..7915424f 100644 --- a/dl/ui/dl_ui_menu.cpp +++ b/dl/ui/dl_ui_menu.cpp @@ -1,5 +1,6 @@ #include "dl_ui_menu.h" +#ifndef DL_DISABLE_RENDER #include "dl_ui_manager.h" namespace dl::UI @@ -179,3 +180,4 @@ namespace dl::UI } } +#endif \ No newline at end of file