Revert "Update package dependency from libwxgtk3.0-dev to libwxgtk3.0-gtk3-dev for...

[ctsim.git] / msvc / libctsim / libctsim.dsp

diff --git a/msvc/libctsim/libctsim.dsp b/msvc/libctsim/libctsim.dsp
index 3d2fb65995a7c81943120e33d6a4e52d00d01e2a..8f7a90c684944b4f2c2b68230ef105362ea8f5c0 100644 (file)
--- a/msvc/libctsim/libctsim.dsp
+++ b/msvc/libctsim/libctsim.dsp
@@ -40,10 +40,8 @@ RSC=rc.exe
 # PROP Output_Dir "Release"\r
 # PROP Intermediate_Dir "Release"\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 /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 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
@@ -65,10 +63,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "Debug"\r
 # PROP Intermediate_Dir "Debug"\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 /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 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
@@ -94,19 +90,6 @@ SOURCE=..\..\libctsim\array2dfile.cpp
 # Begin Source File\r
 \r
 SOURCE=..\..\libctsim\backprojectors.cpp\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
-# ADD CPP /GR\r
-# SUBTRACT CPP /X\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -118,6 +101,10 @@ SOURCE=..\..\libctsupport\consoleio.cpp
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\libctsim\ctndicom.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\libctgraphics\ezplot.cpp\r
 # End Source File\r
 # Begin Source File\r
@@ -142,19 +129,19 @@ SOURCE=..\..\libctsim\fourier.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\getopt\getopt.c\r
+SOURCE=..\..\libctsupport\globalvars.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\getopt\getopt1.c\r
+SOURCE=..\..\libctsupport\hashtable.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\libctsupport\hashtable.cpp\r
+SOURCE=..\..\libctsim\imagefile.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\libctsim\imagefile.cpp\r
+SOURCE=..\..\libctsupport\interpolator.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -162,6 +149,10 @@ SOURCE=..\..\libctsupport\mathfuncs.cpp
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\libctsupport\msvc.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\libctsim\phantom.cpp\r
 # End Source File\r
 # Begin Source File\r
@@ -234,6 +225,14 @@ SOURCE=..\..\include\ct.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\ctglobals.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\ctndicom.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\ctsupport.h\r
 # End Source File\r
 # Begin Source File\r
@@ -254,15 +253,15 @@ SOURCE=..\..\include\fourier.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\getopt\getopt.h\r
+SOURCE=..\..\include\hashtable.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\hashtable.h\r
+SOURCE=..\..\include\imagefile.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\imagefile.h\r
+SOURCE=..\..\include\interpolator.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -274,6 +273,10 @@ SOURCE=..\..\include\msvc_compat.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\nographics.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\phantom.h\r
 # End Source File\r
 # Begin Source File\r