From: Kevin M. Rosenberg Date: Sun, 5 May 2002 10:13:13 +0000 (+0000) Subject: r1947: *** empty log message *** X-Git-Tag: debian-4.5.3-3~284 X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=commitdiff_plain;h=c06595af2aec45b33ad8b731ea5775ac72b42d1d r1947: *** empty log message *** --- diff --git a/configure.ac b/configure.ac index 311ae15..5057920 100644 --- a/configure.ac +++ b/configure.ac @@ -312,19 +312,6 @@ LDFLAGS="$X_LIBS $LDFLAGS" AC_CHECK_LIB(Xt, XtToolkitThreadInitialize, AC_DEFINE(X_THREAD_SUPPORT,1,[x thread supported]), , $X_PRE_LIBS $X_BASIC_LIBS $X_EXTRA_LIBS) LDFLAGS="$our_saved_LDFLAGS" -dnl Check in -lXext for double buffering extensions to X11, and check -dnl whether appropriate header files are present. (Some systems have one -dnl but not the other.) -our_saved_LDFLAGS="$LDFLAGS" -LDFLAGS="$X_LIBS $LDFLAGS" -AC_CHECK_LIB(Xext, XdbeQueryExtension, AC_DEFINE(HAVE_DBE_SUPPORT,1,[x dbe support]), , -lX11 "$X_EXTRA_LIBS") -AC_CHECK_LIB(Xext, XmbufQueryExtension, AC_DEFINE(HAVE_MBX_SUPPORT,1,[x mbx support]), , -lX11 "$X_EXTRA_LIBS") -LDFLAGS="$our_saved_LDFLAGS" -our_saved_CPPFLAGS="$CPPFLAGS" -CPPFLAGS="$X_CFLAGS $CPPFLAGS" -AC_CHECK_HEADERS(X11/extensions/Xdbe.h X11/extensions/multibuf.h) -CPPFLAGS="$our_saved_CPPFLAGS" - dnl Our Makefile.am files test the automake variable NO_X to determine dnl whether X should be supported. AM_CONDITIONAL(NO_X, test "x$no_x" = "xyes") diff --git a/libctsim/Makefile.am b/libctsim/Makefile.am index cbcacb4..303da92 100644 --- a/libctsim/Makefile.am +++ b/libctsim/Makefile.am @@ -1,5 +1,5 @@ noinst_LIBRARIES = libctsim.a -libctsim_a_SOURCES = filter.cpp scanner.cpp projections.cpp phantom.cpp imagefile.cpp backprojectors.cpp array2dfile.cpp trace.cpp procsignal.cpp reconstruct.cpp fourier.cpp globalvars.cpp ctndicom.cpp +libctsim_a_SOURCES = filter.cpp scanner.cpp projections.cpp phantom.cpp imagefile.cpp backprojectors.cpp array2dfile.cpp trace.cpp procsignal.cpp reconstruct.cpp fourier.cpp ctndicom.cpp INCLUDES=@my_includes@ diff --git a/libctsim/Makefile.in b/libctsim/Makefile.in index da5dc5c..0b46536 100644 --- a/libctsim/Makefile.in +++ b/libctsim/Makefile.in @@ -91,7 +91,7 @@ wxconfig = @wxconfig@ wxlibs = @wxlibs@ noinst_LIBRARIES = libctsim.a -libctsim_a_SOURCES = filter.cpp scanner.cpp projections.cpp phantom.cpp imagefile.cpp backprojectors.cpp array2dfile.cpp trace.cpp procsignal.cpp reconstruct.cpp fourier.cpp globalvars.cpp ctndicom.cpp +libctsim_a_SOURCES = filter.cpp scanner.cpp projections.cpp phantom.cpp imagefile.cpp backprojectors.cpp array2dfile.cpp trace.cpp procsignal.cpp reconstruct.cpp fourier.cpp ctndicom.cpp INCLUDES = @my_includes@ EXTRA_DIST = Makefile.nt @@ -108,7 +108,7 @@ LIBS = @LIBS@ libctsim_a_LIBADD = libctsim_a_OBJECTS = filter.o scanner.o projections.o phantom.o \ imagefile.o backprojectors.o array2dfile.o trace.o procsignal.o \ -reconstruct.o fourier.o globalvars.o ctndicom.o +reconstruct.o fourier.o ctndicom.o AR = ar CXXFLAGS = @CXXFLAGS@ CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) @@ -122,9 +122,9 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar GZIP_ENV = --best DEP_FILES = .deps/array2dfile.P .deps/backprojectors.P .deps/ctndicom.P \ -.deps/filter.P .deps/fourier.P .deps/globalvars.P .deps/imagefile.P \ -.deps/phantom.P .deps/procsignal.P .deps/projections.P \ -.deps/reconstruct.P .deps/scanner.P .deps/trace.P +.deps/filter.P .deps/fourier.P .deps/imagefile.P .deps/phantom.P \ +.deps/procsignal.P .deps/projections.P .deps/reconstruct.P \ +.deps/scanner.P .deps/trace.P SOURCES = $(libctsim_a_SOURCES) OBJECTS = $(libctsim_a_OBJECTS) diff --git a/libctsim/globalvars.cpp b/libctsim/globalvars.cpp deleted file mode 100644 index 57ea7fc..0000000 --- a/libctsim/globalvars.cpp +++ /dev/null @@ -1,38 +0,0 @@ -/***************************************************************************** -** FILE IDENTIFICATION -** -** Name: globalvars.cpp -** Purpose: Global variables -** Programmer: Kevin Rosenberg -** Date Started: Jan 2001 -** -** This is part of the CTSim program -** Copyright (c) 1983-2001 Kevin Rosenberg -** -** $Id: globalvars.cpp,v 1.2 2001/01/28 19:10:18 kevin Exp $ -** -** This program is free software; you can redistribute it and/or modify -** it under the terms of the GNU General Public License (version 2) as -** published by the Free Software Foundation. -** -** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with this program; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -******************************************************************************/ - -#include "ct.h" - -#ifdef HAVE_WXWINDOWS - -#include "../src/ctsim.h" - -bool g_bRunningWXWindows = false; -class CTSimApp* theApp = NULL; - -#endif - diff --git a/libctsupport/Makefile.am b/libctsupport/Makefile.am index 9f279ec..6ea6620 100644 --- a/libctsupport/Makefile.am +++ b/libctsupport/Makefile.am @@ -1,6 +1,6 @@ noinst_LIBRARIES = libctsupport.a INCLUDES=@my_includes@ -libctsupport_a_SOURCES= strfuncs.cpp syserror.cpp fnetorderstream.cpp consoleio.cpp mathfuncs.cpp xform.cpp clip.cpp plotfile.cpp hashtable.cpp interpolator.cpp +libctsupport_a_SOURCES= strfuncs.cpp syserror.cpp fnetorderstream.cpp consoleio.cpp mathfuncs.cpp xform.cpp clip.cpp plotfile.cpp hashtable.cpp interpolator.cpp globalvars.cpp EXTRA_DIST=Makefile.nt diff --git a/libctsupport/Makefile.in b/libctsupport/Makefile.in index 779a48a..1d8d38d 100644 --- a/libctsupport/Makefile.in +++ b/libctsupport/Makefile.in @@ -92,7 +92,7 @@ wxlibs = @wxlibs@ noinst_LIBRARIES = libctsupport.a INCLUDES = @my_includes@ -libctsupport_a_SOURCES = strfuncs.cpp syserror.cpp fnetorderstream.cpp consoleio.cpp mathfuncs.cpp xform.cpp clip.cpp plotfile.cpp hashtable.cpp interpolator.cpp +libctsupport_a_SOURCES = strfuncs.cpp syserror.cpp fnetorderstream.cpp consoleio.cpp mathfuncs.cpp xform.cpp clip.cpp plotfile.cpp hashtable.cpp interpolator.cpp globalvars.cpp EXTRA_DIST = Makefile.nt mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h @@ -107,7 +107,7 @@ LIBS = @LIBS@ libctsupport_a_LIBADD = libctsupport_a_OBJECTS = strfuncs.o syserror.o fnetorderstream.o \ consoleio.o mathfuncs.o xform.o clip.o plotfile.o hashtable.o \ -interpolator.o +interpolator.o globalvars.o AR = ar CXXFLAGS = @CXXFLAGS@ CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) @@ -121,8 +121,9 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar GZIP_ENV = --best DEP_FILES = .deps/clip.P .deps/consoleio.P .deps/fnetorderstream.P \ -.deps/hashtable.P .deps/interpolator.P .deps/mathfuncs.P \ -.deps/plotfile.P .deps/strfuncs.P .deps/syserror.P .deps/xform.P +.deps/globalvars.P .deps/hashtable.P .deps/interpolator.P \ +.deps/mathfuncs.P .deps/plotfile.P .deps/strfuncs.P .deps/syserror.P \ +.deps/xform.P SOURCES = $(libctsupport_a_SOURCES) OBJECTS = $(libctsupport_a_OBJECTS) diff --git a/libctsupport/globalvars.cpp b/libctsupport/globalvars.cpp new file mode 100644 index 0000000..d893dba --- /dev/null +++ b/libctsupport/globalvars.cpp @@ -0,0 +1,38 @@ +/***************************************************************************** +** FILE IDENTIFICATION +** +** Name: globalvars.cpp +** Purpose: Global variables +** Programmer: Kevin Rosenberg +** Date Started: Jan 2001 +** +** This is part of the CTSim program +** Copyright (c) 1983-2001 Kevin Rosenberg +** +** $Id: globalvars.cpp,v 1.1 2002/05/05 10:13:13 kevin Exp $ +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License (version 2) as +** published by the Free Software Foundation. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +******************************************************************************/ + +#include "ct.h" + +#ifdef HAVE_WXWINDOWS + +#include "../src/ctsim.h" + +bool g_bRunningWXWindows = false; +class CTSimApp* theApp = NULL; + +#endif +