epilectrik
/
pyNgSpice
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

ivars(char*), Windows 64, 32 bit

h_vogt 15 years ago
parent
2a2497ec62
commit
e86527635b
8 changed files with 8905 additions and 8716 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      ChangeLog
  2. 4
      src/main.c
  3. 27
      src/misc/ivars.c
  4. 4
      src/nghelp.c
  5. 2
      src/tclspice.c
  6. 2
      src/unsupported/spiced.c
  7. 23
      visualc/vngspice.sln
  8. 17553
      visualc/vngspice.vcproj

6
ChangeLog
View File

@ -1,3 +1,9 @@
2011-08-03 Holger Vogt
* ivars.c update for LINUX
* tclspice.c, nghelp.c, spiced.c: ivars(NULL)
* main.c: reference to memory leak checker for Windows removed
* visualc/vngspice.sln, visualc\vngspice.vcproj: 32 and 64 bit
2011-07-30 Dietmar Warning
* adms/ekv/admsva/ekv.va: semicolon after macro expl was wrong
* adms/mextram/admsva: update va code from version 504.7 to 504.9.1

4
src/main.c
View File

@ -838,10 +838,6 @@ main(int argc, char **argv)
circuit_file = stdin;
#ifdef MALLOCTRACE
mallocTraceInit("malloc.out");
#endif
#if defined(HAVE_ISATTY) && !defined(HAS_WINDOWS)
istty = (bool) isatty(fileno(stdin));
#endif

27
src/misc/ivars.c
View File

@ -42,9 +42,9 @@ mkvar(char **p, char *path_prefix, char *var_dir, char *env_var)
#ifdef HAVE_ASPRINTF
if (buffer)
asprintf(p, "%s", buffer);
asprintf(p, "%s", buffer);
else
asprintf(p, "%s%s%s", path_prefix, DIR_PATHSEP, var_dir);
asprintf(p, "%s%s%s", path_prefix, DIR_PATHSEP, var_dir);
#else /* ~ HAVE_ASPRINTF */
if (buffer){
*p = TMALLOC(char, strlen(buffer) + 1);
@ -62,7 +62,7 @@ mkvar(char **p, char *path_prefix, char *var_dir, char *env_var)
void
ivars(char *argv0)
{
char *temp=NULL, *ngpath;
char *temp=NULL;
/* $dprefix has been set to /usr/local or C:/Spice (Windows) in configure.ac,
NGSPICEBINDIR has been set to $dprefix/bin in configure.ac,
Spice_Exec_Dir has been set to NGSPICEBINDIR in conf.c,
@ -82,11 +82,19 @@ ivars(char *argv0)
mkvar(&Spice_Path, Spice_Exec_Dir, "ngspice", "SPICE_PATH");
/* may be used to store input files (*.lib, *.include, ...) */
/* get directory where ngspice resides */
ngpath = ngdirname(argv0);
/* set path either to <ngspice-directory>/input or, if set, to
environment variable NGSPICE_INPUT_DIR */
mkvar(&Inp_Path, ngpath, "input", "NGSPICE_INPUT_DIR");
#if defined (HAS_WINDOWS) || defined (__MINGW32__) || defined (_MSC_VER)
{
char *ngpath = ngdirname(argv0);
/* set path either to <ngspice-bin-directory>/input or,
if set, to environment variable NGSPICE_INPUT_DIR */
mkvar(&Inp_Path, ngpath, "input", "NGSPICE_INPUT_DIR");
}
#else
NG_IGNORE(argv0);
/* set path either to environment variable NGSPICE_INPUT_DIR
(if given) or to NULL */
env_overr(&Inp_Path, "NGSPICE_INPUT_DIR");
#endif
env_overr(&Spice_Host, "SPICE_HOST"); /* aspice */
env_overr(&Bug_Addr, "SPICE_BUGADDR");
env_overr(&Def_Editor, "SPICE_EDITOR");
@ -108,5 +116,6 @@ cleanvars(void)
tfree(Help_Path);
tfree(Lib_Path);
tfree(Spice_Path);
tfree(Inp_Path);
if (Inp_Path) /* may be NULL in LINUX */
tfree(Inp_Path);
}

4
src/nghelp.c
View File

@ -27,7 +27,7 @@ bool cp_interactive = FALSE;
char *hlp_filelist[] = { "ngspice", 0 };
extern void ivars();
extern void ivars(char*);
#ifdef HAS_WINDOWS
FILE *flogp; /* hvogt 15.12.2001 */
@ -50,7 +50,7 @@ main(int ac, char **av)
char buf[512];
#endif /* X_DISPLAY_MISSING */
ivars( );
ivars(NULL);
cp_in = stdin;
cp_out = stdout;

2
src/tclspice.c
View File

@ -2260,7 +2260,7 @@ int Spice_Init(Tcl_Interp *interp) {
sighandler old_sigint;
ft_rawfile = NULL;
ivars( );
ivars(NULL);
cp_in = stdin;
cp_out = stdout;

2
src/unsupported/spiced.c
View File

@ -72,7 +72,7 @@ main(ac, av)
/* Process arguments. */
ivars( );
ivars(NULL);
av++;
while (*av) {

23
visualc/vngspice.sln
View File

@ -6,26 +6,25 @@ Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
console_debug|Win32 = console_debug|Win32
console_debug|x64 = console_debug|x64
console_release_omp|Win32 = console_release_omp|Win32
console_release_omp|x64 = console_release_omp|x64
console_release|Win32 = console_release|Win32
console_release|x64 = console_release|x64
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Debug64|Win32 = Debug64|Win32
Debug64|x64 = Debug64|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
Release64|Win32 = Release64|Win32
Release64|x64 = Release64|x64
ReleaseOMP|Win32 = ReleaseOMP|Win32
ReleaseOMP|x64 = ReleaseOMP|x64
ReleaseOmp64|Win32 = ReleaseOmp64|Win32
ReleaseOmp64|x64 = ReleaseOmp64|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.console_debug|Win32.ActiveCfg = console_debug|Win32
{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.console_debug|Win32.Build.0 = console_debug|Win32
{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.console_debug|x64.ActiveCfg = console_debug|x64
{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.console_debug|x64.Build.0 = console_debug|x64
{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.console_release_omp|Win32.ActiveCfg = console_release|x64
{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.console_release_omp|x64.ActiveCfg = console_release|x64
{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.console_release_omp|x64.Build.0 = console_release|x64
{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.console_release|Win32.ActiveCfg = console_release|Win32
{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.console_release|Win32.Build.0 = console_release|Win32
{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.console_release|x64.ActiveCfg = console_release|x64
@ -34,26 +33,14 @@ Global
{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.Debug|Win32.Build.0 = Debug|Win32
{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.Debug|x64.ActiveCfg = Debug|x64
{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.Debug|x64.Build.0 = Debug|x64
{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.Debug64|Win32.ActiveCfg = Debug64|x64
{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.Debug64|Win32.Build.0 = Debug64|x64
{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.Debug64|x64.ActiveCfg = Debug64|x64
{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.Debug64|x64.Build.0 = Debug64|x64
{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.Release|Win32.ActiveCfg = Release|Win32
{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.Release|Win32.Build.0 = Release|Win32
{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.Release|x64.ActiveCfg = Release|x64
{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.Release|x64.Build.0 = Release|x64
{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.Release64|Win32.ActiveCfg = Release64|Win32
{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.Release64|Win32.Build.0 = Release64|Win32
{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.Release64|x64.ActiveCfg = Release64|x64
{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.Release64|x64.Build.0 = Release64|x64
{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.ReleaseOMP|Win32.ActiveCfg = ReleaseOMP|Win32
{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.ReleaseOMP|Win32.Build.0 = ReleaseOMP|Win32
{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.ReleaseOMP|x64.ActiveCfg = ReleaseOMP|x64
{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.ReleaseOMP|x64.Build.0 = ReleaseOMP|x64
{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.ReleaseOmp64|Win32.ActiveCfg = ReleaseOmp64|x64
{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.ReleaseOmp64|Win32.Build.0 = ReleaseOmp64|x64
{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.ReleaseOmp64|x64.ActiveCfg = ReleaseOmp64|x64
{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.ReleaseOmp64|x64.Build.0 = ReleaseOmp64|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

17553
visualc/vngspice.vcproj
File diff suppressed because it is too large
View File

Write Preview
Loading…
Cancel
Save