X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2Fwin32%2Fgdcmdll.dsp;h=c94c85864d1d8f33d3ff75dcfcc8a5174cb788d2;hb=7815fe9dc3532b716dc478ca0f255263f99d296f;hp=b33fa499bbabc3f627e03d092634c7d6b8205486;hpb=a291236421a150031dbadcb146776cb39b5f3d21;p=gdcm.git

diff --git a/src/win32/gdcmdll.dsp b/src/win32/gdcmdll.dsp
index b33fa499..c94c8586 100644
--- a/src/win32/gdcmdll.dsp
+++ b/src/win32/gdcmdll.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 "GDCMDLL_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /w /W0 /GX /O2 /I "$(CREATIS)\glib-1.3\src\glib" /I "..\jpeg\libijg8" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMDLL_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /w /W0 /GX /O2 /I "$(CREATIS)\glib-1.3\src\glib" /I "..\jpeg\libijg8" /I "..\jpeg\libijg12" /I "..\jpeg\ljpg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMDLL_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,12 +53,12 @@ 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 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:"../../../lib/gdcmdll.dll"
+# ADD LINK32 kernel32.lib msvcrt.lib msvcprt.lib Wsock32.lib /nologo /dll /machine:I386 /nodefaultlib /out:"../../lib/gdcmdll.dll"
 # SUBTRACT LINK32 /debug
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copy for test
-PostBuild_Cmds=copy       ..\..\lib\gdcmdll.dll       ..\..\gdcmPython\   	copy       ..\..\lib\gdcmdll.dll       ..\..\test\   	copy    Release\gdcmdll.lib    ..\..\lib\ 
+PostBuild_Cmds=copy                       ..\..\lib\gdcmdll.dll                       ..\..\gdcmPython\                   	copy                       ..\..\lib\gdcmdll.dll                       ..\..\test\                   	copy                    Release\gdcmdll.lib                    ..\..\lib\ 
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "gdcmdll - Win32 Debug"
@@ -75,7 +75,7 @@ PostBuild_Cmds=copy       ..\..\lib\gdcmdll.dll       ..\..\gdcmPython\   	copy
 # 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 "GDCMDLL_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /w /W0 /Gm /GX /ZI /Od /I "$(CREATIS)\glib-1.3\src\glib" /I "..\jpeg\libijg8" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMDLL_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /w /W0 /Gm /GX /ZI /Od /I "$(CREATIS)\glib-1.3\src\glib" /I "..\jpeg\libijg8" /I "..\jpeg\libijg12" /I "..\jpeg\ljpg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMDLL_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"
@@ -85,12 +85,12 @@ 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 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:"../../lib/gdcmdll.dll" /pdbtype:sept
-# SUBTRACT LINK32 /incremental:no
+# ADD LINK32 kernel32.lib msvcrtd.lib msvcprtd.lib Wsock32.lib /nologo /dll /machine:I386 /nodefaultlib /out:"..\..\lib\gdcmdll.dll" /pdbtype:sept
+# SUBTRACT LINK32 /incremental:no /debug
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copy for test
-PostBuild_Cmds=copy       ..\..\lib\gdcmdll.dll       ..\..\gdcmPython\   	copy       ..\..\lib\gdcmdll.dll       ..\..\test\   	copy    Debug\gdcmdll.lib    ..\..\lib\ 
+PostBuild_Cmds=copy                       ..\..\lib\gdcmdll.dll                       ..\..\gdcmPython\                   	copy                       ..\..\lib\gdcmdll.dll                       ..\..\test\                   	copy                    Debug\gdcmdll.lib                    ..\..\lib\ 
 # End Special Build Tool
 
 !ENDIF 
@@ -104,256 +104,236 @@ PostBuild_Cmds=copy       ..\..\lib\gdcmdll.dll       ..\..\gdcmPython\   	copy
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=..\gdcmDict.cxx
+SOURCE=..\gdcmDebug.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\gdcmDictEntry.cxx
+SOURCE=..\gdcmDicomDir.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\gdcmDictSet.cxx
+SOURCE=..\gdcmDicomDirElement.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\gdcmElValSet.cxx
+SOURCE=..\gdcmDicomDirImage.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\gdcmElValue.cxx
+SOURCE=..\gdcmDicomDirMeta.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\gdcmException.cxx
+SOURCE=..\gdcmDicomDirPatient.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\gdcmFile.cxx
+SOURCE=..\gdcmDicomDirSerie.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\gdcmHeader.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\gdcmHeaderIdo.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\gdcmJpeg.cxx
+SOURCE=..\gdcmDicomDirStudy.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\gdcmJpegIdo.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\gdcmTS.cxx
+SOURCE=..\gdcmDict.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\gdcmUtil.cxx
+SOURCE=..\gdcmDictEntry.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\gdcmVR.cxx
+SOURCE=..\gdcmDictSet.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\libijg8\jcapimin.c
+SOURCE=..\gdcmDirList.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\libijg8\jcapistd.c
+SOURCE=..\gdcmException.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\libijg8\jccoefct.c
+SOURCE=..\gdcmFile.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\libijg8\jccolor.c
+SOURCE=..\gdcmGlobal.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\libijg8\jcdctmgr.c
+SOURCE=..\gdcmHeader.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\libijg8\jchuff.c
+SOURCE=..\gdcmHeaderEntry.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\libijg8\jcinit.c
+SOURCE=..\gdcmHeaderHelper.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\libijg8\jcmainct.c
+SOURCE=..\gdcmJpeg.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\libijg8\jcmarker.c
+SOURCE=..\gdcmJpeg12.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\libijg8\jcmaster.c
+SOURCE=..\gdcmJpeg2000.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\libijg8\jcomapi.c
+SOURCE=..\gdcmObject.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\libijg8\jcparam.c
+SOURCE=..\gdcmParsePixels.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\libijg8\jcphuff.c
+SOURCE=..\gdcmParser.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\libijg8\jcprepct.c
+SOURCE=..\gdcmRLE.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\libijg8\jcsample.c
+SOURCE=..\gdcmTS.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\libijg8\jctrans.c
+SOURCE=..\gdcmUtil.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\libijg8\jdapimin.c
+SOURCE=..\gdcmVR.cxx
 # End Source File
-# Begin Source File
+# End Group
+# Begin Group "Header Files"
 
-SOURCE=..\jpeg\libijg8\jdapistd.c
-# End Source File
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
-SOURCE=..\jpeg\libijg8\jdatadst.c
+SOURCE=..\gdcm.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\libijg8\jdatasrc.c
+SOURCE=..\gdcmDebug.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\libijg8\jdcoefct.c
+SOURCE=..\gdcmCommon.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\libijg8\jdcolor.c
+SOURCE=..\gdcmDicomDir.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\libijg8\jddctmgr.c
+SOURCE=..\gdcmDicomDirElement.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\libijg8\jdhuff.c
+SOURCE=..\gdcmDicomDirImage.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\libijg8\jdinput.c
+SOURCE=..\gdcmDicomDirMeta.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\libijg8\jdmainct.c
+SOURCE=..\gdcmDicomDirPatient.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\libijg8\jdmarker.c
+SOURCE=..\gdcmDicomDirSerie.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\libijg8\jdmaster.c
+SOURCE=..\gdcmDicomDirStudy.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\libijg8\jdmerge.c
+SOURCE=..\gdcmDict.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\libijg8\jdphuff.c
+SOURCE=..\gdcmDictEntry.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\libijg8\jdpostct.c
+SOURCE=..\gdcmDictSet.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\libijg8\jdsample.c
+SOURCE=..\gdcmDirList.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\libijg8\jdtrans.c
+SOURCE=..\gdcmException.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\libijg8\jerror.c
+SOURCE=..\gdcmFile.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\libijg8\jfdctflt.c
+SOURCE=..\gdcmGlobal.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\libijg8\jfdctfst.c
+SOURCE=..\gdcmHeader.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\libijg8\jfdctint.c
+SOURCE=..\gdcmHeaderEntry.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\libijg8\jidctflt.c
+SOURCE=..\gdcmHeaderHelper.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\libijg8\jidctfst.c
+SOURCE=..\gdcmObject.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\libijg8\jidctint.c
+SOURCE=..\gdcmParser.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\libijg8\jidctred.c
+SOURCE=..\gdcmTS.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\libijg8\jmemmgr.c
+SOURCE=..\gdcmUtil.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\libijg8\jmemnobs.c
+SOURCE=..\gdcmVR.h
 # End Source File
-# Begin Source File
+# End Group
+# Begin Group "Resource Files"
 
-SOURCE=..\jpeg\libijg8\jquant1.c
-# End Source File
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
 # Begin Source File
 
-SOURCE=..\jpeg\libijg8\jquant2.c
+SOURCE=..\..\lib\libgdcmljpeg.lib
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\libijg8\jutils.c
+SOURCE=..\..\lib\libgdcmijpeg8.lib
 # End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
 # Begin Source File
 
-SOURCE=..\jp
+SOURCE=..\..\lib\libgdcmijpeg12.lib
 # End Source File
 # End Target
 # End Project