diff options
| -rw-r--r-- | llvm-rs-cc.cpp | 9 | ||||
| -rw-r--r-- | slang_rs_reflection_cpp.cpp | 12 |
2 files changed, 16 insertions, 5 deletions
diff --git a/llvm-rs-cc.cpp b/llvm-rs-cc.cpp index e2c9599..1736c0b 100644 --- a/llvm-rs-cc.cpp +++ b/llvm-rs-cc.cpp @@ -291,10 +291,11 @@ static void ParseArguments(llvm::SmallVectorImpl<const char*> &ArgVector, if (Args->hasArg(OPT_reflect_cpp)) { Opts.mBitcodeStorage = slang::BCST_CPP_CODE; - // mJavaReflectionPathBase isn't set for C++ reflected builds - // set it to mOutputDir so we can use the path sanely from - // RSReflectionBase later on - Opts.mJavaReflectionPathBase = Opts.mOutputDir; + // mJavaReflectionPathBase can be set for C++ reflected builds. + // Set it to the standard mOutputDir (via -o) by default. + if (Opts.mJavaReflectionPathBase.empty()) { + Opts.mJavaReflectionPathBase = Opts.mOutputDir; + } } Opts.mOutputDepDir = diff --git a/slang_rs_reflection_cpp.cpp b/slang_rs_reflection_cpp.cpp index f583148..adc05b7 100644 --- a/slang_rs_reflection_cpp.cpp +++ b/slang_rs_reflection_cpp.cpp @@ -122,10 +122,20 @@ bool RSReflectionCpp::reflect(const string &OutputPathBase, const string &InputFileName, const string &OutputBCFileName) { mInputFileName = InputFileName; - mOutputPath = OutputPathBase; + mOutputPath = OutputPathBase + OS_PATH_SEPARATOR_STR; mOutputBCFileName = OutputBCFileName; mClassName = string("ScriptC_") + stripRS(InputFileName); + std::string Path = + RSSlangReflectUtils::ComputePackagedPath(OutputPathBase.c_str(), ""); + + std::string ErrorMsg; + if (!SlangUtils::CreateDirectoryWithParents(Path, &ErrorMsg)) { + fprintf(stderr, "Error: Could not create path %s - %s\n", + Path.c_str(), ErrorMsg.c_str()); + return false; + } + makeHeader("android::RSC::ScriptC"); std::vector< std::string > header(mText); mText.clear(); |