X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=gdcmPython%2Fwin32%2F_vtkGdcm.dsp;h=68487b329e0020e07ffb78ccf08515bf3b46f959;hb=8d10ccb6794a0f22234983990e2181a24625fbd8;hp=f00d361aae39bdfe3dcbfb4f0ef75763edd87b7b;hpb=694d0863f7bf1bb835a7f133032e035098979979;p=gdcm.git diff --git a/gdcmPython/win32/_vtkGdcm.dsp b/gdcmPython/win32/_vtkGdcm.dsp index f00d361a..68487b32 100644 --- a/gdcmPython/win32/_vtkGdcm.dsp +++ b/gdcmPython/win32/_vtkGdcm.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 -CFG=_vtkGdcm - Win32 Debug +CFG=_vtkGdcm - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,12 +13,11 @@ CFG=_vtkGdcm - Win32 Debug !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "_vtkGdcm.mak" CFG="_vtkGdcm - Win32 Debug" +!MESSAGE NMAKE /f "_vtkGdcm.mak" CFG="_vtkGdcm - Win32 Release" !MESSAGE !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,44 +50,46 @@ 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 "..\\" /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" # Begin Source File +SOURCE=..\..\src\gdcmDebug.cxx +# End Source File +# Begin Source File + +SOURCE=..\..\src\gdcmDicomDir.cxx +# End Source File +# Begin Source File + +SOURCE=..\..\src\gdcmDicomDirElement.cxx +# End Source File +# Begin Source File + +SOURCE=..\..\src\gdcmDicomDirImage.cxx +# End Source File +# Begin Source File + +SOURCE=..\..\src\gdcmDicomDirMeta.cxx +# End Source File +# Begin Source File + +SOURCE=..\..\src\gdcmDicomDirPatient.cxx +# End Source File +# Begin Source File + +SOURCE=..\..\src\gdcmDicomDirSerie.cxx +# End Source File +# Begin Source File + +SOURCE=..\..\src\gdcmDicomDirStudy.cxx +# End Source File +# Begin Source File + SOURCE=..\..\src\gdcmDict.cxx # End Source File # Begin Source File @@ -104,19 +102,19 @@ SOURCE=..\..\src\gdcmDictSet.cxx # End Source File # Begin Source File -SOURCE=..\..\src\gdcmElValSet.cxx +SOURCE=..\..\src\gdcmDirList.cxx # End Source File # Begin Source File -SOURCE=..\..\src\gdcmElValue.cxx +SOURCE=..\..\src\gdcmException.cxx # End Source File # Begin Source File -SOURCE=..\..\src\gdcmException.cxx +SOURCE=..\..\src\gdcmFile.cxx # End Source File # Begin Source File -SOURCE=..\..\src\gdcmFile.cxx +SOURCE=..\..\src\gdcmGlobal.cxx # End Source File # Begin Source File @@ -124,7 +122,11 @@ SOURCE=..\..\src\gdcmHeader.cxx # End Source File # Begin Source File -SOURCE=..\..\src\gdcmHeaderIdo.cxx +SOURCE=..\..\src\gdcmHeaderEntry.cxx +# End Source File +# Begin Source File + +SOURCE=..\..\src\gdcmHeaderHelper.cxx # End Source File # Begin Source File @@ -132,6 +134,34 @@ 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\gdcmObject.cxx +# End Source File +# Begin Source File + +SOURCE=..\..\src\gdcmParsePixels.cxx +# End Source File +# Begin Source File + +SOURCE=..\..\src\gdcmParser.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 @@ -156,10 +186,11 @@ SOURCE=..\vtkGdcmReaderPython.cxx # PROP Default_Filter "h;hpp;hxx;hm;inl" # Begin Source File -SOURCE=.\init.h - -!IF "$(CFG)" == "_vtkGdcm - Win32 Release" +SOURCE=..\..\src\gdcmDirList.h +# End Source File +# Begin Source File +SOURCE=.\init.h # Begin Custom Build - Performing Custom Build Step on $(VTKPATH)\bin\initwrappythonwin32 vtkgdcmPython vtkGdmReader > $(ProjDir)\vtkGdcmInit.cxx ProjDir=. InputPath=.\init.h @@ -168,18 +199,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=. @@ -190,11 +213,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" @@ -229,5 +247,17 @@ 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\libgdcmljpeg.lib +# End Source File +# Begin Source File + +SOURCE=..\..\lib\libgdcmijpeg8.lib +# End Source File +# Begin Source File + +SOURCE=..\..\lib\libgdcmijpeg12.lib +# End Source File # End Target # End Project