From b72353ec3fe529237828cacbe710233d31eb4837 Mon Sep 17 00:00:00 2001 From: Yong He Date: Thu, 24 Sep 2020 14:30:12 -0700 Subject: Enable default cpp prelude. (#1560) * Enable default cpp prelude. * Print the "#include" line as a normal source if the file does not exist. * Bug fix * Fix. * Fix c++ prelude header. * Remove unnecessary fopen call. --- source/slang/slang.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'source/slang/slang.cpp') diff --git a/source/slang/slang.cpp b/source/slang/slang.cpp index 1086338f4..572c9c3a3 100644 --- a/source/slang/slang.cpp +++ b/source/slang/slang.cpp @@ -41,8 +41,9 @@ #undef NOMINMAX #endif -extern char const* slang_cuda_prelude; -extern char const* slang_hlsl_prelude; +extern Slang::String get_slang_cuda_prelude(); +extern Slang::String get_slang_cpp_prelude(); +extern Slang::String get_slang_hlsl_prelude(); namespace Slang { @@ -189,8 +190,9 @@ void Session::init() } // Set up default prelude code for target languages that need a prelude - m_languagePreludes[Index(SourceLanguage::CUDA)] = slang_cuda_prelude; - m_languagePreludes[Index(SourceLanguage::HLSL)] = slang_hlsl_prelude; + m_languagePreludes[Index(SourceLanguage::CUDA)] = get_slang_cuda_prelude(); + m_languagePreludes[Index(SourceLanguage::CPP)] = get_slang_cpp_prelude(); + m_languagePreludes[Index(SourceLanguage::HLSL)] = get_slang_hlsl_prelude(); } ISlangUnknown* Session::getInterface(const Guid& guid) -- cgit v1.2.3