r270: *** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 95aab3db0bd39a8b6ab3b77f99a400b608530131..ab4b002a246db82280be6cfbb43354ccccb44e90 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,14 @@
-2.0.7 - 12/16/00 
-   Modifications for Microsoft Visual C++ compilation 
+2.1.0 - 12/17/00 
+   Modifications for Microsoft Visual C++ compilation.
+   First Microsoft Windows GUI version
+   Improved sorting to find median in ImageFile::statistics
    Fixed core-dump bug in Array2dFile::labelsCopy() function (Ian Kay) 
    Improved pjinfo to output binary headers and view data, useful
        when manually compiling phantoms that vary during projection
        process. Thanks to Ian Kay for idea and code submission.
-   Changed code to explicitly use std:: namespace\r
+   Changed code to explicitly use std:: namespace rather than 
+       "namespace using std" statements
+   Changed reconstruction dialog to fix onto smaller screens
        
 2.0.6 - 12/03/00
    Fixed minor compilation problem with procsignal.h

diff --git a/configure.in b/configure.in
index 19ef4e0d789d2bbdbbe5941d28a9f327ac299222..95cfd99cc3c7254bd8d089a0e04389348ea3f071 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ dnl Must reset CDPATH so that bash's cd does not print to stdout
 dnl CDPATH=
 
 AC_INIT(src/ctsim.cpp)
-AM_INIT_AUTOMAKE(ctsim,2.0.7)
+AM_INIT_AUTOMAKE(ctsim,2.1.0)
 AM_CONFIG_HEADER(config.h)
 
 dnl Checks for programs.

diff --git a/msvc/ctsim.dsw b/msvc/ctsim.dsw
index 2f71a5153f5c1e824317239e9a3a6f2aa8cbcd20..23fb54a7ca06a75c517c29d055e1e4345e388105 100644 (file)
--- a/msvc/ctsim.dsw
+++ b/msvc/ctsim.dsw
@@ -50,6 +50,24 @@ Package=<4>
     Begin Project Dependency\r
     Project_Dep_Name libctsim\r
     End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name FFTW2st\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 pjrec\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name RFFTW2st\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxvc\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name zlib\r
+    End Project Dependency\r
 }}}\r
 \r
 ###############################################################################\r
@@ -62,9 +80,6 @@ Package=<5>
 \r
 Package=<4>\r
 {{{\r
-    Begin Project Dependency\r
-    Project_Dep_Name pjrec\r
-    End Project Dependency\r
 }}}\r
 \r
 ###############################################################################\r
@@ -77,6 +92,9 @@ Package=<5>
 \r
 Package=<4>\r
 {{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name zlib\r
+    End Project Dependency\r
 }}}\r
 \r
 ###############################################################################\r
@@ -89,6 +107,21 @@ Package=<5>
 \r
 Package=<4>\r
 {{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name FFTW2st\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 RFFTW2st\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxvc\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.dsp b/msvc/ctsim/ctsim.dsp
index c4aff7da75be11a96e928fe29d9595cb7f78aefe..c72adf302810ac7a4a2ca5bd7746985b4f60b0ef 100644 (file)
--- a/msvc/ctsim/ctsim.dsp
+++ b/msvc/ctsim/ctsim.dsp
@@ -43,11 +43,11 @@ 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 /W3 /GX /O2 /I "." /I "..\..\include" /I "..\..\getopt" /I "..\..\..\lpng108" /I "..\..\..\zlib" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /D "NDEBUG" /D "__WXWIN__" /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" /YX /FD /c\r
+# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "." /I "..\..\include" /I "..\..\getopt" /I "..\..\..\lpng108" /I "..\..\..\zlib" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /D "NDEBUG" /D "__WXWIN__" /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" /YX /FD /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\wx\msw" /d "NDEBUG"\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
@@ -73,13 +73,14 @@ LINK32=link.exe
 # 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
-# ADD RSC /l 0x409 /i "..\..\..\wx2\include\wx\msw" /d "_DEBUG"\r
+# ADD RSC /l 0x409 /i "\wx2\include\wx\msw" /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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 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 /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrtd.lib" /pdbtype:sept\r
+# ADD LINK32 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 /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrtd.lib" /pdbtype:sept\r
+# SUBTRACT LINK32 /nodefaultlib\r
 \r
 !ENDIF \r
 \r
@@ -106,27 +107,22 @@ SOURCE=..\..\src\ctsim.cpp
 # Begin Source File\r
 \r
 SOURCE=..\..\src\dialogs.cpp\r
-# ADD CPP /D "MSVC"\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\src\dlgprojections.cpp\r
-# ADD CPP /D "MSVC"\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\src\dlgreconstruct.cpp\r
-# ADD CPP /D "MSVC"\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\src\docs.cpp\r
-# ADD CPP /D "MSVC"\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\src\views.cpp\r
-# ADD CPP /D "MSVC"\r
 # End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r
@@ -138,7 +134,18 @@ SOURCE=..\..\src\views.cpp
 # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
 # Begin Source File\r
 \r
-SOURCE=../../include\wx/msw/wx.rc\r
+SOURCE=..\..\..\wx2\include\wx\msw\wx.rc\r
+\r
+!IF  "$(CFG)" == "ctsim - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "ctsim - Win32 Debug"\r
+\r
+# ADD BASE RSC /l 0x409 /i "\wx2\include\wx\msw"\r
+# SUBTRACT BASE RSC /i "\wx2\include\wx\msw"\r
+# ADD RSC /l 0x409 /i "\wx2\include" /i "\wx2\include\wx\msw"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # End Group\r
 # End Target\r

diff --git a/msvc/ctsim/ctsim.plg b/msvc/ctsim/ctsim.plg
index dda19171dbac59a41752d0e0bd256d4ed89dac76..cc5f910f79600854dd79a147db426a4ae9a54387 100644 (file)
--- a/msvc/ctsim/ctsim.plg
+++ b/msvc/ctsim/ctsim.plg
@@ -3,31 +3,40 @@
 <pre>\r
 <h1>Build Log</h1>\r
 <h3>\r
---------------------Configuration: ctsim - Win32 Release--------------------\r
+--------------------Configuration: ctsim - Win32 Debug--------------------\r
 </h3>\r
 <h3>Command Lines</h3>\r
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP2EE.tmp" with contents\r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP3B.tmp" with contents\r
 [\r
-ws2_32.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  ../../../wx2/lib/wx.lib ../../../lpng108/msvc/win32/zlib/lib/zlib.lib ../../../lpng108/msvc/win32/libpng/lib/libpng.lib ../../../fftw-2.1.3/Win32/FFTW2st/Release/FFTW2st.lib ../../../fftw-2.1.3/Win32/RFFTW2st/Release/RFFTW2st.lib ..\libctsim\Release\libctsim.lib /nologo /subsystem:windows /incremental:no /pdb:"Release/ctsim.pdb" /machine:I386 /nodefaultlib:"libc.lib" /out:"Release/ctsim.exe" \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\ctsim\libctsim\Release\libctsim.lib"\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 "_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" /FR"Debug/" /Fp"Debug/ctsim.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c \r
+"C:\ctsim-2.0.6\src\dialogs.cpp"\r
 ]\r
-Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP2EE.tmp"\r
+Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP3B.tmp" \r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP3C.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: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 \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\RSP3C.tmp"\r
 <h3>Output Window</h3>\r
+Compiling...\r
+dialogs.cpp\r
 Linking...\r
-LINK : warning LNK4089: all references to "ADVAPI32.dll" discarded by /OPT:REF\r
-LINK : warning LNK4089: all references to "WS2_32.dll" discarded by /OPT:REF\r
 \r
 \r
 \r
 <h3>Results</h3>\r
-ctsim.exe - 0 error(s), 2 warning(s)\r
+ctsim.exe - 0 error(s), 0 warning(s)\r
 </pre>\r
 </body>\r
 </html>\r

diff --git a/msvc/libctsim/libctsim.dsp b/msvc/libctsim/libctsim.dsp
index 524a13d64fd5eb081947f0a8ae6dc12ce494adc3..b1c9fad3a7d1a433c68b050e13b263525208ec69 100644 (file)
--- a/msvc/libctsim/libctsim.dsp
+++ b/msvc/libctsim/libctsim.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Target_Dir ""\r
 MTL=midl.exe\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c\r
-# ADD CPP /nologo /G6 /W3 /GR /GX /O2 /I "..\..\..\zlib113" /I "..\..\INCLUDE" /I "..\..\getopt" /I "..\..\..\lpng108" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /I "..\..\..\wx2\include" /D "NDEBUG" /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__" /YX /FD /c\r
+# ADD CPP /nologo /G6 /MT /W3 /GR /GX /O2 /I "..\..\..\zlib113" /I "..\..\INCLUDE" /I "..\..\getopt" /I "..\..\..\lpng108" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /I "..\..\..\wx2\include" /D "NDEBUG" /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__" /YX /FD /c\r
 # SUBTRACT CPP /X\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
 # ADD RSC /l 0x409 /d "NDEBUG"\r
@@ -67,7 +67,7 @@ LIB32=link.exe -lib
 # PROP Target_Dir ""\r
 MTL=midl.exe\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 /GR /GX /ZI /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 /YX /FD /GZ /c\r
+# ADD CPP /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 /YX /FD /GZ /c\r
 # SUBTRACT CPP /X\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
 # ADD RSC /l 0x409 /d "_DEBUG"\r
@@ -90,13 +90,6 @@ LIB32=link.exe -lib
 # Begin Source File\r
 \r
 SOURCE=..\..\libctsim\array2dfile.cpp\r
-\r
-!IF  "$(CFG)" == "libctsim - Win32 Release"\r
-\r
-!ELSEIF  "$(CFG)" == "libctsim - Win32 Debug"\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -107,255 +100,94 @@ SOURCE=..\..\libctsim\backprojectors.cpp
 # Begin Source File\r
 \r
 SOURCE=..\..\libctsupport\clip.cpp\r
-\r
-!IF  "$(CFG)" == "libctsim - Win32 Release"\r
-\r
-!ELSEIF  "$(CFG)" == "libctsim - Win32 Debug"\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\libctsupport\consoleio.cpp\r
-\r
-!IF  "$(CFG)" == "libctsim - Win32 Release"\r
-\r
-!ELSEIF  "$(CFG)" == "libctsim - Win32 Debug"\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\libctgraphics\ezplot.cpp\r
-\r
-!IF  "$(CFG)" == "libctsim - Win32 Release"\r
-\r
-!ELSEIF  "$(CFG)" == "libctsim - Win32 Debug"\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\libctgraphics\ezset.cpp\r
-\r
-!IF  "$(CFG)" == "libctsim - Win32 Release"\r
-\r
-!ELSEIF  "$(CFG)" == "libctsim - Win32 Debug"\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\libctgraphics\ezsupport.cpp\r
-\r
-!IF  "$(CFG)" == "libctsim - Win32 Release"\r
-\r
-!ELSEIF  "$(CFG)" == "libctsim - Win32 Debug"\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\libctsim\filter.cpp\r
-\r
-!IF  "$(CFG)" == "libctsim - Win32 Release"\r
-\r
-!ELSEIF  "$(CFG)" == "libctsim - Win32 Debug"\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\libctsupport\fnetorderstream.cpp\r
-\r
-!IF  "$(CFG)" == "libctsim - Win32 Release"\r
-\r
-!ELSEIF  "$(CFG)" == "libctsim - Win32 Debug"\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\getopt\getopt.c\r
-\r
-!IF  "$(CFG)" == "libctsim - Win32 Release"\r
-\r
-!ELSEIF  "$(CFG)" == "libctsim - Win32 Debug"\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\getopt\getopt1.c\r
-\r
-!IF  "$(CFG)" == "libctsim - Win32 Release"\r
-\r
-!ELSEIF  "$(CFG)" == "libctsim - Win32 Debug"\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\libctsim\imagefile.cpp\r
-\r
-!IF  "$(CFG)" == "libctsim - Win32 Release"\r
-\r
-!ELSEIF  "$(CFG)" == "libctsim - Win32 Debug"\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\libctsupport\mathfuncs.cpp\r
-\r
-!IF  "$(CFG)" == "libctsim - Win32 Release"\r
-\r
-!ELSEIF  "$(CFG)" == "libctsim - Win32 Debug"\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\libctsim\phantom.cpp\r
-\r
-!IF  "$(CFG)" == "libctsim - Win32 Release"\r
-\r
-!ELSEIF  "$(CFG)" == "libctsim - Win32 Debug"\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\libctgraphics\pol.cpp\r
-\r
-!IF  "$(CFG)" == "libctsim - Win32 Release"\r
-\r
-!ELSEIF  "$(CFG)" == "libctsim - Win32 Debug"\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\libctsim\procsignal.cpp\r
-\r
-!IF  "$(CFG)" == "libctsim - Win32 Release"\r
-\r
-!ELSEIF  "$(CFG)" == "libctsim - Win32 Debug"\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\libctsim\projections.cpp\r
-\r
-!IF  "$(CFG)" == "libctsim - Win32 Release"\r
-\r
-!ELSEIF  "$(CFG)" == "libctsim - Win32 Debug"\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\libctsim\reconstruct.cpp\r
-\r
-!IF  "$(CFG)" == "libctsim - Win32 Release"\r
-\r
-!ELSEIF  "$(CFG)" == "libctsim - Win32 Debug"\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\libctsim\scanner.cpp\r
-\r
-!IF  "$(CFG)" == "libctsim - Win32 Release"\r
-\r
-!ELSEIF  "$(CFG)" == "libctsim - Win32 Debug"\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\libctgraphics\sgp.cpp\r
-\r
-!IF  "$(CFG)" == "libctsim - Win32 Release"\r
-\r
-!ELSEIF  "$(CFG)" == "libctsim - Win32 Debug"\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\libctsupport\strfuncs.cpp\r
-\r
-!IF  "$(CFG)" == "libctsim - Win32 Release"\r
-\r
-!ELSEIF  "$(CFG)" == "libctsim - Win32 Debug"\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\libctsupport\syserror.cpp\r
-\r
-!IF  "$(CFG)" == "libctsim - Win32 Release"\r
-\r
-!ELSEIF  "$(CFG)" == "libctsim - Win32 Debug"\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\libctsim\trace.cpp\r
-\r
-!IF  "$(CFG)" == "libctsim - Win32 Release"\r
-\r
-!ELSEIF  "$(CFG)" == "libctsim - Win32 Debug"\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\libctgraphics\transformmatrix.cpp\r
-\r
-!IF  "$(CFG)" == "libctsim - Win32 Release"\r
-\r
-!ELSEIF  "$(CFG)" == "libctsim - Win32 Debug"\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\libctsupport\xform.cpp\r
-\r
-!IF  "$(CFG)" == "libctsim - Win32 Release"\r
-\r
-!ELSEIF  "$(CFG)" == "libctsim - Win32 Debug"\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r

diff --git a/msvc/pjrec/pjrec.dsp b/msvc/pjrec/pjrec.dsp
index 2004b6beb836290833f600f4433bdaef9b59eb10..8fadd4c46b961d9494949a1d47e5c56362c04083 100644 (file)
--- a/msvc/pjrec/pjrec.dsp
+++ b/msvc/pjrec/pjrec.dsp
@@ -42,7 +42,7 @@ 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 /W3 /GX /O2 /I "../../include" /I "../../getopt" /I "..\..\..\lpng108" /I "..\..\..\zlib113" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /D "NDEBUG" /D "HAVE_GETOPT_H" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "MSVC" /D "HAVE_STRING_H" /YX /FD /c\r
+# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../../include" /I "../../getopt" /I "..\..\..\lpng108" /I "..\..\..\zlib113" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /D "NDEBUG" /D "HAVE_GETOPT_H" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "MSVC" /D "HAVE_STRING_H" /YX /FD /c\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
 # ADD RSC /l 0x409 /d "NDEBUG"\r
 BSC32=bscmake.exe\r
@@ -66,7 +66,7 @@ LINK32=link.exe
 # 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 /GX /ZI /Od /I "../../include" /I "../../getopt" /I "..\..\..\lpng108" /I "..\..\..\zlib113" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /D "_DEBUG" /D "HAVE_GETOPT_H" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "MSVC" /D "HAVE_STRING_H" /FR /YX /FD /GZ /c\r
+# ADD CPP /nologo /G6 /MTd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /I "../../getopt" /I "..\..\..\lpng108" /I "..\..\..\zlib113" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /D "_DEBUG" /D "HAVE_GETOPT_H" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "MSVC" /D "HAVE_STRING_H" /FR /YX /FD /GZ /c\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
 # ADD RSC /l 0x409 /d "_DEBUG"\r
 BSC32=bscmake.exe\r
@@ -74,7 +74,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 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 ../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 /debug /machine:I386 /nodefaultlib /pdbtype:sept\r
+# ADD LINK32 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 /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /nodefaultlib /pdbtype:sept\r
 # SUBTRACT LINK32 /verbose /incremental:no\r
 \r
 !ENDIF \r