X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkConfigurationFile.cxx;h=2b246b578ffeb5beb873a26821624aed681da0d2;hb=dfcd0b84f01eb96e43c2180a35d626cc123a7231;hp=e91dcfdfc4ef94f15becf5452c0b593db689cdc8;hpb=d3e9248abd5502eeca0c84974cccf885d4744d8c;p=bbtk.git diff --git a/kernel/src/bbtkConfigurationFile.cxx b/kernel/src/bbtkConfigurationFile.cxx index e91dcfd..2b246b5 100644 --- a/kernel/src/bbtkConfigurationFile.cxx +++ b/kernel/src/bbtkConfigurationFile.cxx @@ -378,12 +378,13 @@ namespace bbtk } sprintf(copyFile,"copy %s\\bbtk_config.xml.tmp \"%s\"\\bbtk_config.xml ",bbtk_path,rootDirectory ); - + +// EED 2021-12-12 WCHAR rootDirectory2[200]; MultiByteToWideChar( 0,0, rootDirectory, 200, rootDirectory2, 6); LPCWSTR rootDirectory3 = rootDirectory2; int attribs = GetFileAttributes (rootDirectory3); -// int attribs = GetFileAttributes (rootDirectory3); +// int attribs = GetFileAttributes (rootDirectory); bbtkMessage("config",1,std::hex << attribs << " " << FILE_ATTRIBUTE_DIRECTORY << std::endl); @@ -391,11 +392,12 @@ namespace bbtk { if ((attribs & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY ) /// \TODO : check ! { +// EED 2021-12-12 WCHAR configPath2[200]; MultiByteToWideChar( 0,0, configPath, 200, configPath2, 6); LPCWSTR configPath3 = configPath2; if ( GetFileAttributes( configPath3 ) == 0xFFFFFFFF) - //if ( GetFileAttributes( configPath ) == 0xFFFFFFFF) +// if ( GetFileAttributes( configPath ) == 0xFFFFFFFF) { system(copyFile); } @@ -621,7 +623,11 @@ namespace bbtk Utilities::replace(pack_path,INVALID_FILE_SEPARATOR,VALID_FILE_SEPARATOR); mPackage_paths.push_back(pack_path); - pack_path = path+"/../../lib64/creatools" ; + #ifdef MACOSX + pack_path = path+"/../../lib/creatools" ; + #else + pack_path = path+"/../../lib64/creatools" ; + #endif PACKPATH = BB.addChild((XMLCSTR)"package_path"); PACKPATH.addText((XMLCSTR)pack_path.c_str()); Utilities::replace(pack_path,INVALID_FILE_SEPARATOR,VALID_FILE_SEPARATOR);