TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 01:44:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

replace gnu_getopt with new Panda-licensed implementation

Browse Source
This commit is contained in:
David Rose 2011-08-03 23:48:32 +00:00
parent f195d4d462
commit 042488bcb3
2 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
direct/src/dcparse/dcparse.cxx
View File

@ -18,12 +18,7 @@
#include "dcTypedef.h" #include "dcTypedef.h"
#include "memoryUsage.h" #include "memoryUsage.h"
#include "indent.h" #include "indent.h"
#include "panda_getopt.h"
#ifndef HAVE_GETOPT
#include "gnu_getopt.h"
#else
#include <getopt.h>
#endif
void void
usage() { usage() {

14
direct/src/plugin_standalone/panda3d.cxx
View File

@ -17,11 +17,9 @@
#include "p3d_plugin_config.h" #include "p3d_plugin_config.h"
#include "find_root_dir.h" #include "find_root_dir.h"
#include "pandaSystem.h" #include "pandaSystem.h"
// We can include this header file to get the DTOOL_PLATFORM
// definition, even though we don't link with dtool.
#include "dtool_platform.h" #include "dtool_platform.h"
#include "pandaVersion.h" #include "pandaVersion.h"
#include "panda_getopt.h"
#include <ctype.h> #include <ctype.h>
#include <sstream> #include <sstream>
@ -32,14 +30,6 @@
#include <signal.h> #include <signal.h>
#endif #endif
#ifndef HAVE_GETOPT
#include "gnu_getopt.h"
#else
#ifdef PHAVE_GETOPT_H
#include <getopt.h>
#endif
#endif
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Function: Panda3D::Constructor // Function: Panda3D::Constructor
// Access: Public // Access: Public
@ -64,7 +54,7 @@ run_command_line(int argc, char *argv[]) {
extern char *optarg; extern char *optarg;
extern int optind; extern int optind;
// We prefix a "+" sign to tell gnu getopt not to parse options // We prefix a "+" sign to tell getopt not to parse options
// following the first not-option parameter. (These will be passed // following the first not-option parameter. (These will be passed
// into the sub-process.) // into the sub-process.)
const char *optstr = "+mu:M:Sp:nfw:t:s:o:l:iVUPh"; const char *optstr = "+mu:M:Sp:nfw:t:s:o:l:iVUPh";