fly/terragear
1
0
Fork 0
Code Activity

bug #792: second try to fix the windows copy issue

Browse source
This commit is contained in:
Christian Schmitt 2012-07-09 11:03:16 +02:00
parent 2a7c1bc7fe
commit 7d919e2329
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/BuildTiles/Main/main.cxx
View file

@ -862,11 +862,11 @@ static void do_custom_objects( const TGConstruct& c ) {
// Create/open the output .stg file for writing // Create/open the output .stg file for writing
SGPath dest_d(c.get_output_base().c_str()); SGPath dest_d(c.get_output_base().c_str());
dest_d.append(b.gen_base_path().c_str()); dest_d.append(b.gen_base_path().c_str());
string dest_dir = dest_d.str(); string dest_dir = dest_d.str_native();
SGPath dest_i(dest_d); SGPath dest_i(dest_d);
dest_i.append(b.gen_index_str()); dest_i.append(b.gen_index_str());
dest_i.concat(".stg"); dest_i.concat(".stg");
string dest_ind = dest_i.str(); string dest_ind = dest_i.str_native();
FILE *fp; FILE *fp;
if ( (fp = fopen( dest_ind.c_str(), "w" )) == NULL ) { if ( (fp = fopen( dest_ind.c_str(), "w" )) == NULL ) {
@ -885,11 +885,10 @@ static void do_custom_objects( const TGConstruct& c ) {
SGPath base(c.get_work_base().c_str()); SGPath base(c.get_work_base().c_str());
base.append(load_dirs[i]); base.append(load_dirs[i]);
base.append( b.gen_base_path() ); base.append( b.gen_base_path() );
string base_dir = base.str();
SGPath index(base); SGPath index(base);
index.append( b.gen_index_str() ); index.append( b.gen_index_str() );
index.concat(".ind"); index.concat(".ind");
string index_file = index.str(); string index_file = index.str_native();
//cout << "collecting custom objects from " << index_file << endl; //cout << "collecting custom objects from " << index_file << endl;
sg_gzifstream in( index_file ); sg_gzifstream in( index_file );
@ -911,7 +910,7 @@ static void do_custom_objects( const TGConstruct& c ) {
if ( strcmp( token, "OBJECT" ) == 0 ) { if ( strcmp( token, "OBJECT" ) == 0 ) {
base.append(name); base.append(name);
base.concat(".gz"); base.concat(".gz");
string basecom = base.str(); string basecom = base.str_native();
#ifdef _MSC_VER #ifdef _MSC_VER
string command = "copy " + basecom + " " + dest_dir; string command = "copy " + basecom + " " + dest_dir;
#else #else