r2131: *** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index aa7acec2438f68251e60a6444e1d5f106ddbbd46..0e622ed1d47bedb5b24e59965170e1572d7e8f2a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,10 @@
 Jul 1, 2002  Version 3.5.5
        
        * Fix printing of version number
+       
+       * Minor bug fixes
 
+       * Updated Win32 compatibility
        
 Jun 8, 2002  Version 3.5.4
 

diff --git a/libctsim/projections.cpp b/libctsim/projections.cpp
index 2ca1ce38e12af9fbf708595028df1f9dc9c3fbc8..e05b655b9f96d727e168afcb75eaf9f74ef3a14b 100644 (file)
--- a/libctsim/projections.cpp
+++ b/libctsim/projections.cpp
@@ -8,7 +8,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: projections.cpp,v 1.77 2002/05/28 18:43:16 kevin Exp $
+**  $Id: projections.cpp,v 1.78 2002/06/20 09:17:36 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
@@ -25,6 +25,7 @@
 ******************************************************************************/
 
 #include "ct.h"
+#include <ctime>\r
 
 const kuint16 Projections::m_signature = ('P'*256 + 'J');
 

diff --git a/msvc/ctsim.dsw b/msvc/ctsim.dsw
index 2e35b6bd58cd11b118c52e15cecb66680a5c7a54..d126b6860f0c446ff21b71f1c95558a3de85c5a1 100644 (file)
--- a/msvc/ctsim.dsw
+++ b/msvc/ctsim.dsw
@@ -27,6 +27,18 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
+Project: "ctn_lib"=..\..\ctn\winctn\ctn_lib\ctn_lib.dsp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
 Project: "ctsim"=.\ctsim\ctsim.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
@@ -101,6 +113,9 @@ Package=<4>
     Begin Project Dependency\r
     Project_Dep_Name RFFTW2st\r
     End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name ctn_lib\r
+    End Project Dependency\r
 }}}\r
 \r
 ###############################################################################\r

diff --git a/msvc/ctsim/ctsim.dsp b/msvc/ctsim/ctsim.dsp
index c6a5cee0ff12f9a1a9592e835f734e73c86b9d94..44676f080ccd112fe9d913b9126c02bf75f6545a 100644 (file)
--- a/msvc/ctsim/ctsim.dsp
+++ b/msvc/ctsim/ctsim.dsp
@@ -43,17 +43,17 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c\r
-# ADD CPP /nologo /G6 /MT /W3 /GR /GX /O2 /I "..\..\getopt" /I "..\..\include" /I "\wx2\include" /I "\wx2\src\png" /I "\fftw-2.1.3\fftw" /I "\fftw-2.1.3\rfftw" /I "\wx2\src\zlib" /D "_WINDOWS" /D "NDEBUG" /D "WIN32" /D _WI"NDOWS,_MBCS,HAVE_STRING_H,HAVE_GETOPT_H,MSVC,HAVE_FFTW,HAVE_PNG,HAVE_SGP,HAVE_WXWINDOWS,__WXMSW__,__WIN95__,__WIN32__,VERSION=3.5.4,WINVER=0x0400,STRICT /YX /FD /c\r
+# ADD CPP /nologo /G6 /MT /W3 /GR /GX /O2 /I "..\..\getopt" /I "..\..\include" /I "\wx2\include" /I "\wx2\src\png" /I "\fftw-2.1.3\fftw" /I "\fftw-2.1.3\rfftw" /I "\wx2\src\zlib" /I "\ctn\include" /D "_WINDOWS" /D "__WIN95__" /D "__WIN32__" /D "__WXMSW__" /D "MSVC" /D "NDEBUG" /D VERSION=\"3.5.5\" /D "WIN32" /D "HAVE_CTN_DICOM" /D "HAVE_STRING_H" /D "HAVE_GETOPT_H" /D "HAVE_FFTW" /D "HAVE_PNG" /D "HAVE_SGP" /D "HAVE_WXWINDOWS" /YX /FD /D _WI"NDOWS,_MBCS,HAVE_STRING_H,HAVE_GETOPT_H,MSVC,HAVE_FFTW,HAVE_PNG,HAVE_SGP,HAVE_WXWINDOWS,__WXMSW__,__WIN95__,__WIN32__,VERSION=3.5.4,WINVER=0x0400,STRICT /c\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
-# ADD RSC /l 0x409 /d "NDEBUG"\r
+# ADD RSC /l 0x409 /i "\wx2\include" /d "NDEBUG"\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386\r
+# ADD LINK32 ctn_lib.lib winmm.lib wx.lib png.lib tiff.lib jpeg.lib xpm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ctn_lib.lib comctl32.lib rpcrt4.lib fftw2st.lib rfftw2st.lib opengl32.lib wsock32.lib htmlhelp.lib /nologo /subsystem:windows /machine:I386 /libpath:"\wx2\lib" /libpath:"\ctn\winctn\ctn_lib\Release" /libpath:"\fftw-2.1.3\Win32\FFTW2st\Release" /libpath:"\fftw-2.1.3\Win32\RFFTW2st\Release"\r
 \r
 !ELSEIF  "$(CFG)" == "ctsim - Win32 Debug"\r
 \r
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /G6 /MTd /W3 /Gm /GR /GX /ZI /Od /I "..\..\getopt" /I "..\..\include" /I "\wx2\include" /I "\wx2\src\png" /I "\fftw-2.1.3\fftw" /I "\fftw-2.1.3\rfftw" /I "\wx2\src\zlib" /D "_WINDOWS" /D "_DEBUG" /D "DEBUG" /D "__WXDEBUG__" /D WXDEBUG=1 /D "WIN32" /D "_MBCS" /D "HAVE_STRING_H" /D "HAVE_GETOPT_H" /D "MSVC" /D "HAVE_FFTW" /D "HAVE_PNG" /D "HAVE_SGP" /D "HAVE_WXWINDOWS" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D VERSION=3.5.4 /D WINVER=0x0400 /D "STRICT" /YX /FD /GZ /c\r
+# ADD CPP /nologo /G6 /MTd /W3 /Gm /GR /GX /ZI /Od /I "..\..\getopt" /I "..\..\include" /I "\wx2\include" /I "\wx2\src\png" /I "\fftw-2.1.3\fftw" /I "\fftw-2.1.3\rfftw" /I "\wx2\src\zlib" /I "\ctn\include" /D "_WINDOWS" /D "_DEBUG" /D "DEBUG" /D "__WXDEBUG__" /D WXDEBUG=1 /D "_MBCS" /D "HAVE_STRING_H" /D "HAVE_GETOPT_H" /D "MSVC" /D "HAVE_FFTW" /D "HAVE_PNG" /D "HAVE_SGP" /D "HAVE_WXWINDOWS" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D VERSION=\"3.5.5\" /D "WIN32" /D "HAVE_CTN_DICOM" /YX /FD /GZ /c\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
@@ -78,7 +78,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 wsock32.lib htmlhelp.lib comctl32.lib winmm.lib rpcrt4.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib opengl32.lib fftw2st.lib rfftw2st.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrtd.lib" /pdbtype:sept /libpath:"\wx2\lib" /libpath:"\fftw-2.1.3\win32\fftw2st\Debug" /libpath:"\fftw-2.1.3\win32\rfftw2st\Debug"\r
+# ADD LINK32 wsock32.lib  comctl32.lib winmm.lib rpcrt4.lib wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib opengl32.lib fftw2st.lib rfftw2st.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ctn_lib.lib htmlhelp.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrtd.lib" /pdbtype:sept /libpath:"\fftw-2.1.3\win32\fftw2st\Debug" /libpath:"\fftw-2.1.3\win32\rfftw2st\Debug" /libpath:"\wx2\lib" /libpath:"\ctn\winctn\ctn_lib\Debug"\r
 \r
 !ENDIF \r
 \r
@@ -123,6 +123,14 @@ SOURCE=..\..\src\docs.cpp
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\getopt\getopt.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\getopt\getopt1.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\graph3dview.cpp\r
 # End Source File\r
 # Begin Source File\r
@@ -131,6 +139,14 @@ SOURCE=..\..\src\threadproj.cpp
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\threadraster.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\threadrecon.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\tips.cpp\r
 # End Source File\r
 # Begin Source File\r
@@ -195,7 +211,103 @@ SOURCE=..\..\src\views.h
 # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
 # Begin Source File\r
 \r
-SOURCE=..\ctsimtext\ctsimtext.rc\r
+SOURCE=.\wx\msw\blank.cur\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\wx\msw\bullseye.cur\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\ctsim.rc\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\wx\msw\error.ico\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\wx\msw\hand.cur\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\wx\msw\info.ico\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\logo.ico\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\wx\msw\magnif1.cur\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\wx\msw\noentry.cur\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\wx\msw\pbrush.cur\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\wx\msw\pencil.cur\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\wx\msw\pntleft.cur\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\wx\msw\pntright.cur\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\wx\msw\query.cur\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\wx\msw\question.ico\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\wx\msw\roller.cur\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\wx\msw\size.cur\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\wx\msw\tip.ico\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\wx\msw\warning.ico\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\wx\msw\watch1.cur\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\wx\html\msw\wbook.ico\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\wx\html\msw\wfolder.ico\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\wx\html\msw\whelp.ico\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\wx\html\msw\whlproot.ico\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\wx\html\msw\wpage.ico\r
 # End Source File\r
 # End Group\r
 # End Target\r

diff --git a/msvc/ctsim/ctsim.plg b/msvc/ctsim/ctsim.plg
index da3bec5db5bad18ab92fc4d775830109593ebd23..8f2eb1830b66b6d35e89703121629ed448a00368 100644 (file)
--- a/msvc/ctsim/ctsim.plg
+++ b/msvc/ctsim/ctsim.plg
@@ -3,47 +3,40 @@
 <pre>\r
 <h1>Build Log</h1>\r
 <h3>\r
---------------------Configuration: ctsim - Win32 Debug--------------------\r
+--------------------Configuration: ctsim - Win32 Release--------------------\r
 </h3>\r
 <h3>Command Lines</h3>\r
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1C9.tmp" with contents\r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP215.tmp" with contents\r
 [\r
-/nologo /G6 /MTd /W3 /Gm /GR /GX /ZI /Od /I "..\..\getopt" /I "..\..\include" /I "\wx2\include" /I "\wx2\src\png" /I "\fftw-2.1.3\fftw" /I "\fftw-2.1.3\rfftw" /I "\wx2\src\zlib" /I "\ctn\include" /D "_WINDOWS" /D "_DEBUG" /D "DEBUG" /D "__WXDEBUG__" /D WXDEBUG=1 /D "_MBCS" /D "HAVE_STRING_H" /D "HAVE_GETOPT_H" /D "MSVC" /D "HAVE_FFTW" /D "HAVE_PNG" /D "HAVE_SGP" /D "HAVE_WXWINDOWS" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D VERSION=\"3.5.4\" /D "WIN32" /D "HAVE_CTN_DICOM" /Fp"Debug/ctsim.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c \r
-"C:\ctsim\src\ctsim.cpp"\r
+ctn_lib.lib winmm.lib wx.lib png.lib tiff.lib jpeg.lib xpm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ctn_lib.lib comctl32.lib rpcrt4.lib fftw2st.lib rfftw2st.lib opengl32.lib wsock32.lib htmlhelp.lib /nologo /subsystem:windows /incremental:no /pdb:"Release/ctsim.pdb" /machine:I386 /out:"Release/ctsim.exe" /libpath:"\wx2\lib" /libpath:"\ctn\winctn\ctn_lib\Release" /libpath:"\fftw-2.1.3\Win32\FFTW2st\Release" /libpath:"\fftw-2.1.3\Win32\RFFTW2st\Release" \r
+.\Release\backgroundmgr.obj\r
+.\Release\backgroundsupr.obj\r
+.\Release\ctsim.obj\r
+.\Release\dialogs.obj\r
+.\Release\dlgezplot.obj\r
+.\Release\dlgprojections.obj\r
+.\Release\dlgreconstruct.obj\r
+.\Release\docs.obj\r
+.\Release\graph3dview.obj\r
+.\Release\threadproj.obj\r
+.\Release\tips.obj\r
+.\Release\views.obj\r
+.\Release\threadraster.obj\r
+.\Release\threadrecon.obj\r
+.\Release\getopt1.obj\r
+.\Release\getopt.obj\r
+.\Release\ctsim.res\r
+\ctsim\msvc\libctsim\Release\libctsim.lib\r
 ]\r
-Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1C9.tmp" \r
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1CA.tmp" with contents\r
-[\r
-wsock32.lib  comctl32.lib winmm.lib rpcrt4.lib wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib opengl32.lib fftw2st.lib rfftw2st.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ctn_lib.lib htmlhelp.lib /nologo /subsystem:windows /incremental:yes /pdb:"Debug/ctsim.pdb" /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrtd.lib" /out:"Debug/ctsim.exe" /pdbtype:sept /libpath:"\fftw-2.1.3\win32\fftw2st\Debug" /libpath:"\fftw-2.1.3\win32\rfftw2st\Debug" /libpath:"\wx2\lib" /libpath:"\ctn\winctn\ctn_lib\Debug" \r
-.\Debug\backgroundmgr.obj\r
-.\Debug\backgroundsupr.obj\r
-.\Debug\ctsim.obj\r
-.\Debug\dialogs.obj\r
-.\Debug\dlgezplot.obj\r
-.\Debug\dlgprojections.obj\r
-.\Debug\dlgreconstruct.obj\r
-.\Debug\docs.obj\r
-.\Debug\graph3dview.obj\r
-.\Debug\threadproj.obj\r
-.\Debug\tips.obj\r
-.\Debug\views.obj\r
-.\Debug\threadraster.obj\r
-.\Debug\threadrecon.obj\r
-.\Debug\getopt1.obj\r
-.\Debug\getopt.obj\r
-.\Debug\ctsim.res\r
-\ctsim\msvc\libctsim\Debug\libctsim.lib\r
-]\r
-Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1CA.tmp"\r
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP215.tmp"\r
 <h3>Output Window</h3>\r
-Compiling...\r
-ctsim.cpp\r
 Linking...\r
+LINK : warning LNK4089: all references to "WSOCK32.dll" discarded by /OPT:REF\r
 \r
 \r
 \r
 <h3>Results</h3>\r
-ctsim.exe - 0 error(s), 0 warning(s)\r
+ctsim.exe - 0 error(s), 1 warning(s)\r
 </pre>\r
 </body>\r
 </html>\r

diff --git a/msvc/ctsimtext/ctsimtext.dsp b/msvc/ctsimtext/ctsimtext.dsp
index 61bdcf4600e22b38236affdfeecf6ecd653af71d..108ca73b410aff570af83663b3c6906ad63ae4a2 100644 (file)
--- a/msvc/ctsimtext/ctsimtext.dsp
+++ b/msvc/ctsimtext/ctsimtext.dsp
@@ -42,15 +42,15 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
-# ADD CPP /nologo /G6 /MT /W3 /GR /GX /O2 /I "..\..\include" /I "..\..\getopt" /I "\fftw-2.1.3\fftw" /I "\fftw-2.1.3\rfftw" /I "\wx2\include" /I "\wx2\src\png" /I "\wx2\src\zlib" /I "\wx2\src\tiff" /I "\wx2\src\xpm" /D "_CONSOLE" /D "NOMAIN" /D "NDEBUG" /D "WIN32" /D _WI"NDOWS,_MBCS,HAVE_STRING_H,HAVE_GETOPT_H,MSVC,HAVE_FFTW,HAVE_PNG,HAVE_SGP,HAVE_WXWINDOWS,__WXMSW__,__WIN95__,__WIN32__,VERSION=3.5.4,WINVER=0x0400,STRICT /YX /FD /c\r
+# ADD CPP /nologo /G6 /MT /W3 /GR /GX /O2 /I "..\..\include" /I "..\..\getopt" /I "\fftw-2.1.3\fftw" /I "\fftw-2.1.3\rfftw" /I "\wx2\include" /I "\wx2\src\png" /I "\wx2\src\zlib" /I "\wx2\src\tiff" /I "\wx2\src\xpm" /D "_CONSOLE" /D "NOMAIN" /D "__WIN95__" /D "__WIN32__" /D "_WINDOWS" /D "__WXMSW__" /D "MSVC" /D "NDEBUG" /D VERSION=\"3.5.5\" /D "WIN32" /D "HAVE_CTN_DICOM" /YX /FD /D _WI"NDOWS,_MBCS,HAVE_STRING_H,HAVE_GETOPT_H,MSVC,HAVE_FFTW,HAVE_PNG,HAVE_SGP,HAVE_WXWINDOWS,__WXMSW__,__WIN95__,__WIN32__,VERSION=3.5.4,WINVER=0x0400,STRICT /c\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
 # ADD RSC /l 0x409 /d "NDEBUG"\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386\r
-# ADD LINK32 wx.lib zlib.lib tiff.lib jpeg.lib png.lib libctsim.lib fftw2st.lib rfftw2st.lib wsock32.lib comctl32.lib uuid.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\libctsim\Release" /libpath:"\fftw-2.1.3\Win32\RFFTW2st\Release" /libpath:"\fftw-2.1.3\Win32\FFTW2st\Release" /libpath:"\wx2\\"\r
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386\r
+# ADD LINK32 wx.lib zlib.lib tiff.lib jpeg.lib png.lib libctsim.lib fftw2st.lib rfftw2st.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ctn_lib.lib /nologo /subsystem:console /machine:I386 /libpath:"..\libctsim\Release" /libpath:"\fftw-2.1.3\Win32\RFFTW2st\Release" /libpath:"\fftw-2.1.3\Win32\FFTW2st\Release" /libpath:"\wx2\\" /libpath:"\wx2\lib" /libpath:"\ctn\winctn\ctn_lib\Release"\r
 \r
 !ELSEIF  "$(CFG)" == "ctsimtext - Win32 Debug"\r
 \r
@@ -65,16 +65,16 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c\r
-# ADD CPP /nologo /G6 /MTd /W3 /Gm /GR /GX /ZI /Od /I "..\..\include" /I "..\..\getopt" /I "\fftw-2.1.3\fftw" /I "\fftw-2.1.3\rfftw" /I "\wx2\include" /I "\wx2\src\png" /I "\wx2\src\zlib" /I "\wx2\src\tiff" /I "\wx2\src\xpm" /D "_CONSOLE" /D "NOMAIN" /D "_DEBUG" /D "DEBUG" /D "_WINDOWS" /D "__WXDEBUG__" /D WXDEBUG=1 /D "WIN32" /D "_MBCS" /D "HAVE_STRING_H" /D "HAVE_GETOPT_H" /D "MSVC" /D "HAVE_FFTW" /D "HAVE_PNG" /D "HAVE_SGP" /D "HAVE_WXWINDOWS" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D VERSION=3.5.4 /D WINVER=0x0400 /D "STRICT" /YX /FD /GZ  /c\r
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c\r
+# ADD CPP /nologo /G6 /MTd /W3 /Gm /GR /GX /ZI /Od /I "..\..\include" /I "..\..\getopt" /I "\fftw-2.1.3\fftw" /I "\fftw-2.1.3\rfftw" /I "\wx2\include" /I "\wx2\src\png" /I "\wx2\src\zlib" /I "\wx2\src\tiff" /I "\wx2\src\xpm" /D "_CONSOLE" /D "NOMAIN" /D "_DEBUG" /D "DEBUG" /D "_WINDOWS" /D "__WXDEBUG__" /D WXDEBUG=1 /D "_MBCS" /D "HAVE_STRING_H" /D "HAVE_GETOPT_H" /D "MSVC" /D "HAVE_FFTW" /D "HAVE_PNG" /D "HAVE_SGP" /D "HAVE_WXWINDOWS" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D VERSION=\"3.5.5\" /D "WIN32" /D "HAVE_CTN_DICOM" /YX /FD /GZ /c\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
 # ADD RSC /l 0x409 /i "\wx2\include" /i "\wx2\contrib\include" /d "_DEBUG"\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 wxd.lib libctsim.lib zlibd.lib tiffd.lib jpegd.lib pngd.lib fftw2st.lib rfftw2st.lib wsock32.lib comctl32.lib winmm.lib rpcrt4.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib xpmd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\libctsim\Debug" /libpath:"\fftw-2.1.3\Win32\RFFTW2st\Debug" /libpath:"\fftw-2.1.3\Win32\FFTW2st\Debug" /libpath:"\wx2\lib" /libpath:"\fftw-2.1.3\fftw2st\Debug" /libpath:"\fftw-2.1.3\rfftw2st\Release"\r
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept\r
+# ADD LINK32 wxd.lib libctsim.lib zlibd.lib tiffd.lib jpegd.lib pngd.lib fftw2st.lib rfftw2st.lib wsock32.lib comctl32.lib winmm.lib rpcrt4.lib xpmd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ctn_lib.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\libctsim\Debug" /libpath:"\fftw-2.1.3\Win32\RFFTW2st\Debug" /libpath:"\fftw-2.1.3\Win32\FFTW2st\Debug" /libpath:"\fftw-2.1.3\fftw2st\Debug" /libpath:"\fftw-2.1.3\rfftw2st\Release" /libpath:"\wx2\lib" /libpath:"\ctn\winctn\ctn_lib\Debug"\r
 # SUBTRACT LINK32 /nodefaultlib\r
 \r
 !ENDIF \r

diff --git a/msvc/libctsim/libctsim.dsp b/msvc/libctsim/libctsim.dsp
index 4cce0f3e6e7cacdc6003787e67b0c135f2b3177b..8f7a90c684944b4f2c2b68230ef105362ea8f5c0 100644 (file)
--- a/msvc/libctsim/libctsim.dsp
+++ b/msvc/libctsim/libctsim.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c\r
-# ADD CPP /nologo /G6 /MT /W3 /GR /GX /O2 /I "..\..\include" /I "..\..\getopt" /I "\fftw-2.1.3\fftw" /I "\fftw-2.1.3\rfftw" /I "\wx2\include" /I "\wx2\src\png" /I "\wx2\src\zlib" /I "\wx2\src\tiff" /I "\wx2\src\xpm" /D "_LIB" /D "NDEBUG" /D "WIN32" /D _WI"NDOWS,_MBCS,HAVE_STRING_H,HAVE_GETOPT_H,MSVC,HAVE_FFTW,HAVE_PNG,HAVE_SGP,HAVE_WXWINDOWS,__WXMSW__,__WIN95__,__WIN32__,VERSION=3.5.4,WINVER=0x0400,STRICT /YX /FD /c\r
+# ADD CPP /nologo /G6 /MT /W3 /GR /GX /O2 /I "..\..\include" /I "..\..\getopt" /I "\fftw-2.1.3\fftw" /I "\fftw-2.1.3\rfftw" /I "\wx2\include" /I "\wx2\src\png" /I "\wx2\src\zlib" /I "\wx2\src\tiff" /I "\wx2\src\xpm" /I "\ctn\include" /D "_LIB" /D "__WIN95__" /D "__WIN32__" /D "_WINDOWS" /D "__WXMSW__" /D "MSVC" /D "NDEBUG" /D VERSION=\"3.5.5\" /D "WIN32" /D "HAVE_CTN_DICOM" /D "HAVE_STRING_H" /D "HAVE_GETOPT_H" /D "HAVE_FFTW" /D "HAVE_PNG" /D "HAVE_SGP" /D "HAVE_WXWINDOWS" /D WINVER=0x0400 /D "STRICT" /YX /FD /D _WI"NDOWS,_MBCS,HAVE_STRING_H,HAVE_GETOPT_H,MSVC,HAVE_FFTW,HAVE_PNG,HAVE_SGP,HAVE_WXWINDOWS,__WXMSW__,__WIN95__,__WIN32__,VERSION=3.5.4,WINVER=0x0400,STRICT /c\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
 # ADD RSC /l 0x409 /d "NDEBUG"\r
 BSC32=bscmake.exe\r
@@ -63,8 +63,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "Debug"\r
 # PROP Intermediate_Dir "Debug"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ  /c\r
-# ADD CPP /nologo /G6 /MTd /W3 /Gm /Gi /GR /GX /ZI /Od /I "..\..\include" /I "..\..\getopt" /I "\fftw-2.1.3\fftw" /I "\fftw-2.1.3\rfftw" /I "\wx2\include" /I "\wx2\src\png" /I "\wx2\src\zlib" /I "\wx2\src\tiff" /I "\wx2\src\xpm" /D "_LIB" /D "_DEBUG" /D "DEBUG" /D "_WINDOWS" /D "__WXDEBUG__" /D WXDEBUG=1 /D "WIN32" /D "_MBCS" /D "HAVE_STRING_H" /D "HAVE_GETOPT_H" /D "MSVC" /D "HAVE_FFTW" /D "HAVE_PNG" /D "HAVE_SGP" /D "HAVE_WXWINDOWS" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D VERSION=3.5.4 /D WINVER=0x0400 /D "STRICT" /YX /FD /GZ  /c\r
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c\r
+# ADD CPP /nologo /G6 /MTd /W3 /Gm /Gi /GR /GX /ZI /Od /I "..\..\include" /I "..\..\getopt" /I "\fftw-2.1.3\fftw" /I "\fftw-2.1.3\rfftw" /I "\wx2\include" /I "\wx2\src\png" /I "\wx2\src\zlib" /I "\wx2\src\tiff" /I "\wx2\src\xpm" /I "\ctn\include" /D "_LIB" /D "_DEBUG" /D "DEBUG" /D "_WINDOWS" /D "__WXDEBUG__" /D WXDEBUG=1 /D "_MBCS" /D "HAVE_STRING_H" /D "HAVE_GETOPT_H" /D "MSVC" /D "HAVE_FFTW" /D "HAVE_PNG" /D "HAVE_SGP" /D "HAVE_WXWINDOWS" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D VERSION=\"3.5.5\" /D "WIN32" /D "HAVE_CTN_DICOM" /YX /FD /GZ /c\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
 # ADD RSC /l 0x409 /d "_DEBUG"\r
 BSC32=bscmake.exe\r