mirror of
https://git.code.sf.net/p/ngspice/ngspice
synced 2026-08-22 05:47:42 +02:00
Nghelp now uses conf.c
This commit is contained in:
+1
-1
@@ -140,7 +140,7 @@ ngnutmeg_LDADD = \
|
|||||||
|
|
||||||
## help:
|
## help:
|
||||||
|
|
||||||
nghelp_SOURCES = nghelp.c
|
nghelp_SOURCES = conf.c nghelp.c
|
||||||
|
|
||||||
if WINDOWS
|
if WINDOWS
|
||||||
nghelp_SOURCES += winmain.c
|
nghelp_SOURCES += winmain.c
|
||||||
|
|||||||
+7
-14
@@ -18,15 +18,8 @@ Author: 1986 Wayne A. Christopher, U. C. Berkeley CAD Group
|
|||||||
Widget toplevel;
|
Widget toplevel;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
FILE *cp_in, *cp_out, *cp_err;
|
|
||||||
char *Spice_Exec_Dir = NGSPICEBINDIR;
|
|
||||||
char *Spice_Lib_Dir = NGSPICEDATADIR;
|
|
||||||
char *Def_Editor = "vi";
|
|
||||||
int AsciiRawFile = 0;
|
|
||||||
|
|
||||||
char *Bug_Addr = "";
|
FILE *cp_in, *cp_out, *cp_err;
|
||||||
char *Spice_Host = "";
|
|
||||||
char *Spiced_Log = "";
|
|
||||||
|
|
||||||
|
|
||||||
/* dummy declaration so CP.a doesn't pull in lexical.o and other objects */
|
/* dummy declaration so CP.a doesn't pull in lexical.o and other objects */
|
||||||
@@ -56,7 +49,7 @@ main(int ac, char **av)
|
|||||||
char *argv[2];
|
char *argv[2];
|
||||||
int argc = 2;
|
int argc = 2;
|
||||||
char buf[512];
|
char buf[512];
|
||||||
#endif
|
#endif /* X_DISPLAY_MISSING */
|
||||||
|
|
||||||
ivars( );
|
ivars( );
|
||||||
|
|
||||||
@@ -77,10 +70,10 @@ main(int ac, char **av)
|
|||||||
argv[1] = displayname;
|
argv[1] = displayname;
|
||||||
/* initialize X toolkit */
|
/* initialize X toolkit */
|
||||||
toplevel = XtInitialize("nutmeg", "Nutmeg", NULL, 0, &argc, argv);
|
toplevel = XtInitialize("nutmeg", "Nutmeg", NULL, 0, &argc, argv);
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
out:
|
out:
|
||||||
|
#endif /* X_DISPLAY_MISSING */
|
||||||
|
|
||||||
if (ac > 1)
|
if (ac > 1)
|
||||||
wl = wl_build(av + 1);
|
wl = wl_build(av + 1);
|
||||||
hlp_main(Help_Path, wl);
|
hlp_main(Help_Path, wl);
|
||||||
@@ -90,7 +83,7 @@ out:
|
|||||||
printf("Hit control-C when done.\n"); /* sigh */
|
printf("Hit control-C when done.\n"); /* sigh */
|
||||||
XtMainLoop();
|
XtMainLoop();
|
||||||
}
|
}
|
||||||
#endif
|
#endif /* X_DISPLAY_MISSING */
|
||||||
|
|
||||||
exit(EXIT_NORMAL);
|
exit(EXIT_NORMAL);
|
||||||
}
|
}
|
||||||
@@ -102,7 +95,7 @@ fatal(char *s)
|
|||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* There is a conflict witj another cp_printword in cp/quote.c
|
/* There is a conflict with another cp_printword in cp/quote.c
|
||||||
static void
|
static void
|
||||||
cp_printword(s)
|
cp_printword(s)
|
||||||
char *s;
|
char *s;
|
||||||
|
|||||||
Reference in New Issue
Block a user