diff --git a/.cache/clangd/index/Main.cpp.8DF821074DA7C9F4.idx b/.cache/clangd/index/Main.cpp.8DF821074DA7C9F4.idx deleted file mode 100644 index ce9edb7..0000000 Binary files a/.cache/clangd/index/Main.cpp.8DF821074DA7C9F4.idx and /dev/null differ diff --git a/.cache/clangd/index/dummy.cpp.B9E4701905B53878.idx b/.cache/clangd/index/dummy.cpp.B9E4701905B53878.idx deleted file mode 100644 index a81445f..0000000 Binary files a/.cache/clangd/index/dummy.cpp.B9E4701905B53878.idx and /dev/null differ diff --git a/Src/IACore/imp/inl/IACore/platform/environment.inl b/Src/IACore/imp/inl/IACore/platform/environment.inl index 7ff6450..c149eb2 100644 --- a/Src/IACore/imp/inl/IACore/platform/environment.inl +++ b/Src/IACore/imp/inl/IACore/platform/environment.inl @@ -18,8 +18,8 @@ #include "platform.inl" -#if (defined(IA_PLATFORM_WIN64) && (IA_PLATFORM_WIN64 > 0)) - #include "win/environment.inl" -#else - #error "IACore Unsupported Platform" -#endif \ No newline at end of file +#if (defined(IA_CORE_PLATFORM_FEATUES) && (IA_CORE_PLATFORM_FEATUES > 0)) + #if (defined(IA_PLATFORM_WIN64) && (IA_PLATFORM_WIN64 > 0)) + #include "win/environment.inl" + #endif +#endif diff --git a/Src/IACore/imp/inl/IACore/platform/platform.inl b/Src/IACore/imp/inl/IACore/platform/platform.inl index bf08e4a..3e7024e 100644 --- a/Src/IACore/imp/inl/IACore/platform/platform.inl +++ b/Src/IACore/imp/inl/IACore/platform/platform.inl @@ -132,4 +132,11 @@ namespace ia { std::this_thread::sleep_for(std::chrono::milliseconds(milliseconds)); } -} \ No newline at end of file +} + +#if (defined(IA_PLATFORM_WIN64) && (IA_PLATFORM_WIN64 > 0)) + #define IA_CORE_PLATFORM_FEATUES 1 +#else + #define IA_CORE_PLATFORM_FEATUES 0 + #warning "IACore Unsupported Platform: Platform specific features will be disabled" +#endif \ No newline at end of file diff --git a/Src/IACore/imp/inl/IACore/platform/process.inl b/Src/IACore/imp/inl/IACore/platform/process.inl index 886500e..e40fd95 100644 --- a/Src/IACore/imp/inl/IACore/platform/process.inl +++ b/Src/IACore/imp/inl/IACore/platform/process.inl @@ -18,8 +18,8 @@ #include "platform.inl" -#if (defined(IA_PLATFORM_WIN64) && (IA_PLATFORM_WIN64 > 0)) - #include "win/process.inl" -#else - #error "IACore Unsupported Platform" +#if (defined(IA_CORE_PLATFORM_FEATUES) && (IA_CORE_PLATFORM_FEATUES > 0)) + #if (defined(IA_PLATFORM_WIN64) && (IA_PLATFORM_WIN64 > 0)) + #include "win/process.inl" + #endif #endif \ No newline at end of file diff --git a/Src/IACore/inc/hpp/IACore/DynamicLib.hpp b/Src/IACore/inc/hpp/IACore/DynamicLib.hpp index 22fbba4..b8c8fbe 100644 --- a/Src/IACore/inc/hpp/IACore/DynamicLib.hpp +++ b/Src/IACore/inc/hpp/IACore/DynamicLib.hpp @@ -98,7 +98,7 @@ namespace ia PVOID DynamicLib::GetSymbol(IN CONST String &name) { dlerror(); - const auto symbol = dlsym(handle, name.c_str()); + const auto symbol = dlsym(m_moduleHandle, name.c_str()); const char *dlsym_error = dlerror(); if (dlsym_error) THROW_UNKNOWN("DynamicLib: Failed to find the symbol \"", name, "\" with error: ", dlerror()); diff --git a/Src/IACoreTest/imp/cpp/Main.cpp b/Src/IACoreTest/imp/cpp/Main.cpp index 7aad1ae..ae4f4ef 100644 --- a/Src/IACoreTest/imp/cpp/Main.cpp +++ b/Src/IACoreTest/imp/cpp/Main.cpp @@ -30,9 +30,9 @@ int main(int argc, char *argv[]) SubProcess p("clang++"); p.Launch("a.cpp", [](IN CONST String &line) { printf("[\n%s\n]\n", line.c_str()); });*/ - printf("[%s]\n", Environment::GetVar("IAEDK_ROOT").c_str()); - Environment::SetVar("IAEDK_ROOT", "C:\\IAEDK"); - printf("[%s]\n", Environment::GetVar("IAEDK_ROOT").c_str()); + //printf("[%s]\n", Environment::GetVar("IAEDK_ROOT").c_str()); + //Environment::SetVar("IAEDK_ROOT", "C:\\IAEDK"); + //printf("[%s]\n", Environment::GetVar("IAEDK_ROOT").c_str()); return 0; } \ No newline at end of file