projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r327: Added textfile output
[ctsim.git]
/
msvc
/
libctsim
/
libctsim.dsp
diff --git
a/msvc/libctsim/libctsim.dsp
b/msvc/libctsim/libctsim.dsp
index 524a13d64fd5eb081947f0a8ae6dc12ce494adc3..bee0059cd9d14a0173ada3182da74cb72747c652 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
# 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 "..\..\..\zlib
" /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
# 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
# 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
# SUBTRACT CPP /X
\r
# ADD BASE RSC /l 0x409 /d "_DEBUG"
\r
# ADD RSC /l 0x409 /d "_DEBUG"
\r
@@
-90,272
+90,123
@@
LIB32=link.exe -lib
# Begin Source File
\r
\r
SOURCE=..\..\libctsim\array2dfile.cpp
\r
# 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
SOURCE=..\..\libctsim\backprojectors.cpp
\r
# End Source File
\r
# Begin Source File
\r
\r
SOURCE=..\..\libctsim\backprojectors.cpp
\r
-# ADD CPP /GR-
\r
-# SUBTRACT CPP /X
\r
-# End Source File
\r
-# Begin Source File
\r
-
\r
-SOURCE=..\..\libctsupport\clip.cpp
\r
\r
!IF "$(CFG)" == "libctsim - Win32 Release"
\r
\r
\r
!IF "$(CFG)" == "libctsim - Win32 Release"
\r
\r
+# ADD CPP /GR-
\r
+# SUBTRACT CPP /X
\r
+
\r
!ELSEIF "$(CFG)" == "libctsim - Win32 Debug"
\r
\r
!ELSEIF "$(CFG)" == "libctsim - Win32 Debug"
\r
\r
+# ADD CPP /GR
\r
+# SUBTRACT CPP /X
\r
+
\r
!ENDIF
\r
\r
# End Source File
\r
# Begin Source File
\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
+SOURCE=..\..\libctsupport\clip.cpp
\r
+# End Source File
\r
+# Begin Source File
\r
\r
\r
+SOURCE=..\..\libctsupport\consoleio.cpp
\r
# End Source File
\r
# Begin Source File
\r
\r
SOURCE=..\..\libctgraphics\ezplot.cpp
\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
# 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
# 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
# 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
# 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
# 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
# End Source File
\r
# Begin Source File
\r
\r
SOURCE=..\..\getopt\getopt1.c
\r
+# End Source File
\r
+# Begin Source File
\r
\r
\r
-!IF "$(CFG)" == "libctsim - Win32 Release"
\r
-
\r
-!ELSEIF "$(CFG)" == "libctsim - Win32 Debug"
\r
-
\r
-!ENDIF
\r
-
\r
+SOURCE=..\..\libctsupport\hashtable.cpp
\r
# End Source File
\r
# Begin Source File
\r
\r
SOURCE=..\..\libctsim\imagefile.cpp
\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
# 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
# End Source File
\r
# Begin Source File
\r
\r
SOURCE=..\..\libctsim\phantom.cpp
\r
+# End Source File
\r
+# Begin Source File
\r
\r
\r
-!IF "$(CFG)" == "libctsim - Win32 Release"
\r
-
\r
-!ELSEIF "$(CFG)" == "libctsim - Win32 Debug"
\r
-
\r
-!ENDIF
\r
-
\r
+SOURCE=..\..\libctsupport\plotfile.cpp
\r
# End Source File
\r
# Begin Source File
\r
\r
SOURCE=..\..\libctgraphics\pol.cpp
\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
# 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
# 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
# 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
# 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
# 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
# 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
# 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
# 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
# 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
# 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
# End Source File
\r
# End Group
\r
# Begin Group "Header Files"
\r
@@
-399,6
+250,10
@@
SOURCE=..\..\getopt\getopt.h
# End Source File
\r
# Begin Source File
\r
\r
# End Source File
\r
# Begin Source File
\r
\r
+SOURCE=..\..\include\hashtable.h
\r
+# End Source File
\r
+# Begin Source File
\r
+
\r
SOURCE=..\..\include\imagefile.h
\r
# End Source File
\r
# Begin Source File
\r
SOURCE=..\..\include\imagefile.h
\r
# End Source File
\r
# Begin Source File
\r
@@
-407,10
+262,18
@@
SOURCE=..\..\include\mpiworld.h
# End Source File
\r
# Begin Source File
\r
\r
# End Source File
\r
# Begin Source File
\r
\r
+SOURCE=..\..\include\msvc_compat.h
\r
+# End Source File
\r
+# Begin Source File
\r
+
\r
SOURCE=..\..\include\phantom.h
\r
# End Source File
\r
# Begin Source File
\r
\r
SOURCE=..\..\include\phantom.h
\r
# End Source File
\r
# Begin Source File
\r
\r
+SOURCE=..\..\include\plotfile.h
\r
+# End Source File
\r
+# Begin Source File
\r
+
\r
SOURCE=..\..\include\pol.h
\r
# End Source File
\r
# Begin Source File
\r
SOURCE=..\..\include\pol.h
\r
# End Source File
\r
# Begin Source File
\r