X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=gdcmPython%2Fwin32%2F_vtkGdcm.dsp;h=9ea28f96745fefb40711f0427634627a79c84403;hb=795969b4c1adc8a26d5dfda236ef3d1e5ad1d7ca;hp=ea098265c6ef56403914464562327af5a821a712;hpb=2f61d414feccac86c4ea1a6ccda4d1fac9dba37e;p=gdcm.git

diff --git a/gdcmPython/win32/_vtkGdcm.dsp b/gdcmPython/win32/_vtkGdcm.dsp
index ea098265..9ea28f96 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"
@@ -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 "..\\" /I "$(VTKPATH)\include\vtk" /I "..\..\src" /I "..\..\src\jpeg\libijg8" /I "..\..\vtk" /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,203 +98,31 @@ SOURCE=..\..\src\gdcmJpeg.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\gdcmJpegIdo.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
-
-SOURCE=..\..\src\gdcmVR.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jcapimin.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jcapistd.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jccoefct.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jccolor.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jcdctmgr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jchuff.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jcinit.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jcmainct.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jcmarker.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jcmaster.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jcomapi.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jcparam.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jcphuff.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jcprepct.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jcsample.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jctrans.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jdapimin.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jdapistd.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jdatadst.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jdatasrc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jdcoefct.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jdcolor.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jddctmgr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jdhuff.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jdinput.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jdmainct.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jdmarker.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jdmaster.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jdmerge.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jdphuff.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jdpostct.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jdsample.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jdtrans.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jerror.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jfdctflt.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jfdctfst.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jfdctint.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jidctflt.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jidctfst.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jidctint.c
+SOURCE=..\..\src\gdcmJpeg12.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\libijg8\jidctred.c
+SOURCE=..\..\src\gdcmJpeg2000.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\libijg8\jmemmgr.c
+SOURCE=..\..\src\gdcmJpegIdo.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\libijg8\jmemnobs.c
+SOURCE=..\..\src\gdcmRLE.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\libijg8\jquant1.c
+SOURCE=..\..\src\gdcmTS.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\libijg8\jquant2.c
+SOURCE=..\..\src\gdcmUtil.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\libijg8\jutils.c
+SOURCE=..\..\src\gdcmVR.cxx
 # End Source File
 # Begin Source File
 
@@ -349,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
@@ -360,18 +151,10 @@ 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=\Projects\gdcm\vtk
 ProjDir=.
@@ -382,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"
@@ -421,5 +199,13 @@ SOURCE=C:\Creatis\vtkDistrib\lib\vtk\vtkFilteringPython.lib
 SOURCE=c:\Creatis\vtkDistrib\lib\vtk\vtkFiltering.lib
 # End Source File
 # End Group
+# Begin Source File
+
+SOURCE=..\..\lib\libgdcmijpeg8.lib
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\lib\libgdcmijpeg12.lib
+# End Source File
 # End Target
 # End Project