projects / ctsim.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
r557: no message
[ctsim.git] / msvc / ctsim / ctsim.dsp
diff --git a/msvc/ctsim/ctsim.dsp b/msvc/ctsim/ctsim.dsp
index f53ce27ab28ae24764c5e20f6250649437ff133f..6d159062db771ad15ae39e47e5431c61f8ef22f9 100644 (file)
--- a/msvc/ctsim/ctsim.dsp
+++ b/msvc/ctsim/ctsim.dsp
@@ -53,7 +53,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 /nologo /subsystem:windows /machine:I386
-# ADD LINK32 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 tiff.lib jpeg.lib png.lib zlib.lib xpm.lib opengl32.lib glu32.lib /nologo /subsystem:windows /machine:I386 /libpath:"\wx2.2.5\lib"
+# ADD LINK32 wsock32.lib tiff.lib jpeg.lib png.lib zlib.lib xpm.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 opengl32.lib glu32.lib htmlhelp.lib /nologo /subsystem:windows /machine:I386 /libpath:"\wx2.2.5\lib"
 
 !ELSEIF  "$(CFG)" == "ctsim - Win32 Debug"
 
@@ -79,7 +79,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 /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 libcmtd.lib ..\..\..\fftw-2.1.3\Win32\FFTW2st\Debug\FFTW2st.lib ..\..\..\fftw-2.1.3\Win32\RFFTW2st\Debug\RFFTW2st.lib wxd.lib xpmd.lib tiffd.lib zlibd.lib pngd.lib opengl32.lib glu32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /libpath:"\wx2.2.5\lib"
+# ADD LINK32 winmm.lib rpcrt4.lib ws2_32.lib ../libctsim/Debug/libctsim.lib libcmtd.lib ..\..\..\fftw-2.1.3\Win32\FFTW2st\Debug\FFTW2st.lib ..\..\..\fftw-2.1.3\Win32\RFFTW2st\Debug\RFFTW2st.lib wxd.lib xpmd.lib tiffd.lib zlibd.lib pngd.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 opengl32.lib glu32.lib htmlhelp.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /libpath:"\wx2.2.5\lib"
 # SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
@@ -94,117 +94,42 @@ LINK32=link.exe
 # Begin Source File
 
 SOURCE=..\..\src\ctsim.cpp
-
-!IF  "$(CFG)" == "ctsim - Win32 Release"
-
-# ADD CPP /I "..\..\..\fftw-2.1.3\fftw" /D CTSIMVERSION=\"3.0.0alpha5\"
-# SUBTRACT CPP /D CTSIMVERSION=\"3.0.0beta1\"
-
-!ELSEIF  "$(CFG)" == "ctsim - Win32 Debug"
-
 # ADD CPP /D CTSIMVERSION=\"3.0.0alpha5\"
 # SUBTRACT CPP /D CTSIMVERSION=\"3.0.0beta1\"
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 
 SOURCE=..\..\src\dialogs.cpp
-
-!IF  "$(CFG)" == "ctsim - Win32 Release"
-
-# ADD CPP /I "..\..\..\fftw-2.1.3\fftw" /D CTSIMVERSION=\"3.0.0alpha5\"
-# SUBTRACT CPP /D CTSIMVERSION=\"3.0.0beta1\"
-
-!ELSEIF  "$(CFG)" == "ctsim - Win32 Debug"
-
 # ADD CPP /D CTSIMVERSION=\"3.0.0alpha5\"
 # SUBTRACT CPP /D CTSIMVERSION=\"3.0.0beta1\"
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 
 SOURCE=..\..\src\dlgprojections.cpp
-
-!IF  "$(CFG)" == "ctsim - Win32 Release"
-
-# ADD CPP /I "..\..\..\fftw-2.1.3\fftw" /D CTSIMVERSION=\"3.0.0alpha5\"
-# SUBTRACT CPP /D CTSIMVERSION=\"3.0.0beta1\"
-
-!ELSEIF  "$(CFG)" == "ctsim - Win32 Debug"
-
 # ADD CPP /D CTSIMVERSION=\"3.0.0alpha5\"
 # SUBTRACT CPP /D CTSIMVERSION=\"3.0.0beta1\"
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 
 SOURCE=..\..\src\dlgreconstruct.cpp
-
-!IF  "$(CFG)" == "ctsim - Win32 Release"
-
-# ADD CPP /I "..\..\..\fftw-2.1.3\fftw" /D CTSIMVERSION=\"3.0.0alpha5\"
-# SUBTRACT CPP /D CTSIMVERSION=\"3.0.0beta1\"
-
-!ELSEIF  "$(CFG)" == "ctsim - Win32 Debug"
-
 # ADD CPP /D CTSIMVERSION=\"3.0.0alpha5\"
 # SUBTRACT CPP /D CTSIMVERSION=\"3.0.0beta1\"
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 
 SOURCE=..\..\src\docs.cpp
-
-!IF  "$(CFG)" == "ctsim - Win32 Release"
-
-# ADD CPP /I "..\..\..\fftw-2.1.3\fftw" /D CTSIMVERSION=\"3.0.0alpha5\"
-# SUBTRACT CPP /D CTSIMVERSION=\"3.0.0beta1\"
-
-!ELSEIF  "$(CFG)" == "ctsim - Win32 Debug"
-
 # ADD CPP /D CTSIMVERSION=\"3.0.0alpha5\"
 # SUBTRACT CPP /D CTSIMVERSION=\"3.0.0beta1\"
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 
 SOURCE=..\..\src\graph3dview.cpp
-
-!IF  "$(CFG)" == "ctsim - Win32 Release"
-
-# ADD CPP /I "..\..\..\fftw-2.1.3\fftw"
-
-!ELSEIF  "$(CFG)" == "ctsim - Win32 Debug"
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 
 SOURCE=..\..\src\views.cpp
-
-!IF  "$(CFG)" == "ctsim - Win32 Release"
-
-# ADD CPP /I "..\..\..\fftw-2.1.3\fftw" /D CTSIMVERSION=\"3.0.0alpha5\"
-# SUBTRACT CPP /D CTSIMVERSION=\"3.0.0beta1\"
-
-!ELSEIF  "$(CFG)" == "ctsim - Win32 Debug"
-
 # ADD CPP /D CTSIMVERSION=\"3.0.0alpha5\"
 # SUBTRACT CPP /D CTSIMVERSION=\"3.0.0beta1\"
-
-!ENDIF 
-
 # End Source File
 # End Group
 # Begin Group "Header Files"
@@ -212,6 +137,10 @@ SOURCE=..\..\src\views.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
+SOURCE="..\..\src\ctsim-map.h"
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\ctsim.h
 # End Source File
 # Begin Source File
Computed Tomography simulator and reconstructor