Skip to content

Commit

Permalink
Fix (cndtool): Fix output path
Browse files Browse the repository at this point in the history
  • Loading branch information
smlu committed Mar 1, 2020
1 parent 5bd897b commit 5621e1d
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions programs/cndtool/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@ int32_t ExtractAnimations(const InputStream& istream, const std::string& outDir,
std::cout << "\nFound: " << mapAnimations.size() << std::endl;
}

keyDir = outDir + "/" + "key";
keyDir = outDir + (outDir.empty() ? "" : "/" ) + "key";
MakePath(keyDir);
}

Expand Down Expand Up @@ -594,12 +594,12 @@ int32_t ExtractMaterials(const InputStream& istream, const std::string& outDir,
std:: cout << " Found: " << materials.size() << std::endl;
}

matDir = outDir + "/" + "mat";
matDir = outDir + (outDir.empty() ? "" : "/" ) + "mat";
MakePath(matDir);

if(convertMaterials)
{
bmpDir = outDir + "/" + "bmp";
bmpDir = outDir + (outDir.empty() ? "" : "/" ) + "bmp";
MakePath(bmpDir);
}
}
Expand Down Expand Up @@ -681,12 +681,12 @@ int32_t ExtractSounds(const InputStream& istream, const std::string& outDir, boo
std::cout << "\nFound: " << sounds.size() << std::endl;
}

outPath = outDir+ (outDir.empty() ? "" : "/" ) + "sound";
MakeDir(outPath);
outPath = outDir + (outDir.empty() ? "" : "/" ) + "sound";
MakePath(outPath);

if(convetToWav)
{
wavDir = outDir + "/" + "wav";
wavDir = outDir + (outDir.empty() ? "" : "/" ) + "wav";
MakePath(wavDir);
}
}
Expand Down

0 comments on commit 5621e1d

Please sign in to comment.