projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r544: no message
[ctsim.git]
/
msvc
/
ctsim
/
ctsim.dsp
diff --git
a/msvc/ctsim/ctsim.dsp
b/msvc/ctsim/ctsim.dsp
index 65d1abd202cc306258a9e0c1b265b271b079eb0c..0b57a6bca6ec80124741b8519d1e4dfc57dbe49f 100644
(file)
--- a/
msvc/ctsim/ctsim.dsp
+++ b/
msvc/ctsim/ctsim.dsp
@@
-43,17
+43,17
@@
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
# 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 /G6 /MT /W3 /GR /GX /O2 /I ".
" /I "..\..\include" /I "..\..\getopt" /I "..\..\..\lpng108" /I "..\..\..\zlib" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /I "..\..\..\wx2\include
" /D "NDEBUG" /D "__WXWIN__" /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" /D CTSIMVERSION=\"3.0.0beta1\" /FR /YX /FD /c
+# ADD CPP /nologo /G6 /MT /W3 /GR /GX /O2 /I ".
.\..\..\fftw-2.1.3\fftw" /I "\wx2.2.5\include" /I "\wx2.2.5\src\png" /I "\wx2.2.5\src\zlib" /I "..\..\include" /I "..\..\getopt" /I "..\..\..\fftw-2.1.3\rfftw
" /D "NDEBUG" /D "__WXWIN__" /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" /D CTSIMVERSION=\"3.0.0beta1\" /FR /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 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 /i "\wx2
\include\wx\msw" /i "\wx2
\include" /d "NDEBUG"
+# ADD RSC /l 0x409 /i "\wx2
.2.5
\include" /d "NDEBUG"
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 /machine:I386
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 /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 libpng.lib zlib.lib /nologo /subsystem:windows /machine:I386 /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib
\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"
!ELSEIF "$(CFG)" == "ctsim - Win32 Debug"
@@
-69,17
+69,17
@@
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 "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /G6 /MTd /W3 /Gm /G
R /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 VERSION=\"2.5.0
\" /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" /D CTSIMVERSION=\"3.0.0beta1\" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /G6 /MTd /W3 /Gm /G
i /GR /GX /Zi /Od /Gy /I "\wx2.2.5\include" /I "..\..\..\fftw-2.1.3\fftw" /I "\wx2.2.5\src\png" /I "\wx2.2.5\src\zlib" /I "..\..\include" /I "..\..\getopt" /I "..\..\..\fftw-2.1.3\rfftw" /D VERSION=\"3.0.0beta1
\" /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" /D CTSIMVERSION=\"3.0.0beta1\" /FR /YX /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# 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" /i "\wx2
\include" /d "_DEBUG"
+# ADD RSC /l 0x409 /i "\wx2
.2.5
\include" /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
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 /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib
\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
# SUBTRACT LINK32 /nodefaultlib
!ENDIF
@@
-94,38
+94,115
@@
LINK32=link.exe
# Begin Source File
SOURCE=..\..\src\ctsim.cpp
# Begin Source File
SOURCE=..\..\src\ctsim.cpp
+
+!IF "$(CFG)" == "ctsim - Win32 Release"
+
+# ADD CPP /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\"
# 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
# End Source File
# Begin Source File
SOURCE=..\..\src\dialogs.cpp
+
+!IF "$(CFG)" == "ctsim - Win32 Release"
+
+# ADD CPP /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\"
# 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
# End Source File
# Begin Source File
SOURCE=..\..\src\dlgprojections.cpp
+
+!IF "$(CFG)" == "ctsim - Win32 Release"
+
+# ADD CPP /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\"
# 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
# End Source File
# Begin Source File
SOURCE=..\..\src\dlgreconstruct.cpp
+
+!IF "$(CFG)" == "ctsim - Win32 Release"
+
# ADD CPP /D CTSIMVERSION=\"3.0.0alpha5\"
# SUBTRACT CPP /D CTSIMVERSION=\"3.0.0beta1\"
# ADD CPP /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
# End Source File
# Begin Source File
SOURCE=..\..\src\docs.cpp
+
+!IF "$(CFG)" == "ctsim - Win32 Release"
+
+# ADD CPP /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\"
# 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"
+
+!ELSEIF "$(CFG)" == "ctsim - Win32 Debug"
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=..\..\src\views.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\views.cpp
+
+!IF "$(CFG)" == "ctsim - Win32 Release"
+
# ADD CPP /D CTSIMVERSION=\"3.0.0alpha5\"
# SUBTRACT CPP /D CTSIMVERSION=\"3.0.0beta1\"
# ADD CPP /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"
# End Source File
# End Group
# Begin Group "Header Files"
@@
-153,6
+230,10
@@
SOURCE=..\..\src\docs.h
# End Source File
# Begin Source File
# End Source File
# Begin Source File
+SOURCE=..\..\src\graph3dview.h
+# End Source File
+# Begin Source File
+
SOURCE=..\..\src\views.h
# End Source File
# End Group
SOURCE=..\..\src\views.h
# End Source File
# End Group