diff --git a/projects/VC7.1/GenOutput/.gitignore b/projects/VC7.1/GenOutput/.gitignore new file mode 100644 index 00000000..0f3a6b1b --- /dev/null +++ b/projects/VC7.1/GenOutput/.gitignore @@ -0,0 +1,2 @@ +Debug +Release diff --git a/projects/VC7.1/GenOutput/GenOutput.vcproj b/projects/VC7.1/GenOutput/GenOutput.vcproj new file mode 100644 index 00000000..9d4621bc --- /dev/null +++ b/projects/VC7.1/GenOutput/GenOutput.vcproj @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/projects/VC7.1/Match/.gitignore b/projects/VC7.1/Match/.gitignore new file mode 100644 index 00000000..0f3a6b1b --- /dev/null +++ b/projects/VC7.1/Match/.gitignore @@ -0,0 +1,2 @@ +Debug +Release diff --git a/projects/VC7.1/Match/Match.vcproj b/projects/VC7.1/Match/Match.vcproj new file mode 100644 index 00000000..39401afb --- /dev/null +++ b/projects/VC7.1/Match/Match.vcproj @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/projects/VC7.1/clipper/.gitignore b/projects/VC7.1/clipper/.gitignore new file mode 100644 index 00000000..0f3a6b1b --- /dev/null +++ b/projects/VC7.1/clipper/.gitignore @@ -0,0 +1,2 @@ +Debug +Release diff --git a/projects/VC7.1/clipper/clipper.vcproj b/projects/VC7.1/clipper/clipper.vcproj new file mode 100644 index 00000000..048060e3 --- /dev/null +++ b/projects/VC7.1/clipper/clipper.vcproj @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/projects/VC7.1/fgfs_construct/.gitignore b/projects/VC7.1/fgfs_construct/.gitignore new file mode 100644 index 00000000..0f3a6b1b --- /dev/null +++ b/projects/VC7.1/fgfs_construct/.gitignore @@ -0,0 +1,2 @@ +Debug +Release diff --git a/projects/VC7.1/fgfs_construct/fgfs_construct.vcproj b/projects/VC7.1/fgfs_construct/fgfs_construct.vcproj new file mode 100644 index 00000000..5138f386 --- /dev/null +++ b/projects/VC7.1/fgfs_construct/fgfs_construct.vcproj @@ -0,0 +1,146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/projects/VC7.1/osgb36/.gitignore b/projects/VC7.1/osgb36/.gitignore new file mode 100644 index 00000000..0f3a6b1b --- /dev/null +++ b/projects/VC7.1/osgb36/.gitignore @@ -0,0 +1,2 @@ +Debug +Release diff --git a/projects/VC7.1/osgb36/osgb36.vcproj b/projects/VC7.1/osgb36/osgb36.vcproj new file mode 100644 index 00000000..7bd5521f --- /dev/null +++ b/projects/VC7.1/osgb36/osgb36.vcproj @@ -0,0 +1,136 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/projects/VC7.1/terragear.sln b/projects/VC7.1/terragear.sln index a7ddb193..246b6da5 100644 --- a/projects/VC7.1/terragear.sln +++ b/projects/VC7.1/terragear.sln @@ -164,6 +164,39 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genapts", "genapts\genapts. {22540CD3-D3CA-4C86-A773-80AEEE3ACDED} = {22540CD3-D3CA-4C86-A773-80AEEE3ACDED} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osgb36", "osgb36\osgb36.vcproj", "{A30DFFC2-97E5-48F6-B8E0-A85435328ABA}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clipper", "clipper\clipper.vcproj", "{78922FED-3B8B-4276-ADFF-9A19330F7CFE}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GenOutput", "GenOutput\GenOutput.vcproj", "{A192B19C-8839-4BF8-A517-963B4DBA740C}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Match", "Match\Match.vcproj", "{7572D7B9-9DCD-4B98-AB04-1E9BFC8BA099}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fgfs_construct", "fgfs_construct\fgfs_construct.vcproj", "{8AB3DC28-1CAC-4DC0-B8CD-EB066E3711F9}" + ProjectSection(ProjectDependencies) = postProject + {DC950200-4824-4EEC-8F81-1FEAC31C8206} = {DC950200-4824-4EEC-8F81-1FEAC31C8206} + {19722E03-D871-4719-A075-D763EE7E272D} = {19722E03-D871-4719-A075-D763EE7E272D} + {9AABEE2B-19BC-4479-ADBE-58CA0A8BBC93} = {9AABEE2B-19BC-4479-ADBE-58CA0A8BBC93} + {7405A25C-8A2B-44FA-9C9A-A028AF2AB61A} = {7405A25C-8A2B-44FA-9C9A-A028AF2AB61A} + {A192B19C-8839-4BF8-A517-963B4DBA740C} = {A192B19C-8839-4BF8-A517-963B4DBA740C} + {610D5DAE-45EC-446E-86F2-73FDD24449C9} = {610D5DAE-45EC-446E-86F2-73FDD24449C9} + {7572D7B9-9DCD-4B98-AB04-1E9BFC8BA099} = {7572D7B9-9DCD-4B98-AB04-1E9BFC8BA099} + {2871F3BA-ADCC-4440-8078-FC76C5983FCE} = {2871F3BA-ADCC-4440-8078-FC76C5983FCE} + {B1FB93BB-ED1D-40A1-9B35-FCC232F473FD} = {B1FB93BB-ED1D-40A1-9B35-FCC232F473FD} + {A30DFFC2-97E5-48F6-B8E0-A85435328ABA} = {A30DFFC2-97E5-48F6-B8E0-A85435328ABA} + {C581C8C9-1DD4-4684-9FAB-CF229AC20A4E} = {C581C8C9-1DD4-4684-9FAB-CF229AC20A4E} + {22540CD3-D3CA-4C86-A773-80AEEE3ACDED} = {22540CD3-D3CA-4C86-A773-80AEEE3ACDED} + {78922FED-3B8B-4276-ADFF-9A19330F7CFE} = {78922FED-3B8B-4276-ADFF-9A19330F7CFE} + EndProjectSection +EndProject Global GlobalSection(SolutionConfiguration) = preSolution Debug = Debug @@ -290,6 +323,26 @@ Global {B7FA9359-D05E-42DA-8E57-5A932D8EC603}.Debug.Build.0 = Debug|Win32 {B7FA9359-D05E-42DA-8E57-5A932D8EC603}.Release.ActiveCfg = Release|Win32 {B7FA9359-D05E-42DA-8E57-5A932D8EC603}.Release.Build.0 = Release|Win32 + {A30DFFC2-97E5-48F6-B8E0-A85435328ABA}.Debug.ActiveCfg = Debug|Win32 + {A30DFFC2-97E5-48F6-B8E0-A85435328ABA}.Debug.Build.0 = Debug|Win32 + {A30DFFC2-97E5-48F6-B8E0-A85435328ABA}.Release.ActiveCfg = Release|Win32 + {A30DFFC2-97E5-48F6-B8E0-A85435328ABA}.Release.Build.0 = Release|Win32 + {78922FED-3B8B-4276-ADFF-9A19330F7CFE}.Debug.ActiveCfg = Debug|Win32 + {78922FED-3B8B-4276-ADFF-9A19330F7CFE}.Debug.Build.0 = Debug|Win32 + {78922FED-3B8B-4276-ADFF-9A19330F7CFE}.Release.ActiveCfg = Release|Win32 + {78922FED-3B8B-4276-ADFF-9A19330F7CFE}.Release.Build.0 = Release|Win32 + {A192B19C-8839-4BF8-A517-963B4DBA740C}.Debug.ActiveCfg = Debug|Win32 + {A192B19C-8839-4BF8-A517-963B4DBA740C}.Debug.Build.0 = Debug|Win32 + {A192B19C-8839-4BF8-A517-963B4DBA740C}.Release.ActiveCfg = Release|Win32 + {A192B19C-8839-4BF8-A517-963B4DBA740C}.Release.Build.0 = Release|Win32 + {7572D7B9-9DCD-4B98-AB04-1E9BFC8BA099}.Debug.ActiveCfg = Debug|Win32 + {7572D7B9-9DCD-4B98-AB04-1E9BFC8BA099}.Debug.Build.0 = Debug|Win32 + {7572D7B9-9DCD-4B98-AB04-1E9BFC8BA099}.Release.ActiveCfg = Release|Win32 + {7572D7B9-9DCD-4B98-AB04-1E9BFC8BA099}.Release.Build.0 = Release|Win32 + {8AB3DC28-1CAC-4DC0-B8CD-EB066E3711F9}.Debug.ActiveCfg = Debug|Win32 + {8AB3DC28-1CAC-4DC0-B8CD-EB066E3711F9}.Debug.Build.0 = Debug|Win32 + {8AB3DC28-1CAC-4DC0-B8CD-EB066E3711F9}.Release.ActiveCfg = Release|Win32 + {8AB3DC28-1CAC-4DC0-B8CD-EB066E3711F9}.Release.Build.0 = Release|Win32 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EndGlobalSection diff --git a/src/BuildTiles/GenOutput/genobj.cxx b/src/BuildTiles/GenOutput/genobj.cxx index 73250126..1eb3c699 100644 --- a/src/BuildTiles/GenOutput/genobj.cxx +++ b/src/BuildTiles/GenOutput/genobj.cxx @@ -24,10 +24,6 @@ #include -#ifdef _MSC_VER -# include -#endif - #include #include #include diff --git a/src/BuildTiles/Match/match.cxx b/src/BuildTiles/Match/match.cxx index f3220085..df8d42f7 100644 --- a/src/BuildTiles/Match/match.cxx +++ b/src/BuildTiles/Match/match.cxx @@ -29,10 +29,7 @@ #include #include #include - -#ifdef _MSC_VER -# include -#endif +#include #include "match.hxx" @@ -465,12 +462,9 @@ void TGMatch::write_shared( TGConstruct& c ) { string dir = base + "/Shared/" + b.gen_base_path(); string file = dir + "/" + b.gen_index_str(); -#ifdef _MSC_VER - fg_mkdir( dir.c_str() ); -#else - string command = "mkdir -p " + dir; - system(command.c_str()); -#endif + SGPath sgp( dir ); + sgp.append( "dummy" ); + sgp.create_dir( 0755 ); cout << "shared data will be written to " << file << endl; @@ -615,7 +609,7 @@ void TGMatch::write_shared( TGConstruct& c ) { fclose( fp ); - command = "gzip --force --best " + file; + string command = "gzip --force --best " + file; system(command.c_str()); }