fly/terragear
1
0
Fork 0
Code Activity

tgconstruct: Windows 'copy' is intolerant of forward slashes.

Browse source 
replaced with native path format.
This commit is contained in:
Scott Giese 2018-06-24 09:59:27 -05:00
parent 51f9c54076
commit da1ade82cb
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/BuildTiles/Main/tgconstruct_output.cxx
View file

@ -42,7 +42,12 @@ void TGConstruct::AddCustomObjects( void ) {
// Create/open the output .stg file for writing // Create/open the output .stg file for writing
SGPath dest_d(output_base.c_str()); SGPath dest_d(output_base.c_str());
dest_d.append(bucket.gen_base_path().c_str()); dest_d.append(bucket.gen_base_path().c_str());
#ifdef _MSC_VER
string dest_dir = dest_d.str_native();
#else
string dest_dir = dest_d.utf8Str(); string dest_dir = dest_d.utf8Str();
#endif
SGPath dest_i(dest_d); SGPath dest_i(dest_d);
dest_i.append(bucket.gen_index_str()); dest_i.append(bucket.gen_index_str());
dest_i.concat(".stg"); dest_i.concat(".stg");
@ -92,10 +97,11 @@ void TGConstruct::AddCustomObjects( void ) {
SGPath srcbase(base); SGPath srcbase(base);
srcbase.append(name); srcbase.append(name);
srcbase.concat(".gz"); srcbase.concat(".gz");
string basecom = srcbase.utf8Str();
#ifdef _MSC_VER #ifdef _MSC_VER
string command = "copy " + basecom + " " + dest_dir; string basecom = srcbase.str_native();
string command = "copy /Y " + basecom + " " + dest_dir;
#else #else
string basecom = srcbase.utf8Str();
string command = "cp " + basecom + " " + dest_dir; string command = "cp " + basecom + " " + dest_dir;
#endif #endif
SG_LOG( SG_GENERAL, SG_DEBUG, "running " << command ); SG_LOG( SG_GENERAL, SG_DEBUG, "running " << command );