csp-commits

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Tools/Terrain/tile
In directory sc8-pr-cvs1:/tmp/cvs-serv16172

Modified Files:
	Makefile tile.cpp 
Log Message:


Index: Makefile
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Tools/Terrain/tile/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile	26 Jul 2003 21:32:21 -0000	1.2
--- Makefile	26 Jul 2003 21:35:01 -0000	1.3
***************
*** 1,5 ****
! all: csptiler
  
! csptiler: tile.cpp
! 	g++ -O2 -g tile.cpp -o tile -I/usr/include/python2.2 -lSimData -lz
  
--- 1,5 ----
! all: csptile
  
! csptile: tile.cpp
! 	g++ -O2 -g $^ -o $@ -I/usr/include/python2.2 -lSimData -lz
  

Index: tile.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Tools/Terrain/tile/tile.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tile.cpp	22 Jul 2003 21:17:41 -0000	1.2
--- tile.cpp	26 Jul 2003 21:35:01 -0000	1.3
***************
*** 1346,1356 ****
  };
  
! void usage() {
! 	std::cerr << "Usage: tile [--help] [--datpath=path] [--quiet] [ini]\n";
  }
  
! void help() {
  	std::cerr << "\n";
! 	std::cerr << "TerrainTiler (pre-version)\n";
  	std::cerr << "Copyright 2003 The Combat Simulator Project <http://csp.sourceforge.net>\n";
  	std::cerr << "\n";
--- 1346,1356 ----
  };
  
! void usage(const char* arg0) {
! 	std::cerr << "Usage: " << arg0 << " [--help] [--datpath=path] [--quiet] [ini]\n";
  }
  
! void help(const char *arg0) {
  	std::cerr << "\n";
! 	std::cerr << "CSP TerrainTiler (pre-version)\n";
  	std::cerr << "Copyright 2003 The Combat Simulator Project <http://csp.sourceforge.net>\n";
  	std::cerr << "\n";
***************
*** 1361,1365 ****
  	std::cerr << "secant gnomonic projection.\n";
  	std::cerr << "\n";
! 	usage();
  	std::cerr << "\n";
  	std::cerr << "Options:\n";
--- 1361,1365 ----
  	std::cerr << "secant gnomonic projection.\n";
  	std::cerr << "\n";
! 	usage(arg0);
  	std::cerr << "\n";
  	std::cerr << "Options:\n";
***************
*** 1398,1402 ****
  		if (arg[0] == '-') {
  			if (!strcmp(arg, "--help")) {
! 				help(); 
  				::exit(0);
  			} else
--- 1398,1402 ----
  		if (arg[0] == '-') {
  			if (!strcmp(arg, "--help")) {
! 				help(argv[0]); 
  				::exit(0);
  			} else
***************
*** 1409,1413 ****
  				continue;
  			}
! 			usage();
  			::exit(1);
  		} else {
--- 1409,1413 ----
  				continue;
  			}
! 			usage(argv[0]);
  			::exit(1);
  		} else {
***************
*** 1416,1420 ****
  	}
  	if (ini == 0) {
! 		usage();
  		::exit(0);
  	}
--- 1416,1420 ----
  	}
  	if (ini == 0) {
! 		usage(argv[0]);
  		::exit(0);
  	}