X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vtk%2Fwin32%2Fvtkgdcm.dsp;h=109bdc250c5b78d48d3e11069d809ab7ac8a6fac;hb=4b22e3b8d982d7d46d64aea9f71b2fd04b1a394d;hp=fc904fbc4761a3e931f07aaa7b2c824d9667b917;hpb=2f61d414feccac86c4ea1a6ccda4d1fac9dba37e;p=gdcm.git diff --git a/vtk/win32/vtkgdcm.dsp b/vtk/win32/vtkgdcm.dsp index fc904fbc..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,211 +132,43 @@ SOURCE=..\..\src\gdcmHeader.cxx # End Source File # Begin Source File -SOURCE=..\..\src\gdcmHeaderIdo.cxx -# End Source File -# Begin Source File - -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 +SOURCE=..\..\src\gdcmHeaderHelper.cxx # 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 +SOURCE=..\..\src\gdcmHeaderIdo.cxx # End Source File # Begin Source File -SOURCE=..\..\src\jpeg\libijg8\jidctfst.c +SOURCE=..\..\src\gdcmJpeg.cxx # 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 @@ -363,5 +195,17 @@ SOURCE=c:\Creatis\vtkDistrib\lib\vtk\vtkCommon.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