From 15c034803da8b5ba55bab20401124e8307ad0e89 Mon Sep 17 00:00:00 2001
From: Holger Vogt <holger.vogt@uni-due.de>
Date: Wed, 1 Jan 2020 14:39:03 +0100
Subject: [PATCH] 64 bit compilation is the standard

---
 compile_linux.sh | 30 +++++++++++++++---------------
 compile_min.sh   | 30 +++++++++++++++---------------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/compile_linux.sh b/compile_linux.sh
index 84fc33f88..04e8533ae 100644
--- a/compile_linux.sh
+++ b/compile_linux.sh
@@ -6,7 +6,7 @@
 # Install gcc, bison, flex, libtool, autoconf, automake, 
 # libx11 and libx11-dev (headers), libXaw and libXaw-dev, libreadline and dev
 # Declare 'compile_linux.sh' executable and start compiling with
-# './compile_linux.sh' or './compile_min.sh 64' from the ngspice directory.
+# './compile_linux.sh' or './compile_min.sh 32' from the ngspice directory.
 # Options:
 # --adms and --enable-adms will install extra HICUM, EKV and MEXTRAM models via the 
 # adms interface. You need to download and install the *.va files via ng-adms-va.tgz 
@@ -19,10 +19,10 @@
 # Add (optionally) --enable-relpath to avoid absolute paths when searching for code models.
 # It might be necessary to uncomment and run ./autogen.sh .
 
-if test "$1" = "64"; then
-   if [ ! -d "release64" ]; then
-      mkdir release64
-      if [ $? -ne 0 ]; then  echo "mkdir release64 failed"; exit 1 ; fi
+if test "$1" = "32"; then
+   if [ ! -d "release32" ]; then
+      mkdir release32
+      if [ $? -ne 0 ]; then  echo "mkdir release32 failed"; exit 1 ; fi
    fi   
 else
    if [ ! -d "release" ]; then
@@ -42,20 +42,20 @@ if [ $? -ne 0 ]; then  echo "./autogen.sh failed"; exit 1 ; fi
 #if [ $? -ne 0 ]; then  echo "./autogen.sh failed"; exit 1 ; fi
 
 echo
-if test "$1" = "64"; then
-   cd release64
-   if [ $? -ne 0 ]; then  echo "cd release64 failed"; exit 1 ; fi
-  echo "configuring for 64 bit"
-  echo
-# You may add  --enable-adms to the following command for adding adms generated devices 
-  ../configure --with-x --enable-xspice --enable-cider --with-readline=yes --enable-openmp --disable-debug CFLAGS="-m64 -O2" LDFLAGS="-m64 -s"
-else
-   cd release
-   if [ $? -ne 0 ]; then  echo "cd release failed"; exit 1 ; fi
+if test "$1" = "32"; then
+   cd release32
+   if [ $? -ne 0 ]; then  echo "cd release32 failed"; exit 1 ; fi
   echo "configuring for 32 bit"
   echo
 # You may add  --enable-adms to the following command for adding adms generated devices 
   ../configure --with-x --enable-xspice --enable-cider --with-readline=yes --enable-openmp --disable-debug CFLAGS="-m32 -O2" LDFLAGS="-m32 -s"
+else
+   cd release
+   if [ $? -ne 0 ]; then  echo "cd release failed"; exit 1 ; fi
+  echo "configuring for 64 bit"
+  echo
+# You may add  --enable-adms to the following command for adding adms generated devices 
+  ../configure --with-x --enable-xspice --enable-cider --with-readline=yes --enable-openmp --disable-debug CFLAGS="-m64 -O2" LDFLAGS="-m64 -s"
 fi
 if [ $? -ne 0 ]; then  echo "../configure failed"; exit 1 ; fi
 
diff --git a/compile_min.sh b/compile_min.sh
index f215de448..fdf26a6e2 100755
--- a/compile_min.sh
+++ b/compile_min.sh
@@ -9,7 +9,7 @@
 #     (allows to generate either 32 or 64 bit executables by setting flag -m32 or -m64)
 # set path to compiler in msys/xx/etc/fstab (e.g. c:/MinGW64 /mingw)
 # start compiling with
-# './compile_min.sh' or './compile_min.sh 64'
+# './compile_min.sh 32' or './compile_min.sh'
 # As an (more recent) alternative install MSYS2 and the tools cited above.
 
 # Options:
@@ -25,10 +25,10 @@
 # Add (optionally) --enable-relpath to avoid absolute paths when searching for code models.
 # It might be necessary to uncomment and run ./autogen.sh .
 
-if test "$1" = "64"; then
-   if [ ! -d "release64" ]; then
-      mkdir release64
-      if [ $? -ne 0 ]; then  echo "mkdir release64 failed"; exit 1 ; fi
+if test "$1" = "32"; then
+   if [ ! -d "release32" ]; then
+      mkdir release32
+      if [ $? -ne 0 ]; then  echo "mkdir release32 failed"; exit 1 ; fi
    fi   
 else
    if [ ! -d "release" ]; then
@@ -48,20 +48,20 @@ fi
 #if [ $? -ne 0 ]; then  echo "./autogen.sh failed"; exit 1 ; fi
 
 echo
-if test "$1" = "64"; then
-   cd release64
-   if [ $? -ne 0 ]; then  echo "cd release64 failed"; exit 1 ; fi
-  echo "configuring for 64 bit"
-  echo
-# You may add  --enable-adms to the following command for adding adms generated devices 
-  ../configure --with-wingui --enable-xspice --enable-cider --enable-openmp --disable-debug prefix="C:/Spice64" CFLAGS="-m64 -O2" LDFLAGS="-m64 -s"
-else
-   cd release
-   if [ $? -ne 0 ]; then  echo "cd release failed"; exit 1 ; fi
+if test "$1" = "32"; then
+   cd release32
+   if [ $? -ne 0 ]; then  echo "cd release32 failed"; exit 1 ; fi
   echo "configuring for 32 bit"
   echo
 # You may add  --enable-adms to the following command for adding adms generated devices 
   ../configure --with-wingui --enable-xspice --enable-cider --enable-openmp --disable-debug prefix="C:/Spice" CFLAGS="-m32 -O2" LDFLAGS="-m32 -s"
+else
+   cd release
+   if [ $? -ne 0 ]; then  echo "cd release failed"; exit 1 ; fi
+  echo "configuring for 64 bit"
+  echo
+# You may add  --enable-adms to the following command for adding adms generated devices 
+  ../configure --with-wingui --enable-xspice --enable-cider --enable-openmp --disable-debug prefix="C:/Spice64" CFLAGS="-m64 -O2" LDFLAGS="-m64 -s"
 fi
 if [ $? -ne 0 ]; then  echo "../configure failed"; exit 1 ; fi