X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=gdcmPython%2Fwin32%2F_vtkGdcm.dsp;h=0fc813e34ceec8be808609b1b77494ff2528bd44;hb=adc8d5da8f5fd92da1cd74d2f6b2efaac14d8889;hp=806c6807701b53b0f5c65e66fd3e9ee2698dc642;hpb=863fe0bf3841e950f63be7a16c13beed5b60b7d8;p=gdcm.git

diff --git a/gdcmPython/win32/_vtkGdcm.dsp b/gdcmPython/win32/_vtkGdcm.dsp
index 806c6807..0fc813e3 100644
--- a/gdcmPython/win32/_vtkGdcm.dsp
+++ b/gdcmPython/win32/_vtkGdcm.dsp
@@ -18,7 +18,6 @@ CFG=_vtkGdcm - Win32 Debug
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE "_vtkGdcm - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "_vtkGdcm - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -28,9 +27,6 @@ CFG=_vtkGdcm - Win32 Debug
 CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
-
-!IF  "$(CFG)" == "_vtkGdcm - Win32 Release"
-
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 # PROP BASE Output_Dir "Release"
@@ -43,7 +39,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 "..\..\vtk" /I "$(CREATIS)\python22\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_VTKGDCM_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\src\jpeg\libijg8" /I "..\..\vtk" /I "$(VTKPATH)\include\vtk" /I "..\..\src" /I "$(CREATIS)\python22\include" /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"
@@ -54,39 +50,9 @@ BSC32=bscmake.exe
 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib /nologo /dll /machine:I386 /out:"..\vtkgdcmPython.dll"
-
-!ELSEIF  "$(CFG)" == "_vtkGdcm - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# 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 "$(CREATIS)\python22\include" /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"
-# ADD RSC /l 0x40c /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 /dll /debug /machine:I386 /pdbtype:sept
-# ADD 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 /out:"..\vtkGdcmPython.dll" /pdbtype:sept
-
-!ENDIF 
-
 # Begin Target
 
 # Name "_vtkGdcm - Win32 Release"
-# Name "_vtkGdcm - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -132,6 +98,26 @@ SOURCE=..\..\src\gdcmJpeg.cxx
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\gdcmJpeg12.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\gdcmJpeg2000.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\gdcmJpegIdo.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\gdcmRLE.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\gdcmTS.cxx
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\gdcmUtil.cxx
 # End Source File
 # Begin Source File
@@ -157,9 +143,6 @@ SOURCE=..\vtkGdcmReaderPython.cxx
 # Begin Source File
 
 SOURCE=.\init.h
-
-!IF  "$(CFG)" == "_vtkGdcm - Win32 Release"
-
 # Begin Custom Build - Performing Custom Build Step on $(VTKPATH)\bin\initwrappythonwin32 vtkgdcmPython vtkGdmReader > $(ProjDir)\vtkGdcmInit.cxx
 ProjDir=.
 InputPath=.\init.h
@@ -168,20 +151,12 @@ InputPath=.\init.h
 	$(VTKPATH)\bin\initwrappythonwin32 vtkgdcmPython vtkGdcmReader > $(ProjDir)\vtkGdcmInit.cxx
 
 # End Custom Build
-
-!ELSEIF  "$(CFG)" == "_vtkGdcm - Win32 Debug"
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 
 SOURCE=..\..\vtk\vtkGdcmReader.h
-
-!IF  "$(CFG)" == "_vtkGdcm - Win32 Release"
-
 # Begin Custom Build - Performing Custom Build Step on $(VTKPATH)\bin\vtkwrappython "$(InputDir)\$(InputName).h" $(VTKPATH)\Examples\Build\vtkMy\Wrapping\hints 1  $(ProjDir)\..\$(InputName)Python.cxx
-InputDir=\Creatis\CVSimport\gdcm\vtk
+InputDir=\Projects\gdcm\vtk
 ProjDir=.
 InputPath=..\..\vtk\vtkGdcmReader.h
 InputName=vtkGdcmReader
@@ -190,11 +165,6 @@ InputName=vtkGdcmReader
 	$(VTKPATH)\bin\vtkwrappython "$(InputDir)\$(InputName).h" $(VTKPATH)\Examples\Build\vtkMy\Wrapping\hints 1  $(ProjDir)\..\$(InputName)Python.cxx
 
 # End Custom Build
-
-!ELSEIF  "$(CFG)" == "_vtkGdcm - Win32 Debug"
-
-!ENDIF 
-
 # End Source File
 # End Group
 # Begin Group "Resource Files"
@@ -202,56 +172,44 @@ InputName=vtkGdcmReader
 # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
 # Begin Source File
 
-SOURCE=..\..\..\..\Python22\libs\python22.lib
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\vtkDistrib\lib\vtk\vtkRenderingPython.lib
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\vtkDistrib\lib\vtk\vtkCommonPython.lib
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\vtkDistrib\lib\vtk\vtkFiltering.lib
+SOURCE=c:\Creatis\Python22\libs\python22.lib
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\vtkDistrib\lib\vtk\vtkFilteringPython.lib
+SOURCE=C:\Creatis\vtkDistrib\lib\vtk\vtkIOPython.lib
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\vtkDistrib\lib\vtk\vtkGraphics.lib
+SOURCE=c:\Creatis\vtkDistrib\lib\vtk\vtkCommonPython.lib
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\vtkDistrib\lib\vtk\vtkGraphicsPython.lib
+SOURCE=c:\Creatis\vtkDistrib\lib\vtk\vtkIO.lib
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\vtkDistrib\lib\vtk\vtkImaging.lib
+SOURCE=c:\Creatis\vtkDistrib\lib\vtk\vtkCommon.lib
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\vtkDistrib\lib\vtk\vtkImagingPython.lib
+SOURCE=C:\Creatis\vtkDistrib\lib\vtk\vtkFilteringPython.lib
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\vtkDistrib\lib\vtk\vtkRendering.lib
+SOURCE=c:\Creatis\vtkDistrib\lib\vtk\vtkFiltering.lib
 # End Source File
+# End Group
 # Begin Source File
 
-SOURCE=..\..\..\..\vtkDistrib\lib\vtk\vtkCommon.lib
+SOURCE=..\..\lib\libgdcmljpeg.lib
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\vtkDistrib\lib\vtk\vtkIOPython.lib
+SOURCE=..\..\lib\libgdcmijpeg8.lib
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\vtkDistrib\lib\vtk\vtkIO.lib
+SOURCE=..\..\lib\libgdcmijpeg12.lib
 # End Source File
-# End Group
 # End Target
 # End Project