From dbd21ed1d289711579a94a5d5002f40bba8047b1 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Sun, 17 Dec 2000 19:10:01 +0000 Subject: [PATCH] r270: *** empty log message *** --- ChangeLog | 10 ++- configure.in | 2 +- msvc/ctsim.dsw | 39 ++++++++- msvc/ctsim/ctsim.dsp | 27 +++--- msvc/ctsim/ctsim.plg | 39 +++++---- msvc/libctsim/libctsim.dsp | 172 +------------------------------------ msvc/pjrec/pjrec.dsp | 6 +- 7 files changed, 90 insertions(+), 205 deletions(-) diff --git a/ChangeLog b/ChangeLog index 95aab3d..ab4b002 100644 --- 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 + 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 19ef4e0..95cfd99 100644 --- 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 2f71a51..23fb54a 100644 --- a/msvc/ctsim.dsw +++ b/msvc/ctsim.dsw @@ -50,6 +50,24 @@ Package=<4> Begin Project Dependency Project_Dep_Name libctsim End Project Dependency + Begin Project Dependency + Project_Dep_Name FFTW2st + End Project Dependency + Begin Project Dependency + Project_Dep_Name libpng + End Project Dependency + Begin Project Dependency + Project_Dep_Name pjrec + End Project Dependency + Begin Project Dependency + Project_Dep_Name RFFTW2st + End Project Dependency + Begin Project Dependency + Project_Dep_Name wxvc + End Project Dependency + Begin Project Dependency + Project_Dep_Name zlib + End Project Dependency }}} ############################################################################### @@ -62,9 +80,6 @@ Package=<5> Package=<4> {{{ - Begin Project Dependency - Project_Dep_Name pjrec - End Project Dependency }}} ############################################################################### @@ -77,6 +92,9 @@ Package=<5> Package=<4> {{{ + Begin Project Dependency + Project_Dep_Name zlib + End Project Dependency }}} ############################################################################### @@ -89,6 +107,21 @@ Package=<5> Package=<4> {{{ + Begin Project Dependency + Project_Dep_Name FFTW2st + End Project Dependency + Begin Project Dependency + Project_Dep_Name libpng + End Project Dependency + Begin Project Dependency + Project_Dep_Name RFFTW2st + End Project Dependency + Begin Project Dependency + Project_Dep_Name wxvc + End Project Dependency + Begin Project Dependency + Project_Dep_Name zlib + End Project Dependency }}} ############################################################################### diff --git a/msvc/ctsim/ctsim.dsp b/msvc/ctsim/ctsim.dsp index c4aff7d..c72adf3 100644 --- a/msvc/ctsim/ctsim.dsp +++ b/msvc/ctsim/ctsim.dsp @@ -43,11 +43,11 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# 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 +# 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 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /i "\wx2\include\wx\msw" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -73,13 +73,14 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /i "..\..\..\wx2\include\wx\msw" /d "_DEBUG" +# ADD RSC /l 0x409 /i "\wx2\include\wx\msw" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # 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 -# 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 +# 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 +# SUBTRACT LINK32 /nodefaultlib !ENDIF @@ -106,27 +107,22 @@ SOURCE=..\..\src\ctsim.cpp # Begin Source File SOURCE=..\..\src\dialogs.cpp -# ADD CPP /D "MSVC" # End Source File # Begin Source File SOURCE=..\..\src\dlgprojections.cpp -# ADD CPP /D "MSVC" # End Source File # Begin Source File SOURCE=..\..\src\dlgreconstruct.cpp -# ADD CPP /D "MSVC" # End Source File # Begin Source File SOURCE=..\..\src\docs.cpp -# ADD CPP /D "MSVC" # End Source File # Begin Source File SOURCE=..\..\src\views.cpp -# ADD CPP /D "MSVC" # End Source File # End Group # Begin Group "Header Files" @@ -138,7 +134,18 @@ SOURCE=..\..\src\views.cpp # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" # Begin Source File -SOURCE=../../include\wx/msw/wx.rc +SOURCE=..\..\..\wx2\include\wx\msw\wx.rc + +!IF "$(CFG)" == "ctsim - Win32 Release" + +!ELSEIF "$(CFG)" == "ctsim - Win32 Debug" + +# ADD BASE RSC /l 0x409 /i "\wx2\include\wx\msw" +# SUBTRACT BASE RSC /i "\wx2\include\wx\msw" +# ADD RSC /l 0x409 /i "\wx2\include" /i "\wx2\include\wx\msw" + +!ENDIF + # End Source File # End Group # End Target diff --git a/msvc/ctsim/ctsim.plg b/msvc/ctsim/ctsim.plg index dda1917..cc5f910 100644 --- a/msvc/ctsim/ctsim.plg +++ b/msvc/ctsim/ctsim.plg @@ -3,31 +3,40 @@ 
 
Build Log

 

---------------------Configuration: ctsim - Win32 Release--------------------
+--------------------Configuration: ctsim - Win32 Debug--------------------
 

 
Command Lines

-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP2EE.tmp" with contents
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP3B.tmp" with contents
 [
-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" 
-".\Release\ctsim.obj"
-".\Release\dialogs.obj"
-".\Release\dlgprojections.obj"
-".\Release\dlgreconstruct.obj"
-".\Release\docs.obj"
-".\Release\views.obj"
-".\Release\wx.res"
-"\CTSIM-2.0.6\ctsim\libctsim\Release\libctsim.lib"
+/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 
+"C:\ctsim-2.0.6\src\dialogs.cpp"
 ]
-Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP2EE.tmp"
+Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP3B.tmp" 
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP3C.tmp" with contents
+[
+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 
+".\Debug\ctsim.obj"
+".\Debug\dialogs.obj"
+".\Debug\dlgprojections.obj"
+".\Debug\dlgreconstruct.obj"
+".\Debug\docs.obj"
+".\Debug\views.obj"
+".\Debug\wx.res"
+"\ctsim-2.0.6\msvc\libctsim\Debug\libctsim.lib"
+"\fftw-2.1.3\Win32\FFTW2st\Debug\FFTW2st.lib"
+"\fftw-2.1.3\Win32\RFFTW2st\Debug\RFFTW2st.lib"
+"\wx2\lib\wxd.lib"
+]
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP3C.tmp"
 
Output Window

+Compiling...
+dialogs.cpp
 Linking...
-LINK : warning LNK4089: all references to "ADVAPI32.dll" discarded by /OPT:REF
-LINK : warning LNK4089: all references to "WS2_32.dll" discarded by /OPT:REF
 
 
 
 
Results

-ctsim.exe - 0 error(s), 2 warning(s)
+ctsim.exe - 0 error(s), 0 warning(s)
diff --git a/msvc/libctsim/libctsim.dsp b/msvc/libctsim/libctsim.dsp index 524a13d..b1c9fad 100644 --- a/msvc/libctsim/libctsim.dsp +++ b/msvc/libctsim/libctsim.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Target_Dir "" MTL=midl.exe # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# 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 +# 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 # SUBTRACT CPP /X # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" @@ -67,7 +67,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" MTL=midl.exe # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# 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 +# 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 # SUBTRACT CPP /X # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" @@ -90,13 +90,6 @@ LIB32=link.exe -lib # Begin Source File SOURCE=..\..\libctsim\array2dfile.cpp - -!IF "$(CFG)" == "libctsim - Win32 Release" - -!ELSEIF "$(CFG)" == "libctsim - Win32 Debug" - -!ENDIF - # End Source File # Begin Source File @@ -107,255 +100,94 @@ SOURCE=..\..\libctsim\backprojectors.cpp # Begin Source File SOURCE=..\..\libctsupport\clip.cpp - -!IF "$(CFG)" == "libctsim - Win32 Release" - -!ELSEIF "$(CFG)" == "libctsim - Win32 Debug" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\libctsupport\consoleio.cpp - -!IF "$(CFG)" == "libctsim - Win32 Release" - -!ELSEIF "$(CFG)" == "libctsim - Win32 Debug" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\libctgraphics\ezplot.cpp - -!IF "$(CFG)" == "libctsim - Win32 Release" - -!ELSEIF "$(CFG)" == "libctsim - Win32 Debug" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\libctgraphics\ezset.cpp - -!IF "$(CFG)" == "libctsim - Win32 Release" - -!ELSEIF "$(CFG)" == "libctsim - Win32 Debug" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\libctgraphics\ezsupport.cpp - -!IF "$(CFG)" == "libctsim - Win32 Release" - -!ELSEIF "$(CFG)" == "libctsim - Win32 Debug" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\libctsim\filter.cpp - -!IF "$(CFG)" == "libctsim - Win32 Release" - -!ELSEIF "$(CFG)" == "libctsim - Win32 Debug" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\libctsupport\fnetorderstream.cpp - -!IF "$(CFG)" == "libctsim - Win32 Release" - -!ELSEIF "$(CFG)" == "libctsim - Win32 Debug" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\getopt\getopt.c - -!IF "$(CFG)" == "libctsim - Win32 Release" - -!ELSEIF "$(CFG)" == "libctsim - Win32 Debug" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\getopt\getopt1.c - -!IF "$(CFG)" == "libctsim - Win32 Release" - -!ELSEIF "$(CFG)" == "libctsim - Win32 Debug" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\libctsim\imagefile.cpp - -!IF "$(CFG)" == "libctsim - Win32 Release" - -!ELSEIF "$(CFG)" == "libctsim - Win32 Debug" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\libctsupport\mathfuncs.cpp - -!IF "$(CFG)" == "libctsim - Win32 Release" - -!ELSEIF "$(CFG)" == "libctsim - Win32 Debug" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\libctsim\phantom.cpp - -!IF "$(CFG)" == "libctsim - Win32 Release" - -!ELSEIF "$(CFG)" == "libctsim - Win32 Debug" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\libctgraphics\pol.cpp - -!IF "$(CFG)" == "libctsim - Win32 Release" - -!ELSEIF "$(CFG)" == "libctsim - Win32 Debug" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\libctsim\procsignal.cpp - -!IF "$(CFG)" == "libctsim - Win32 Release" - -!ELSEIF "$(CFG)" == "libctsim - Win32 Debug" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\libctsim\projections.cpp - -!IF "$(CFG)" == "libctsim - Win32 Release" - -!ELSEIF "$(CFG)" == "libctsim - Win32 Debug" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\libctsim\reconstruct.cpp - -!IF "$(CFG)" == "libctsim - Win32 Release" - -!ELSEIF "$(CFG)" == "libctsim - Win32 Debug" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\libctsim\scanner.cpp - -!IF "$(CFG)" == "libctsim - Win32 Release" - -!ELSEIF "$(CFG)" == "libctsim - Win32 Debug" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\libctgraphics\sgp.cpp - -!IF "$(CFG)" == "libctsim - Win32 Release" - -!ELSEIF "$(CFG)" == "libctsim - Win32 Debug" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\libctsupport\strfuncs.cpp - -!IF "$(CFG)" == "libctsim - Win32 Release" - -!ELSEIF "$(CFG)" == "libctsim - Win32 Debug" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\libctsupport\syserror.cpp - -!IF "$(CFG)" == "libctsim - Win32 Release" - -!ELSEIF "$(CFG)" == "libctsim - Win32 Debug" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\libctsim\trace.cpp - -!IF "$(CFG)" == "libctsim - Win32 Release" - -!ELSEIF "$(CFG)" == "libctsim - Win32 Debug" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\libctgraphics\transformmatrix.cpp - -!IF "$(CFG)" == "libctsim - Win32 Release" - -!ELSEIF "$(CFG)" == "libctsim - Win32 Debug" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\libctsupport\xform.cpp - -!IF "$(CFG)" == "libctsim - Win32 Release" - -!ELSEIF "$(CFG)" == "libctsim - Win32 Debug" - -!ENDIF - # End Source File # End Group # Begin Group "Header Files" diff --git a/msvc/pjrec/pjrec.dsp b/msvc/pjrec/pjrec.dsp index 2004b6b..8fadd4c 100644 --- a/msvc/pjrec/pjrec.dsp +++ b/msvc/pjrec/pjrec.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# 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 +# 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 # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -66,7 +66,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# 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 +# 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 # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -74,7 +74,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # 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 -# 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 +# 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 # SUBTRACT LINK32 /verbose /incremental:no !ENDIF -- 2.34.1