X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vtk%2Fwin32%2Fvtkgdcm.dsp;h=109bdc250c5b78d48d3e11069d809ab7ac8a6fac;hb=f04b9ef9bad66e1847e8139db9cd4126e4340301;hp=a1ce77c566c116c7177e721620d2df3f8f2c90a8;hpb=78af942968975fe0fa58c1e8a6965ffc4848898c;p=gdcm.git

diff --git a/vtk/win32/vtkgdcm.dsp b/vtk/win32/vtkgdcm.dsp
index a1ce77c5..109bdc25 100644
--- a/vtk/win32/vtkgdcm.dsp
+++ b/vtk/win32/vtkgdcm.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VTKGDCM_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "$(VTKPATH)\include\vtk" /I "..\..\src" /I "..\..\src\jpeg\libijg8" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VTKGDCM_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "$(VTKPATH)\include\vtk" /I "..\..\src" /I "..\..\src\jpeg\libijg8" /I "..\..\src\jpeg\libijg12" /I "..\..\src\jpeg\ljpg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VTKGDCM_EXPORTS" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x40c /d "NDEBUG"
@@ -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 /dll /machine:I386
-# ADD LINK32 Wsock32.lib /nologo /dll /machine:I386 /out:"..\..\lib\vtkgdcm.dll" /libpath:"$(VTKPATH)\lib\vtk ../../lib/"
+# ADD LINK32 Wsock32.lib kernel32.lib user32.lib gdi32.lib /nologo /dll /machine:I386 /out:"..\..\lib\vtkgdcm.dll" /libpath:"$(VTKPATH)\lib\vtk ../../lib/"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Cmds=copy ..\..\lib\vtkgdcm.dll ..\	copy Release\vtkgdcm.lib ..\..\lib\vtkgdcm.lib
@@ -73,7 +73,7 @@ PostBuild_Cmds=copy ..\..\lib\vtkgdcm.dll ..\	copy Release\vtkgdcm.lib ..\..\lib
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VTKGDCM_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "$(VTKPATH)\include\vtk" /I "..\..\src" /I "..\..\src\jpeg\libijg8" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VTKGDCM_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "$(VTKPATH)\include\vtk" /I "..\..\src" /I "..\..\src\jpeg\libijg8" /I "..\..\src\jpeg\libijg12" /I "..\..\src\jpeg\ljpg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VTKGDCM_EXPORTS" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x40c /d "_DEBUG"
@@ -83,7 +83,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 /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 Wsock32.lib /nologo /dll /debug /machine:I386 /out:"..\..\lib\vtkgdcm.dll" /pdbtype:sept /libpath:"$(VTKPATH)\lib\vtk ../../lib/"
+# ADD LINK32 Wsock32.lib kernel32.lib user32.lib gdi32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"msvcrt" /out:"..\..\lib\vtkgdcm.dll" /pdbtype:sept /libpath:"$(VTKPATH)\lib\vtk ../../lib/"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Cmds=copy ..\..\lib\vtkgdcm.dll ..\	copy Debug\vtkgdcm.lib ..\..\lib\vtkgdcm.lib
@@ -132,6 +132,10 @@ SOURCE=..\..\src\gdcmHeader.cxx
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\gdcmHeaderHelper.cxx
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\gdcmHeaderIdo.cxx
 # End Source File
 # Begin Source File
@@ -193,6 +197,10 @@ SOURCE=c:\Creatis\vtkDistrib\lib\vtk\vtkFiltering.lib
 # End Group
 # Begin Source File
 
+SOURCE=..\..\lib\libgdcmljpeg.lib
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\lib\libgdcmijpeg8.lib
 # End Source File
 # Begin Source File