diff --git a/doc/xschem_man/developer_info.html b/doc/xschem_man/developer_info.html
index 820ba27d..cb738ce2 100644
--- a/doc/xschem_man/developer_info.html
+++ b/doc/xschem_man/developer_info.html
@@ -195,7 +195,7 @@ v {xschem version=2.9.7 file_version=1.2}
A comment can be added (by manually editing the xschem schematic or symbol file) as shown below:
-v {xschem version=3.0.0 file_version=1.2
+v {xschem version=3.1.0 file_version=1.2
* Copyright 2022 Stefan Frederik Schippers
*
* Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/scconfig/src/default/lib_compile.c b/scconfig/src/default/lib_compile.c
index efb6ce8c..3a1313b6 100644
--- a/scconfig/src/default/lib_compile.c
+++ b/scconfig/src/default/lib_compile.c
@@ -73,6 +73,7 @@ static char *clone_flags(const char *input, const char *node)
int compile_file_raw(int logdepth, const char *fn_input, char **fn_output, const char *cc, const char *cflags, const char *ldflags)
{
char *cmdline;
+ const char *cc_esc_orig;
char *cc_esc, *fn_input_esc, *fn_output_esc, *temp_out_esc, *temp_out;
int ret;
@@ -84,12 +85,12 @@ int compile_file_raw(int logdepth, const char *fn_input, char **fn_output, const
*fn_output = tempfile_new(*fn_output);
unlink(*fn_output);
- cc_esc = (cc == NULL ? get("cc/cc") : cc);
- if (cc_esc == NULL) {
+ cc_esc_orig = (cc == NULL ? get("cc/cc") : cc);
+ if (cc_esc_orig == NULL) {
error("Trying to compile without a compiler available (cc/cc is empty)\n");
abort();
}
- cc_esc = shell_escape_dup(cc_esc);
+ cc_esc = shell_escape_dup(cc_esc_orig);
fn_input_esc = shell_escape_dup(fn_input);
fn_output_esc = shell_escape_dup(*fn_output);
temp_out_esc = shell_escape_dup(temp_out);
diff --git a/scconfig/src/gui/find_gl.c b/scconfig/src/gui/find_gl.c
index f11c124c..fe9604b4 100644
--- a/scconfig/src/gui/find_gl.c
+++ b/scconfig/src/gui/find_gl.c
@@ -27,8 +27,9 @@
#include "log.h"
#include "db.h"
#include "dep.h"
+#include "find_gl.h"
-int find_gl(const char *name, int logdepth, int fatal, const char *call, const char *arg)
+int find_gl(const char *name, int logdepth, int fatal)
{
char test_c[256];
const char *test_c_templ =
@@ -48,8 +49,6 @@ int find_gl(const char *name, int logdepth, int fatal, const char *call, const c
const char **lf, *ldflgs[] = {"-lGL", "-lopengl32", "-framework OpenGL", NULL};
char *cflags = NULL;
char *ldflags = NULL;
- (void) call; /* not used */
- (void) arg; /* not used */
if (require("cc/cc", logdepth, fatal))
return try_fail(logdepth, node);
@@ -93,7 +92,7 @@ int find_gl(const char *name, int logdepth, int fatal, const char *call, const c
return 0;
}
-int find_gl_vao(const char *name, int logdepth, int fatal, const char *call, const char *arg)
+int find_gl_vao(const char *name, int logdepth, int fatal)
{
const char *test_c =
NL "#include "
@@ -105,8 +104,6 @@ int find_gl_vao(const char *name, int logdepth, int fatal, const char *call, con
NL;
const char *node = "libs/gui/gl/vao";
const char *cflags, *ldflags, *incs;
- (void) call; /* not used */
- (void) arg; /* not used */
if (require("cc/cc", logdepth, fatal))
return try_fail(logdepth, node);
@@ -128,7 +125,7 @@ int find_gl_vao(const char *name, int logdepth, int fatal, const char *call, con
return try_fail(logdepth, node);
}
-int find_gl_fb_attachment(const char *name, int logdepth, int fatal, const char *call, const char *arg)
+int find_gl_fb_attachment(const char *name, int logdepth, int fatal)
{
const char *test_c_templ =
NL "#include "
@@ -143,8 +140,6 @@ int find_gl_fb_attachment(const char *name, int logdepth, int fatal, const char
char test_c[512];
const char *node = "libs/gui/gl/fb_attachment";
const char *cflags, *ldflags, *incs, *ip;
- (void) call; /* not used */
- (void) arg; /* not used */
if (require("cc/cc", logdepth, fatal))
return try_fail(logdepth, node);
@@ -170,7 +165,7 @@ int find_gl_fb_attachment(const char *name, int logdepth, int fatal, const char
}
-int find_glu(const char *name, int logdepth, int fatal, const char *call, const char *arg)
+int find_glu(const char *name, int logdepth, int fatal)
{
char test_c[256];
const char *test_c_templ =
@@ -189,8 +184,6 @@ int find_glu(const char *name, int logdepth, int fatal, const char *call, const
char **cf, *cflgs[] = {"", "-I/usr/include/libdrm", NULL};
char *cflags = NULL;
char *ldflags = NULL;
- (void) call; /* not used */
- (void) arg; /* not used */
if (require("cc/cc", logdepth, fatal))
return try_fail(logdepth, node);
@@ -239,7 +232,7 @@ int find_glu(const char *name, int logdepth, int fatal, const char *call, const
return 0;
}
-int find_glut(const char *name, int logdepth, int fatal, const char *call, const char *arg)
+int find_glut(const char *name, int logdepth, int fatal)
{
const char *test_c =
NL "#include "
@@ -256,8 +249,6 @@ int find_glut(const char *name, int logdepth, int fatal, const char *call, const
char **inc, *incs[] = {"", "#include ", NULL};
char *cflags = NULL;
char *ldflags = NULL;
- (void) call; /* not used */
- (void) arg; /* not used */
incs[0] = freeglut;
diff --git a/scconfig/src/gui/find_gl.h b/scconfig/src/gui/find_gl.h
index dd9e264e..7429f342 100644
--- a/scconfig/src/gui/find_gl.h
+++ b/scconfig/src/gui/find_gl.h
@@ -1,6 +1,6 @@
int find_gl(const char *name, int logdepth, int fatal);
int find_gl_vao(const char *name, int logdepth, int fatal);
-int find_gl_fb_attachment(const char *name, int logdepth, int fatal, const char *call, const char *arg);
+int find_gl_fb_attachment(const char *name, int logdepth, int fatal);
int find_glu(const char *name, int logdepth, int fatal);
int find_glut(const char *name, int logdepth, int fatal);
diff --git a/src/gschemtoxschem.awk b/src/gschemtoxschem.awk
index 2e685379..115ef0de 100755
--- a/src/gschemtoxschem.awk
+++ b/src/gschemtoxschem.awk
@@ -461,7 +461,7 @@ function print_header()
"device @name @device\n" \
"@comptag\"\n"
}
- print "v {xschem version=3.0.0 file_version=1.2}"
+ print "v {xschem version=3.1.0 file_version=1.2}"
template_attrs = "template=\"" template_attrs "\"\n"
if(FILENAME ~/\.sym$/) {
diff --git a/src/make_sch_from_spice.awk b/src/make_sch_from_spice.awk
index 2fb160fc..157a5a6f 100755
--- a/src/make_sch_from_spice.awk
+++ b/src/make_sch_from_spice.awk
@@ -694,7 +694,7 @@ function print_sym(sym, template, format, subckt_name, sym_type, extra, dir, pin
print "start print symbol: " sym
- print "v {xschem version=3.0.0 file_version=1.2}"
+ print "v {xschem version=3.1.0 file_version=1.2}"
print "K {type=" sym_type > sym
# print "format=\"@name @pinlist @symname " format_translate(template) "\"" > sym
iii = format_translate(template, extra)
diff --git a/src/make_sym.awk b/src/make_sym.awk
index b2d7544c..b312563c 100755
--- a/src/make_sym.awk
+++ b/src/make_sym.awk
@@ -68,7 +68,7 @@ function beginfile(f)
text_voffset=20
lab_voffset=4
ip=op=n_pin=0
- print "v {xschem version=3.0.0 file_version=1.2}" > sym
+ print "v {xschem version=3.1.0 file_version=1.2}" > sym
if(template=="") {
printf "%s", "K {type=subcircuit\nformat=\"@name @pinlist @symname\"\n" >sym
printf "%s\n", "template=\"name=x1\"" >sym
diff --git a/src/symgen.awk b/src/symgen.awk
index 036f1507..80a03661 100755
--- a/src/symgen.awk
+++ b/src/symgen.awk
@@ -393,7 +393,7 @@ function attrs(a)
function header()
{
- print "v {xschem version=3.0.0 file_version=1.2}"
+ print "v {xschem version=3.1.0 file_version=1.2}"
}
function round(n)
diff --git a/src/xschem.h b/src/xschem.h
index d10387bb..d6662154 100644
--- a/src/xschem.h
+++ b/src/xschem.h
@@ -23,7 +23,7 @@
#ifndef CADGLOBALS
#define CADGLOBALS
-#define XSCHEM_VERSION "3.0.0"
+#define XSCHEM_VERSION "3.1.0"
#define XSCHEM_FILE_VERSION "1.2"
#if HAS_PIPE == 1
|