X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=msvc%2Fctsimtext%2Fctsimtext.dsp;fp=msvc%2Fctsimtext%2Fctsimtext.dsp;h=108ca73b410aff570af83663b3c6906ad63ae4a2;hp=61bdcf4600e22b38236affdfeecf6ecd653af71d;hb=ae247559fed0f8982bd0b11331e55a4e8e568dd7;hpb=6bcab27e89795df59defa160aff6b9831468c4d9

diff --git a/msvc/ctsimtext/ctsimtext.dsp b/msvc/ctsimtext/ctsimtext.dsp
index 61bdcf4..108ca73 100644
--- a/msvc/ctsimtext/ctsimtext.dsp
+++ b/msvc/ctsimtext/ctsimtext.dsp
@@ -42,15 +42,15 @@ 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 /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" /D "_CONSOLE" /D "NOMAIN" /D "NDEBUG" /D "WIN32" /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 /YX /FD /c
+# 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" /D "_CONSOLE" /D "NOMAIN" /D "__WIN95__" /D "__WIN32__" /D "_WINDOWS" /D "__WXMSW__" /D "MSVC" /D "NDEBUG" /D VERSION=\"3.5.5\" /D "WIN32" /D "HAVE_CTN_DICOM" /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
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /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  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 /machine:I386
-# ADD LINK32 wx.lib zlib.lib tiff.lib jpeg.lib png.lib libctsim.lib fftw2st.lib rfftw2st.lib wsock32.lib comctl32.lib uuid.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\libctsim\Release" /libpath:"\fftw-2.1.3\Win32\RFFTW2st\Release" /libpath:"\fftw-2.1.3\Win32\FFTW2st\Release" /libpath:"\wx2\\"
+# 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 /machine:I386
+# ADD LINK32 wx.lib zlib.lib tiff.lib jpeg.lib png.lib libctsim.lib fftw2st.lib rfftw2st.lib wsock32.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 ctn_lib.lib /nologo /subsystem:console /machine:I386 /libpath:"..\libctsim\Release" /libpath:"\fftw-2.1.3\Win32\RFFTW2st\Release" /libpath:"\fftw-2.1.3\Win32\FFTW2st\Release" /libpath:"\wx2\\" /libpath:"\wx2\lib" /libpath:"\ctn\winctn\ctn_lib\Release"
 
 !ELSEIF  "$(CFG)" == "ctsimtext - Win32 Debug"
 
@@ -65,16 +65,16 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # 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 /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" /D "_CONSOLE" /D "NOMAIN" /D "_DEBUG" /D "DEBUG" /D "_WINDOWS" /D "__WXDEBUG__" /D WXDEBUG=1 /D "WIN32" /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 VERSION=3.5.4 /D WINVER=0x0400 /D "STRICT" /YX /FD /GZ  /c
+# 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 /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" /D "_CONSOLE" /D "NOMAIN" /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
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /i "\wx2\include" /i "\wx2\contrib\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  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 wxd.lib libctsim.lib zlibd.lib tiffd.lib jpegd.lib pngd.lib fftw2st.lib rfftw2st.lib wsock32.lib comctl32.lib winmm.lib rpcrt4.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 xpmd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\libctsim\Debug" /libpath:"\fftw-2.1.3\Win32\RFFTW2st\Debug" /libpath:"\fftw-2.1.3\Win32\FFTW2st\Debug" /libpath:"\wx2\lib" /libpath:"\fftw-2.1.3\fftw2st\Debug" /libpath:"\fftw-2.1.3\rfftw2st\Release"
+# 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 wxd.lib libctsim.lib zlibd.lib tiffd.lib jpegd.lib pngd.lib fftw2st.lib rfftw2st.lib wsock32.lib comctl32.lib winmm.lib rpcrt4.lib xpmd.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 ctn_lib.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\libctsim\Debug" /libpath:"\fftw-2.1.3\Win32\RFFTW2st\Debug" /libpath:"\fftw-2.1.3\Win32\FFTW2st\Debug" /libpath:"\fftw-2.1.3\fftw2st\Debug" /libpath:"\fftw-2.1.3\rfftw2st\Release" /libpath:"\wx2\lib" /libpath:"\ctn\winctn\ctn_lib\Debug"
 # SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF