From 1aae2e3ea7dac53a8b66b5f911ed92a202c1dc0b Mon Sep 17 00:00:00 2001 From: Antoine Pilote Date: Wed, 27 Sep 2023 23:37:31 -0400 Subject: [PATCH] Conditional branch for linux --- Nuake/Engine.cpp | 1 + Nuake/src/Audio/AudioManager.cpp | 7 ++++++- Nuake/src/Rendering/Renderer2D.cpp | 3 +++ Nuake/src/Scripting/ScriptingEngine.cpp | 1 - Nuake/src/Vendors/katana-parser/selector.c | 18 +++++++++--------- 5 files changed, 19 insertions(+), 11 deletions(-) diff --git a/Nuake/Engine.cpp b/Nuake/Engine.cpp index a143ecc9..05c4b8f3 100644 --- a/Nuake/Engine.cpp +++ b/Nuake/Engine.cpp @@ -34,6 +34,7 @@ namespace Nuake // Creates the window s_CurrentWindow = Window::Get(); + Logger::Log("Input initializing"); Input::Init(); Renderer2D::Init(); Logger::Log("Engine initialized"); diff --git a/Nuake/src/Audio/AudioManager.cpp b/Nuake/src/Audio/AudioManager.cpp index 8d9af0ca..cca3030b 100644 --- a/Nuake/src/Audio/AudioManager.cpp +++ b/Nuake/src/Audio/AudioManager.cpp @@ -28,8 +28,13 @@ namespace Nuake { m_Soloud = CreateRef(); // TODO: Sample rate, back end, buffer size, flags. - m_Soloud->init(SoLoud::Soloud::CLIP_ROUNDOFF,SoLoud::Soloud::ALSA); +#ifdef NK_WIN + m_Soloud->init(); +#endif +#ifdef NK_LINUX + m_Soloud->init(SoLoud::Soloud::CLIP_ROUNDOFF, SoLoud::Soloud::ALSA) +#endif m_AudioThread = std::thread(&AudioManager::AudioThreadLoop, this); Logger::Log("Audio manager initialized", "audio", VERBOSE); diff --git a/Nuake/src/Rendering/Renderer2D.cpp b/Nuake/src/Rendering/Renderer2D.cpp index 85ca600a..c0faa25f 100644 --- a/Nuake/src/Rendering/Renderer2D.cpp +++ b/Nuake/src/Rendering/Renderer2D.cpp @@ -17,6 +17,7 @@ namespace Nuake void Renderer2D::Init() { + Logger::Log("Renderer 2D initiaizing", "render2d"); UIShader = ShaderManager::GetShader("Resources/Shaders/ui.shader"); TextShader = ShaderManager::GetShader("Resources/Shaders/sdf_text.shader"); @@ -30,6 +31,8 @@ namespace Nuake 1.0f, 1.0f, 1.0f, 1.0f, 1.0f }; + + Logger::Log("Renderer 2D create VAOS", "render2d"); // setup plane VAO glGenVertexArrays(1, &Renderer2D::VAO); glGenBuffers(1, &Renderer2D::VBO); diff --git a/Nuake/src/Scripting/ScriptingEngine.cpp b/Nuake/src/Scripting/ScriptingEngine.cpp index 326d3e05..70a1557b 100644 --- a/Nuake/src/Scripting/ScriptingEngine.cpp +++ b/Nuake/src/Scripting/ScriptingEngine.cpp @@ -79,7 +79,6 @@ namespace Nuake { {"ScriptableEntity", GET_STATIC_RESOURCE_SCRIPT_SRC(StaticResources::Resources_Scripts_ScriptableEntity_wren)}, }; - const std::string NuakeModulePrefix = "Nuake:"; WrenLoadModuleResult myLoadModule(WrenVM* vm, const char* name) { diff --git a/Nuake/src/Vendors/katana-parser/selector.c b/Nuake/src/Vendors/katana-parser/selector.c index d3e7e480..0cc77c2f 100644 --- a/Nuake/src/Vendors/katana-parser/selector.c +++ b/Nuake/src/Vendors/katana-parser/selector.c @@ -24,15 +24,15 @@ #include #include #include -// strcasecmp(const char* a, const char* b) -// { -// #ifdef NK_WIN -// return _stricmp(a, b); -// #endif -// #ifdef NK_LINUX -// return strcasecmp(a, b); -// #endif -// } + + +#ifdef NK_WIN +strcasecmp(const char* a, const char* b) +{ + return _stricmp(a, b); +} +#endif + #undef assert #define assert(x)