From 30a44d1be5fbdde10c7356e741fc4b98afae9a69 Mon Sep 17 00:00:00 2001 From: h_vogt Date: Sat, 23 Mar 2013 13:00:30 +0100 Subject: [PATCH] --with-windows --> --with-wingui --- INSTALL | 8 ++++---- compile_min.sh | 4 ++-- configure.ac | 33 +++++++++++++++++++++++---------- src/Makefile.am | 22 +++++++++++----------- src/maths/cmaths/Makefile.am | 4 ++-- 5 files changed, 42 insertions(+), 29 deletions(-) diff --git a/INSTALL b/INSTALL index e9cfac2ff..93ed9f4a6 100644 --- a/INSTALL +++ b/INSTALL @@ -460,7 +460,7 @@ Most of the options now following are not well maintained, are not tested or eve $ cd ngspice-25 $ mkdir release $ cd release - $ ../configure --with-windows ...and other options + $ ../configure --with-wingui ...and other options $ make $ make install @@ -473,7 +473,7 @@ Most of the options now following are not well maintained, are not tested or eve $ ./autogen.sh --adms $ mkdir release $ cd release - $ ../configure --with-windows --enable-cider --disable-debug --enable-openmp --enable-xspice --enable-adms + $ ../configure --with-wingui --enable-cider --disable-debug --enable-openmp --enable-xspice --enable-adms $ make install However, to compile code extracted from the git repository the procedure is @@ -505,7 +505,7 @@ Most of the options now following are not well maintained, are not tested or eve $ ./autogen.sh $ mkdir release $ cd release - $ ../configure --enable-maintainer-mode --with-windows ...and other options + $ ../configure --enable-maintainer-mode --with-wingui ...and other options $ make $ make install @@ -646,7 +646,7 @@ Most of the options now following are not well maintained, are not tested or eve 9.4 ngspice console app with MINGW or CYGWIN - Omitting the configure flag --with-windows will yield a console ngspice. + Omitting the configure flag --with-wingui will yield a console ngspice. You then will not have any graphics interface. In CYGWIN you may add --with-x for the X11 graphics (not available in mingw). A typical configure command may look like diff --git a/compile_min.sh b/compile_min.sh index 6ee9ec143..6ffeff660 100644 --- a/compile_min.sh +++ b/compile_min.sh @@ -51,14 +51,14 @@ if test "$1" = "64"; then echo "configuring for 64 bit" echo # You may add --enable-adms to the following command for adding adms generated devices - ../configure --with-windows --enable-xspice --enable-cider --enable-openmp --disable-debug prefix="C:/Spice64" CFLAGS="-m64 -fno-omit-frame-pointer" LDFLAGS="-m64" + ../configure --with-wingui --enable-xspice --enable-cider --enable-openmp --disable-debug prefix="C:/Spice64" CFLAGS="-m64 -fno-omit-frame-pointer" LDFLAGS="-m64" else cd release if [ $? -ne 0 ]; then echo "cd release 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-windows --enable-xspice --enable-cider --enable-openmp --disable-debug prefix="C:/Spice" CFLAGS="-m32 -fno-omit-frame-pointer" LDFLAGS="-m32" + ../configure --with-wingui --enable-xspice --enable-cider --enable-openmp --disable-debug prefix="C:/Spice" CFLAGS="-m32 -fno-omit-frame-pointer" LDFLAGS="-m32" fi if [ $? -ne 0 ]; then echo "../configure failed"; exit 1 ; fi diff --git a/configure.ac b/configure.ac index 89353ec88..c1590c821 100644 --- a/configure.ac +++ b/configure.ac @@ -278,7 +278,7 @@ AC_CANONICAL_HOST # Expand the prefix variable if test "x$prefix" = xNONE ; then # with the MS WINDOWS executable we suggest C:/Spice/bin as *.exe-path - if test "x$with_windows" = xyes; then + if test "x$with_wingui" = xyes; then dprefix="C:/Spice" prefix=$dprefix else @@ -462,18 +462,31 @@ AM_PROG_CC_C_O AC_PROG_LIBTOOL -# --with-windows : the user wants to use generate the MS WINDOWS executable -AC_MSG_CHECKING([whether windows code is enabled]) +# --with-windows : the user wants to use generate the MS WINDOWS GUI executable +# old command version, deprecated, use --with-wingui AC_ARG_WITH([windows], - [AS_HELP_STRING([--with-windows], [MS WINDOWS executable])], + [AS_HELP_STRING([--with-windows], [MS WINDOWS GUI executable, deprecated])], [if test "x$with_windows" = xyes; then - AC_DEFINE([HAS_WINGUI], [1], [define to specify MS Windows executable]) + AC_DEFINE([HAS_WINGUI], [1], [define to specify MS Windows executable with simple GUI]) fi], [with_windows=no]) -AC_MSG_RESULT([$with_windows]) -AM_CONDITIONAL([WINDOWS], [test "x$with_windows" = xyes]) -case $with_windows in +# --with-wingui : the user wants to use generate the MS WINDOWS GUI executable +AC_MSG_CHECKING([whether windows code with gui is enabled]) +AC_ARG_WITH([wingui], + [AS_HELP_STRING([--with-wingui], [MS WINDOWS GUI executable])], + [if test "x$with_wingui" = xyes; then + AC_DEFINE([HAS_WINGUI], [1], [define to specify MS Windows executable with simple GUI]) + fi], + [if test "x$with_windows" = xyes; then + with_wingui=yes + else + with_wingui=no + fi]) +AC_MSG_RESULT([$with_wingui]) +AM_CONDITIONAL([WINGUI], [test "x$with_wingui" = xyes]) + +case $with_wingui in yes ) AC_DEFINE([X_DISPLAY_MISSING]) AC_MSG_RESULT([No X display!]) @@ -722,8 +735,8 @@ AC_DEFINE_UNQUOTED([NGSPICEBINDIR], ["`echo $dprefix/bin`"], [Define the directo AC_DEFINE_UNQUOTED([NGSPICEDATADIR], ["`echo $dprefix/share/ngspice`"], [Define the directory for architecture independent data files]) AC_DEFINE_UNQUOTED([NGSPICEBUILDDATE], ["`date`"], [Define the build date]) -if test "x$with_windows" = xyes; then - AC_MSG_RESULT([WINDOWS code enabled]) +if test "x$with_wingui" = xyes; then + AC_MSG_RESULT([WINDOWS GUI code enabled]) AC_CHECK_FUNCS([memmove]) fi diff --git a/src/Makefile.am b/src/Makefile.am index f55281c67..98c22d850 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -14,14 +14,14 @@ endif if !TCL_MODULE bin_PROGRAMS = ngspice ngnutmeg -if !WINDOWS +if !WINGUI bin_PROGRAMS += ngsconvert ngproc2mod ngmultidec ngmakeidx helpdatadir = $(pkgdatadir)/helpdir helpdata_DATA = ngspice.txt ngspice.idx if !NO_HELP bin_PROGRAMS += nghelp endif !NO_HELP -endif !WINDOWS +endif !WINGUI endif !TCL_MODULE EXTRA_DIST = ngspice.txt setplot spectrum \ @@ -98,14 +98,14 @@ ngspice_SOURCES = \ ngspice_CPPFLAGS = $(AM_CPPFLAGS) -DSIMULATOR -if WINDOWS +if WINGUI ngspice_SOURCES += winmain.c endif ngspice_LDADD = \ frontend/libfte.la -if WINDOWS +if WINGUI ngspice_LDADD += \ frontend/wdisp/libwindisp.la endif @@ -169,7 +169,7 @@ ngspice_LDADD += \ maths/sparse/libsparse.la \ misc/libmisc.la -if !WINDOWS +if !WINGUI if !NO_X ngspice_LDADD += frontend/help/libhlp.la endif @@ -186,14 +186,14 @@ ngnutmeg_SOURCES = \ ngnutmeg_CPPFLAGS = $(AM_CPPFLAGS) -if WINDOWS +if WINGUI ngnutmeg_SOURCES += winmain.c endif ngnutmeg_LDADD = \ frontend/libfte.la -if WINDOWS +if WINGUI ngnutmeg_LDADD += \ frontend/wdisp/libwindisp.la endif @@ -212,7 +212,7 @@ ngnutmeg_LDADD += \ ## These programs are not required on Windows -if !WINDOWS +if !WINGUI if !NO_X ngnutmeg_LDADD += \ @@ -277,7 +277,7 @@ ngmakeidx_SOURCES = makeidx.c ngspice.idx: ngmakeidx$(EXEEXT) $(srcdir)/ngspice.txt ./ngmakeidx$(EXEEXT) -o ngspice.idx $(srcdir)/ngspice.txt -endif !WINDOWS +endif !WINGUI ## create spinit at compile time, see @@ -306,7 +306,7 @@ AM_CFLAGS = -static LIBS = @LIBS@ @X_LIBS@ @X_PRE_LIBS@ @X_EXTRA_LIBS@ -if WINDOWS +if WINGUI LIBS += -lpsapi endif @@ -340,7 +340,7 @@ libspice_la_LIBADD = \ @X_LIBS@ \ frontend/libfte.la -if WINDOWS +if WINGUI libspice_la_LIBADD += \ frontend/wdisp/libwindisp.la endif diff --git a/src/maths/cmaths/Makefile.am b/src/maths/cmaths/Makefile.am index a6fd74257..f17954bde 100644 --- a/src/maths/cmaths/Makefile.am +++ b/src/maths/cmaths/Makefile.am @@ -14,7 +14,7 @@ libcmaths_la_SOURCES = \ cmath4.h if !TCL_MODULE -if !WINDOWS +if !WINGUI noinst_PROGRAMS = test_cx_mag test_cx_j test_cx_ph test_cx_cph @@ -52,7 +52,7 @@ test_cx_j_LDADD = \ TESTS = test_cx_mag test_cx_j test_cx_ph test_cx_cph -endif !WINDOWS +endif !WINGUI endif !TCL_MODULE AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include -I$(top_srcdir)/src/maths/poly