r304: *** empty log message ***

diff --git a/msvc/ctsim.dsw b/msvc/ctsim.dsw
index d1ab62348bed7c1ce1baba480af6a1d8aac5ed07..998c9aedb7cd95e775e0f2a9e868fc0af4149d07 100644 (file)
--- a/msvc/ctsim.dsw
+++ b/msvc/ctsim.dsw
@@ -119,6 +119,15 @@ Package=<5>
 \r
 Package=<4>\r
 {{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name libctsim\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name libpng\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name zlib\r
+    End Project Dependency\r
 }}}\r
 \r
 ###############################################################################\r

diff --git a/msvc/ctsim/ctsim.plg b/msvc/ctsim/ctsim.plg
index d319d2c2cfc8cdb7da73e1974f60a4490d66fa4e..ccee352aab7b3506ddb8ae70a5ccd7e979b29e3f 100644 (file)
--- a/msvc/ctsim/ctsim.plg
+++ b/msvc/ctsim/ctsim.plg
@@ -3,49 +3,497 @@
 <pre>\r
 <h1>Build Log</h1>\r
 <h3>\r
+--------------------Configuration: FFTW2st - Win32 Release--------------------\r
+</h3>\r
+<h3>Command Lines</h3>\r
+\r
+\r
+\r
+<h3>Results</h3>\r
+FFTW2st.lib - 0 error(s), 0 warning(s)\r
+<h3>\r
+--------------------Configuration: FFTW2st - Win32 Debug--------------------\r
+</h3>\r
+<h3>Command Lines</h3>\r
+\r
+\r
+\r
+<h3>Results</h3>\r
+FFTW2st.lib - 0 error(s), 0 warning(s)\r
+<h3>\r
+--------------------Configuration: RFFTW2st - Win32 Release--------------------\r
+</h3>\r
+<h3>Command Lines</h3>\r
+\r
+\r
+\r
+<h3>Results</h3>\r
+RFFTW2st.lib - 0 error(s), 0 warning(s)\r
+<h3>\r
+--------------------Configuration: RFFTW2st - Win32 Debug--------------------\r
+</h3>\r
+<h3>Command Lines</h3>\r
+\r
+\r
+\r
+<h3>Results</h3>\r
+RFFTW2st.lib - 0 error(s), 0 warning(s)\r
+<h3>\r
 --------------------Configuration: ctsim - Win32 Release--------------------\r
 </h3>\r
 <h3>Command Lines</h3>\r
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP114.tmp" with contents\r
+\r
+\r
+\r
+<h3>Results</h3>\r
+ctsim.exe - 0 error(s), 0 warning(s)\r
+<h3>\r
+--------------------Configuration: libctsim - Win32 Debug--------------------\r
+</h3>\r
+<h3>Command Lines</h3>\r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP16.tmp" with contents\r
 [\r
-/nologo /G6 /MT /W3 /GR /GX /O2 /I "." /I "..\..\include" /I "..\..\getopt" /I "..\..\..\lpng108" /I "..\..\..\zlib" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /I "..\..\..\wx2\include" /D CTSIMVERSION=\"2.5.0\" /D "NDEBUG" /D "__WXWIN__" /D "__WXMSW__" /D "HAVE_SGP" /D "HAVE_PNG" /D "HAVE_WXWINDOWS" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_STRING_H" /D "HAVE_FFTW" /D "HAVE_RFFTW" /D "HAVE_GETOPT_H" /D "MSVC" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FR"Release/" /Fp"Release/ctsim.pch" /YX /Fo"Release/" /Fd"Release/" /FD /c \r
+/nologo /G6 /MTd /W3 /Gm /GR- /GX /ZI /Od /I "..\..\..\zlib" /I "..\..\INCLUDE" /I "..\..\getopt" /I "..\..\..\lpng108" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /I "..\..\..\wx2\include" /D "_DEBUG" /D "HAVE_WXWIN" /D "HAVE_STRING_H" /D "HAVE_GETOPT_H" /D "WIN32" /D "_MBCS" /D "_LIB" /D "MSVC" /D "HAVE_FFTW" /D "HAVE_PNG" /D "HAVE_SGP" /D "HAVE_WXWINDOWS" /D "__WXMSW__" /FR"Debug/" /Fp"Debug/libctsim.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c \r
+"C:\ctsim-2.0.6\libctsim\backprojectors.cpp"\r
+]\r
+Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP16.tmp" \r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP17.tmp" with contents\r
+[\r
+/nologo /out:"Debug\libctsim.lib" \r
+".\Debug\array2dfile.obj"\r
+".\Debug\backprojectors.obj"\r
+".\Debug\clip.obj"\r
+".\Debug\consoleio.obj"\r
+".\Debug\ezplot.obj"\r
+".\Debug\ezset.obj"\r
+".\Debug\ezsupport.obj"\r
+".\Debug\filter.obj"\r
+".\Debug\fnetorderstream.obj"\r
+".\Debug\getopt.obj"\r
+".\Debug\getopt1.obj"\r
+".\Debug\imagefile.obj"\r
+".\Debug\mathfuncs.obj"\r
+".\Debug\phantom.obj"\r
+".\Debug\pol.obj"\r
+".\Debug\procsignal.obj"\r
+".\Debug\projections.obj"\r
+".\Debug\reconstruct.obj"\r
+".\Debug\scanner.obj"\r
+".\Debug\sgp.obj"\r
+".\Debug\strfuncs.obj"\r
+".\Debug\syserror.obj"\r
+".\Debug\trace.obj"\r
+".\Debug\transformmatrix.obj"\r
+".\Debug\xform.obj"\r
+]\r
+Creating command line "link.exe -lib @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP17.tmp"\r
+<h3>Output Window</h3>\r
+Compiling...\r
+backprojectors.cpp\r
+Creating library...\r
+<h3>\r
+--------------------Configuration: ctsim - Win32 Debug--------------------\r
+</h3>\r
+<h3>Command Lines</h3>\r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP18.tmp" with contents\r
+[\r
+/nologo /G6 /MTd /W3 /Gm /GR /GX /ZI /Od /I "\wx2\include" /I "." /I "..\..\include" /I "..\..\getopt" /I "..\..\..\lpng108" /I "..\..\..\zlib" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /D VERSION=\"2.5.0\" /D "_DEBUG" /D "__WXMSW__" /D "HAVE_SGP" /D "HAVE_PNG" /D "HAVE_WXWINDOWS" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_STRING_H" /D "HAVE_FFTW" /D "HAVE_RFFTW" /D "HAVE_GETOPT_H" /D "MSVC" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D CTSIMVERSION=\"2.5.0\" /FR"Debug/" /Fp"Debug/ctsim.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c \r
 "C:\ctsim-2.0.6\src\ctsim.cpp"\r
+"C:\ctsim-2.0.6\src\dlgprojections.cpp"\r
+"C:\ctsim-2.0.6\src\dlgreconstruct.cpp"\r
 "C:\ctsim-2.0.6\src\docs.cpp"\r
 "C:\ctsim-2.0.6\src\views.cpp"\r
 ]\r
-Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP114.tmp" \r
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP115.tmp" with contents\r
+Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP18.tmp" \r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP19.tmp" with contents\r
 [\r
-kernel32.lib user32.lib wsock32.lib comctl32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libpng.lib zlib.lib /nologo /subsystem:windows /incremental:no /pdb:"Release/ctsim.pdb" /machine:I386 /out:"Release/ctsim.exe" /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" \r
-".\Release\ctsim.obj"\r
-".\Release\dialogs.obj"\r
-".\Release\dlgprojections.obj"\r
-".\Release\dlgreconstruct.obj"\r
-".\Release\docs.obj"\r
-".\Release\views.obj"\r
-".\Release\wx.res"\r
-"\ctsim-2.0.6\msvc\libctsim\Release\libctsim.lib"\r
-"\fftw-2.1.3\Win32\FFTW2st\Release\FFTW2st.lib"\r
-"\fftw-2.1.3\Win32\RFFTW2st\Release\RFFTW2st.lib"\r
-"\wx2\lib\wx.lib"\r
+comctl32.lib winmm.lib rpcrt4.lib ws2_32.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 ../libctsim/Debug/libctsim.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 ..\..\..\lpng108\msvc\win32\libpng\lib_dbg\libpng.lib ..\..\..\lpng108\msvc\win32\zlib\lib_dbg\zlib.lib libcmtd.lib ..\..\..\fftw-2.1.3\Win32\FFTW2st\Debug\FFTW2st.lib ..\..\..\fftw-2.1.3\Win32\RFFTW2st\Debug\RFFTW2st.lib ../../../wx2/lib/wxd.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:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" \r
+".\Debug\ctsim.obj"\r
+".\Debug\dialogs.obj"\r
+".\Debug\dlgprojections.obj"\r
+".\Debug\dlgreconstruct.obj"\r
+".\Debug\docs.obj"\r
+".\Debug\views.obj"\r
+".\Debug\wx.res"\r
+"\ctsim-2.0.6\msvc\libctsim\Debug\libctsim.lib"\r
+"\fftw-2.1.3\Win32\FFTW2st\Debug\FFTW2st.lib"\r
+"\fftw-2.1.3\Win32\RFFTW2st\Debug\RFFTW2st.lib"\r
+"\wx2\lib\wxd.lib"\r
 ]\r
-Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP115.tmp"\r
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP19.tmp"\r
 <h3>Output Window</h3>\r
 Compiling...\r
 ctsim.cpp\r
+dlgprojections.cpp\r
+dlgreconstruct.cpp\r
 docs.cpp\r
 views.cpp\r
 Linking...\r
+Creating command line "bscmake.exe /nologo /o"Debug/ctsim.bsc"  ".\Debug\ctsim.sbr" ".\Debug\dialogs.sbr" ".\Debug\dlgprojections.sbr" ".\Debug\dlgreconstruct.sbr" ".\Debug\docs.sbr" ".\Debug\views.sbr""\r
+Creating browse info file...\r
+<h3>Output Window</h3>\r
+\r
+\r
+\r
+<h3>Results</h3>\r
+ctsim.exe - 0 error(s), 0 warning(s)\r
+<h3>\r
+--------------------Configuration: if1 - Win32 Release--------------------\r
+</h3>\r
+<h3>Command Lines</h3>\r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1B.tmp" with contents\r
+[\r
+wx.lib libctsim.lib zlib.lib comctl32.lib wsock32.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 libpng.lib /nologo /subsystem:console /incremental:no /pdb:"Release/if1.pdb" /machine:I386 /out:"Release/if1.exe" /libpath:"..\libctsim\Release" /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\wx2\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" \r
+".\Release\if1.obj"\r
+"\ctsim-2.0.6\msvc\libctsim\Release\libctsim.lib"\r
+]\r
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1B.tmp"\r
+<h3>Output Window</h3>\r
+Linking...\r
+\r
+\r
+\r
+<h3>Results</h3>\r
+if1.exe - 0 error(s), 0 warning(s)\r
+<h3>\r
+--------------------Configuration: if1 - Win32 Debug--------------------\r
+</h3>\r
+<h3>Command Lines</h3>\r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1D.tmp" with contents\r
+[\r
+comctl32.lib winmm.lib rpcrt4.lib ws2_32.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 ../libctsim/Debug/libctsim.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 ..\..\..\lpng108\msvc\win32\libpng\lib_dbg\libpng.lib ..\..\..\lpng108\msvc\win32\zlib\lib_dbg\zlib.lib libcmtd.lib ..\..\..\fftw-2.1.3\Win32\FFTW2st\Debug\FFTW2st.lib ..\..\..\fftw-2.1.3\Win32\RFFTW2st\Debug\RFFTW2st.lib ../../../wx2/lib/wxd.lib /nologo /subsystem:console /incremental:yes /pdb:"Debug/if1.pdb" /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrtd.lib" /out:"Debug/if1.exe" /pdbtype:sept /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" \r
+".\Debug\if1.obj"\r
+"\ctsim-2.0.6\msvc\libctsim\Debug\libctsim.lib"\r
+]\r
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1D.tmp"\r
+<h3>Output Window</h3>\r
+Linking...\r
+\r
+\r
+\r
+<h3>Results</h3>\r
+if1.exe - 0 error(s), 0 warning(s)\r
+<h3>\r
+--------------------Configuration: if2 - Win32 Release--------------------\r
+</h3>\r
+<h3>Command Lines</h3>\r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1E.tmp" with contents\r
+[\r
+wx.lib libctsim.lib zlib.lib comctl32.lib wsock32.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 libpng.lib /nologo /subsystem:console /incremental:no /pdb:"Release/if2.pdb" /machine:I386 /out:"Release/if2.exe" /libpath:"..\libctsim\Release" /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\wx2\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" \r
+".\Release\if2.obj"\r
+"\ctsim-2.0.6\msvc\libctsim\Release\libctsim.lib"\r
+]\r
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1E.tmp"\r
+<h3>Output Window</h3>\r
+Linking...\r
+\r
+\r
+\r
+<h3>Results</h3>\r
+if2.exe - 0 error(s), 0 warning(s)\r
+<h3>\r
+--------------------Configuration: if2 - Win32 Debug--------------------\r
+</h3>\r
+<h3>Command Lines</h3>\r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP20.tmp" with contents\r
+[\r
+comctl32.lib winmm.lib rpcrt4.lib ws2_32.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 ../libctsim/Debug/libctsim.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 ..\..\..\lpng108\msvc\win32\libpng\lib_dbg\libpng.lib ..\..\..\lpng108\msvc\win32\zlib\lib_dbg\zlib.lib libcmtd.lib ..\..\..\fftw-2.1.3\Win32\FFTW2st\Debug\FFTW2st.lib ..\..\..\fftw-2.1.3\Win32\RFFTW2st\Debug\RFFTW2st.lib ../../../wx2/lib/wxd.lib /nologo /subsystem:console /incremental:yes /pdb:"Debug/if2.pdb" /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrtd.lib" /out:"Debug/if2.exe" /pdbtype:sept /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" \r
+".\Debug\if2.obj"\r
+"\ctsim-2.0.6\msvc\libctsim\Debug\libctsim.lib"\r
+]\r
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP20.tmp"\r
+<h3>Output Window</h3>\r
+Linking...\r
+\r
+\r
+\r
+<h3>Results</h3>\r
+if2.exe - 0 error(s), 0 warning(s)\r
+<h3>\r
+--------------------Configuration: ifexport - Win32 Release--------------------\r
+</h3>\r
+<h3>Command Lines</h3>\r
+\r
+\r
+\r
+<h3>Results</h3>\r
+ifexport.exe - 0 error(s), 0 warning(s)\r
+<h3>\r
+--------------------Configuration: ifexport - Win32 Debug--------------------\r
+</h3>\r
+<h3>Command Lines</h3>\r
+\r
+\r
+\r
+<h3>Results</h3>\r
+ifexport.exe - 0 error(s), 0 warning(s)\r
+<h3>\r
+--------------------Configuration: ifinfo - Win32 Release--------------------\r
+</h3>\r
+<h3>Command Lines</h3>\r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP21.tmp" with contents\r
+[\r
+wx.lib libctsim.lib zlib.lib comctl32.lib wsock32.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 libpng.lib /nologo /subsystem:console /incremental:no /pdb:"Release/ifinfo.pdb" /machine:I386 /out:"Release/ifinfo.exe" /libpath:"..\libctsim\Release" /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\wx2\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" \r
+".\Release\ifinfo.obj"\r
+"\ctsim-2.0.6\msvc\libctsim\Release\libctsim.lib"\r
+]\r
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP21.tmp"\r
+<h3>Output Window</h3>\r
+Linking...\r
+\r
+\r
+\r
+<h3>Results</h3>\r
+ifinfo.exe - 0 error(s), 0 warning(s)\r
+<h3>\r
+--------------------Configuration: ifinfo - Win32 Debug--------------------\r
+</h3>\r
+<h3>Command Lines</h3>\r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP23.tmp" with contents\r
+[\r
+rpcrt4.lib comctl32.lib wsock32.lib ../libctsim/Debug/libctsim.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 ..\..\..\lpng108\msvc\win32\libpng\lib_dbg\libpng.lib ..\..\..\lpng108\msvc\win32\zlib\lib_dbg\zlib.lib libcpd.lib libcd.lib ..\..\..\fftw-2.1.3\Win32\FFTW2st\Debug\FFTW2st.lib ..\..\..\fftw-2.1.3\Win32\RFFTW2st\Debug\RFFTW2st.lib /nologo /subsystem:console /incremental:yes /pdb:"Debug/ifinfo.pdb" /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /nodefaultlib /out:"Debug/ifinfo.exe" /pdbtype:sept \r
+".\Debug\ifinfo.obj"\r
+"\ctsim-2.0.6\msvc\libctsim\Debug\libctsim.lib"\r
+]\r
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP23.tmp"\r
+<h3>Output Window</h3>\r
+Linking...\r
+\r
+\r
+\r
+<h3>Results</h3>\r
+ifinfo.exe - 0 error(s), 0 warning(s)\r
+<h3>\r
+--------------------Configuration: libpng - Win32 LIB--------------------\r
+</h3>\r
+<h3>Command Lines</h3>\r
+\r
+\r
+\r
+<h3>Results</h3>\r
+libpng.lib - 0 error(s), 0 warning(s)\r
+<h3>\r
+--------------------Configuration: libpng - Win32 LIB Debug--------------------\r
+</h3>\r
+<h3>Command Lines</h3>\r
+\r
+\r
+\r
+<h3>Results</h3>\r
+libpng.lib - 0 error(s), 0 warning(s)\r
+<h3>\r
+--------------------Configuration: phm2if - Win32 Release--------------------\r
+</h3>\r
+<h3>Command Lines</h3>\r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP24.tmp" with contents\r
+[\r
+wx.lib libctsim.lib zlib.lib comctl32.lib wsock32.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 libpng.lib /nologo /subsystem:console /incremental:no /pdb:"Release/phm2if.pdb" /machine:I386 /out:"Release/phm2if.exe" /libpath:"..\libctsim\Release" /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\wx2\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" \r
+".\Release\phm2if.obj"\r
+"\ctsim-2.0.6\msvc\libctsim\Release\libctsim.lib"\r
+]\r
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP24.tmp"\r
+<h3>Output Window</h3>\r
+Linking...\r
 LINK : warning LNK4089: all references to "ADVAPI32.dll" discarded by /OPT:REF\r
 LINK : warning LNK4089: all references to "WSOCK32.dll" discarded by /OPT:REF\r
-Creating command line "bscmake.exe /nologo /o"Release/ctsim.bsc"  ".\Release\ctsim.sbr" ".\Release\dialogs.sbr" ".\Release\dlgprojections.sbr" ".\Release\dlgreconstruct.sbr" ".\Release\docs.sbr" ".\Release\views.sbr""\r
-Creating browse info file...\r
+\r
+\r
+\r
+<h3>Results</h3>\r
+phm2if.exe - 0 error(s), 2 warning(s)\r
+<h3>\r
+--------------------Configuration: phm2if - Win32 Debug--------------------\r
+</h3>\r
+<h3>Command Lines</h3>\r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP26.tmp" with contents\r
+[\r
+comctl32.lib winmm.lib rpcrt4.lib ws2_32.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 ../libctsim/Debug/libctsim.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 ..\..\..\lpng108\msvc\win32\libpng\lib_dbg\libpng.lib ..\..\..\lpng108\msvc\win32\zlib\lib_dbg\zlib.lib libcmtd.lib ..\..\..\fftw-2.1.3\Win32\FFTW2st\Debug\FFTW2st.lib ..\..\..\fftw-2.1.3\Win32\RFFTW2st\Debug\RFFTW2st.lib ../../../wx2/lib/wxd.lib /nologo /subsystem:console /incremental:yes /pdb:"Debug/phm2if.pdb" /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrtd.lib" /out:"Debug/phm2if.exe" /pdbtype:sept /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" \r
+".\Debug\phm2if.obj"\r
+"\ctsim-2.0.6\msvc\libctsim\Debug\libctsim.lib"\r
+]\r
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP26.tmp"\r
+<h3>Output Window</h3>\r
+Linking...\r
+\r
+\r
+\r
+<h3>Results</h3>\r
+phm2if.exe - 0 error(s), 0 warning(s)\r
+<h3>\r
+--------------------Configuration: phm2pj - Win32 Release--------------------\r
+</h3>\r
+<h3>Command Lines</h3>\r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP27.tmp" with contents\r
+[\r
+wx.lib libctsim.lib zlib.lib comctl32.lib wsock32.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 libpng.lib /nologo /subsystem:console /incremental:no /pdb:"Release/phm2pj.pdb" /machine:I386 /out:"Release/phm2pj.exe" /libpath:"..\libctsim\Release" /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\wx2\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" \r
+".\Release\phm2pj.obj"\r
+"\ctsim-2.0.6\msvc\libctsim\Release\libctsim.lib"\r
+]\r
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP27.tmp"\r
+<h3>Output Window</h3>\r
+Linking...\r
+LINK : warning LNK4089: all references to "ADVAPI32.dll" discarded by /OPT:REF\r
+LINK : warning LNK4089: all references to "WSOCK32.dll" discarded by /OPT:REF\r
+\r
+\r
+\r
+<h3>Results</h3>\r
+phm2pj.exe - 0 error(s), 2 warning(s)\r
+<h3>\r
+--------------------Configuration: phm2pj - Win32 Debug--------------------\r
+</h3>\r
+<h3>Command Lines</h3>\r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP29.tmp" with contents\r
+[\r
+comctl32.lib winmm.lib rpcrt4.lib ws2_32.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 ../libctsim/Debug/libctsim.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 ..\..\..\lpng108\msvc\win32\libpng\lib_dbg\libpng.lib ..\..\..\lpng108\msvc\win32\zlib\lib_dbg\zlib.lib libcmtd.lib ..\..\..\fftw-2.1.3\Win32\FFTW2st\Debug\FFTW2st.lib ..\..\..\fftw-2.1.3\Win32\RFFTW2st\Debug\RFFTW2st.lib ../../../wx2/lib/wxd.lib /nologo /subsystem:console /incremental:yes /pdb:"Debug/phm2pj.pdb" /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrtd.lib" /out:"Debug/phm2pj.exe" /pdbtype:sept /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" \r
+".\Debug\phm2pj.obj"\r
+"\ctsim-2.0.6\msvc\libctsim\Debug\libctsim.lib"\r
+]\r
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP29.tmp"\r
+<h3>Output Window</h3>\r
+Linking...\r
+\r
+\r
+\r
+<h3>Results</h3>\r
+phm2pj.exe - 0 error(s), 0 warning(s)\r
+<h3>\r
+--------------------Configuration: pj2if - Win32 Release--------------------\r
+</h3>\r
+<h3>Command Lines</h3>\r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP2A.tmp" with contents\r
+[\r
+wx.lib libctsim.lib zlib.lib comctl32.lib wsock32.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 libpng.lib /nologo /subsystem:console /incremental:no /pdb:"Release/pj2if.pdb" /machine:I386 /out:"Release/pj2if.exe" /libpath:"..\libctsim\Release" /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\wx2\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" \r
+".\Release\pj2if.obj"\r
+"\ctsim-2.0.6\msvc\libctsim\Release\libctsim.lib"\r
+"\wx2\lib\wx.lib"\r
+]\r
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP2A.tmp"\r
+<h3>Output Window</h3>\r
+Linking...\r
+LINK : warning LNK4089: all references to "ADVAPI32.dll" discarded by /OPT:REF\r
+LINK : warning LNK4089: all references to "WSOCK32.dll" discarded by /OPT:REF\r
+\r
+\r
+\r
+<h3>Results</h3>\r
+pj2if.exe - 0 error(s), 2 warning(s)\r
+<h3>\r
+--------------------Configuration: pj2if - Win32 Debug--------------------\r
+</h3>\r
+<h3>Command Lines</h3>\r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP2C.tmp" with contents\r
+[\r
+comctl32.lib winmm.lib rpcrt4.lib ws2_32.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 ../libctsim/Debug/libctsim.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 ..\..\..\lpng108\msvc\win32\libpng\lib_dbg\libpng.lib ..\..\..\lpng108\msvc\win32\zlib\lib_dbg\zlib.lib libcmtd.lib ..\..\..\fftw-2.1.3\Win32\FFTW2st\Debug\FFTW2st.lib ..\..\..\fftw-2.1.3\Win32\RFFTW2st\Debug\RFFTW2st.lib ../../../wx2/lib/wxd.lib /nologo /subsystem:console /incremental:yes /pdb:"Debug/pj2if.pdb" /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrtd.lib" /out:"Debug/pj2if.exe" /pdbtype:sept /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" \r
+".\Debug\pj2if.obj"\r
+"\ctsim-2.0.6\msvc\libctsim\Debug\libctsim.lib"\r
+"\wx2\lib\wxd.lib"\r
+]\r
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP2C.tmp"\r
+<h3>Output Window</h3>\r
+Linking...\r
+\r
+\r
+\r
+<h3>Results</h3>\r
+pj2if.exe - 0 error(s), 0 warning(s)\r
+<h3>\r
+--------------------Configuration: pjinfo - Win32 Release--------------------\r
+</h3>\r
+<h3>Command Lines</h3>\r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP2D.tmp" with contents\r
+[\r
+wx.lib libctsim.lib zlib.lib comctl32.lib wsock32.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 libpng.lib /nologo /subsystem:console /incremental:no /pdb:"Release/pjinfo.pdb" /machine:I386 /out:"Release/pjinfo.exe" /libpath:"..\libctsim\Release" /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\wx2\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" \r
+".\Release\pjinfo.obj"\r
+"\fftw-2.1.3\Win32\FFTW2st\Release\FFTW2st.lib"\r
+"\ctsim-2.0.6\msvc\libctsim\Release\libctsim.lib"\r
+"\fftw-2.1.3\Win32\RFFTW2st\Release\RFFTW2st.lib"\r
+"\wx2\lib\wx.lib"\r
+]\r
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP2D.tmp"\r
+<h3>Output Window</h3>\r
+Linking...\r
+LINK : warning LNK4089: all references to "ADVAPI32.dll" discarded by /OPT:REF\r
+LINK : warning LNK4089: all references to "WSOCK32.dll" discarded by /OPT:REF\r
+\r
+\r
+\r
+<h3>Results</h3>\r
+pjinfo.exe - 0 error(s), 2 warning(s)\r
+<h3>\r
+--------------------Configuration: pjinfo - Win32 Debug--------------------\r
+</h3>\r
+<h3>Command Lines</h3>\r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP2F.tmp" with contents\r
+[\r
+comctl32.lib winmm.lib rpcrt4.lib ws2_32.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 ../libctsim/Debug/libctsim.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 ..\..\..\lpng108\msvc\win32\libpng\lib_dbg\libpng.lib ..\..\..\lpng108\msvc\win32\zlib\lib_dbg\zlib.lib libcmtd.lib ..\..\..\fftw-2.1.3\Win32\FFTW2st\Debug\FFTW2st.lib ..\..\..\fftw-2.1.3\Win32\RFFTW2st\Debug\RFFTW2st.lib ../../../wx2/lib/wxd.lib /nologo /subsystem:console /incremental:yes /pdb:"Debug/pjinfo.pdb" /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrtd.lib" /out:"Debug/pjinfo.exe" /pdbtype:sept /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" \r
+".\Debug\pjinfo.obj"\r
+"\fftw-2.1.3\Win32\FFTW2st\Debug\FFTW2st.lib"\r
+"\ctsim-2.0.6\msvc\libctsim\Debug\libctsim.lib"\r
+"\fftw-2.1.3\Win32\RFFTW2st\Debug\RFFTW2st.lib"\r
+"\wx2\lib\wxd.lib"\r
+]\r
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP2F.tmp"\r
 <h3>Output Window</h3>\r
+Linking...\r
+\r
+\r
+\r
+<h3>Results</h3>\r
+pjinfo.exe - 0 error(s), 0 warning(s)\r
+<h3>\r
+--------------------Configuration: pjrec - Win32 Release--------------------\r
+</h3>\r
+<h3>Command Lines</h3>\r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP30.tmp" with contents\r
+[\r
+wx.lib libctsim.lib zlib.lib comctl32.lib wsock32.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 libpng.lib /nologo /subsystem:console /incremental:no /pdb:"Release/pjrec.pdb" /machine:I386 /out:"Release/pjrec.exe" /libpath:"..\libctsim\Release" /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\wx2\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" \r
+".\Release\pjrec.obj"\r
+"\fftw-2.1.3\Win32\FFTW2st\Release\FFTW2st.lib"\r
+"\fftw-2.1.3\Win32\RFFTW2st\Release\RFFTW2st.lib"\r
+"\wx2\lib\wx.lib"\r
+"\ctsim-2.0.6\msvc\libctsim\Release\libctsim.lib"\r
+]\r
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP30.tmp"\r
+<h3>Output Window</h3>\r
+Linking...\r
+LINK : warning LNK4089: all references to "ADVAPI32.dll" discarded by /OPT:REF\r
+LINK : warning LNK4089: all references to "WSOCK32.dll" discarded by /OPT:REF\r
+\r
+\r
+\r
+<h3>Results</h3>\r
+pjrec.exe - 0 error(s), 2 warning(s)\r
+<h3>\r
+--------------------Configuration: pjrec - Win32 Debug--------------------\r
+</h3>\r
+<h3>Command Lines</h3>\r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP32.tmp" with contents\r
+[\r
+comctl32.lib winmm.lib rpcrt4.lib ws2_32.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 ../libctsim/Debug/libctsim.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 ..\..\..\lpng108\msvc\win32\libpng\lib_dbg\libpng.lib ..\..\..\lpng108\msvc\win32\zlib\lib_dbg\zlib.lib libcmtd.lib ..\..\..\fftw-2.1.3\Win32\FFTW2st\Debug\FFTW2st.lib ..\..\..\fftw-2.1.3\Win32\RFFTW2st\Debug\RFFTW2st.lib ../../../wx2/lib/wxd.lib /nologo /subsystem:console /incremental:yes /pdb:"Debug/pjrec.pdb" /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrtd.lib" /out:"Debug/pjrec.exe" /pdbtype:sept /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" \r
+".\Debug\pjrec.obj"\r
+"\fftw-2.1.3\Win32\FFTW2st\Debug\FFTW2st.lib"\r
+"\fftw-2.1.3\Win32\RFFTW2st\Debug\RFFTW2st.lib"\r
+"\wx2\lib\wxd.lib"\r
+"\ctsim-2.0.6\msvc\libctsim\Debug\libctsim.lib"\r
+]\r
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP32.tmp"\r
+<h3>Output Window</h3>\r
+Linking...\r
+\r
+\r
+\r
+<h3>Results</h3>\r
+pjrec.exe - 0 error(s), 0 warning(s)\r
+<h3>\r
+--------------------Configuration: wxvc - Win32 LIB Debug--------------------\r
+</h3>\r
+<h3>Command Lines</h3>\r
 \r
 \r
 \r
 <h3>Results</h3>\r
-ctsim.exe - 0 error(s), 2 warning(s)\r
+wxd.lib - 0 error(s), 0 warning(s)\r
 </pre>\r
 </body>\r
 </html>\r

diff --git a/tools/if2.cpp b/tools/if2.cpp
index 8c6ad065ca3044e7703faa48649e1b4f062dbf62..ce6d3da9505236577646a560e5fcdb8b7a97a46e 100644 (file)
--- a/tools/if2.cpp
+++ b/tools/if2.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: if2.cpp,v 1.1 2000/12/18 00:24:39 kevin Exp $
+**  $Id: if2.cpp,v 1.2 2000/12/18 13:39:15 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
@@ -45,7 +45,7 @@ static struct option my_options[] =
   {0, 0, 0, 0}
 };
 
-static const char* g_szIdStr = "$Id: if2.cpp,v 1.1 2000/12/18 00:24:39 kevin Exp $";
+static const char* g_szIdStr = "$Id: if2.cpp,v 1.2 2000/12/18 13:39:15 kevin Exp $";
 
 void 
 if2_usage (const char *program)
@@ -290,8 +290,7 @@ if2_main (int argc, char *const argv[])
        delete v2Row;\r
   }
 
-\r
-       if (opt_outputFile) {
+  if (opt_outputFile) {
     pim_out->labelsCopy (im_in1, "if2 file 1: ");
     pim_out->labelsCopy (im_in2, "if2 file 2: ");
     pim_out->labelAdd (Array2dFileLabel::L_HISTORY, strOperation.c_str(), timerProgram.timerEnd());