From: regrain <regrain>
Date: Tue, 8 Jul 2003 09:48:39 +0000 (+0000)
Subject:       * vtk/testvtkGdcmReader.cxx : remove a symbol that is unused
X-Git-Tag: Version0.3~2
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=2d80f3c3dc0de0087e7a11ffec6be009e97405a5;p=gdcm.git

  * vtk/testvtkGdcmReader.cxx : remove a symbol that is unused
      * src/jpeg/libijg8/jmorecfg.h : adding export symbol for windows
      * *.dsp : modifications to use new libgdcmijpeg8 library
      * setup.py : bug fix on VTKPATH variable
      * PACKAGER : adding all concerning windows
      -- BeNours
---

diff --git a/ChangeLog b/ChangeLog
index 9e190088..150c67cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,15 @@
+2003-07-08  Benoit Regrain <Benoit.Regrain@creatis.insa-lyon.fr>
+      * vtk/testvtkGdcmReader.cxx : remove a symbol that is unused
+      * src/jpeg/libijg8/jmorecfg.h : adding export symbol for windows
+      * *.dsp : modifications to use new libgdcmijpeg8 library
+      * setup.py : bug fix on VTKPATH variable
+      * PACKAGER : adding all concerning windows
+
 2003-07-07  Eric Boix <Eric.Boix@creatis.insa-lyon.fr>
       * src/gdcmElValSet.cxx, gdcmFile.cxx: JPR bug fix, removal of
         garbage debug code.
       * TODO, vtk/vtkGdcmReader.cxx: upcoming fixes comments.
-      * gdcmPython/testSuite.py: JPR bug fix, brutal erasement of 
+      * gdcmPython/testSuite.py: JPR bug fix, brutal erasement of
         test suite reported error.
       * PACKAGER file added (describes what a packager must do when
         packaging a new release).
diff --git a/PACKAGER b/PACKAGER
index 1d2657a0..55e3345a 100644
--- a/PACKAGER
+++ b/PACKAGER
@@ -45,13 +45,58 @@ Here is the checklist when freezing a version of gdcm:
          cd $(GDCMHOME)
          python setup.py sdist
          cd /tmp
-         tar zxvf ~/cvs/gdcm/dist/gdcmPython-*.tar.gz
+         tar zxvf $(GDCMHOME)/dist/gdcmPython-*.tar.gz
          cd gdcmPython-*/
          python setup.py bdist --formats=rpm
          As root, repeat above installation with rpm and test.
          
   2/ Windoze:
+    Notation: we consider that GDCMHOME is the directory obtained from the
+    following checkout.
+    cvs -d:pserver:anonymous@cvs.creatis.insa-lyon.fr:2402/cvs/public login
+    cvs -d:pserver:anonymous@cvs.creatis.insa-lyon.fr:2402/cvs/public co gdcm
+    cd gdcm
+    cvs -d:pserver:anonymous@cvs.creatis.insa-lyon.fr:2402/cvs/public co gdcmData
 
+    2a/ compile all projects in the gdcm.dsw workspace.
+
+    2b/ set the PYTHONPATH environement variable to the gdcm/gdcmPython
+       directory
+       check the python test suite is clean (python testSuite.py)
+       cd gdcmPython
+       python testSuite.py
+
+    2c/ check the setup.py distutil script is operational and then validate
+        its produced packages through the test suite, in all following cases
+       - Direct installation:
+         cd $(GDCMHOME)
+         python setup.py install --prefix="c:\tmp"
+         cd /tmp/Lib/site-packages/
+         copy $(GDCMDATAHOME) .
+         export PYTHONPATH="c:\tmp\Lib\site-packages"
+         cd gdcmPython/
+         python testSuite.py
+         remove $(GDCMHOME)\build directory
+       - Binary distribution:
+         cd $(GDCMHOME)
+         python setup.py bdist --formats=wininst
+         install $(GDCMHOME)\dist\gdcmPython-0.3.win32-py2.2.exe
+         cd $(PYTHONHOME)\Lib\site-packages\
+         Check out gdcmData
+         cd gdcmPython
+         clean up PYTHONPATH
+         python testSuite.py
+         remove $(GDCMHOME)\build directory
+       - Source distribution and then binary distribution (out of build
+         source distro):
+         cd $(GDCMHOME)
+         python setup.py sdist --formats=zip
+         unzip $(GDCMHOME)\dist\gdcmPython-0.3.zip in TMPHOME directory
+         cd $(TMPHOME)
+         cd gdcmPython-*/
+         python setup.py bdist --formats=wininst
+         As root, repeat above installation with exe and test.
+         
 * Second stage: preparing packaging:
   - Update the version number in configure.in (AM_INIT_AUTOMAKE)
   - Update the version number in setup.py (version entry in setup object).
@@ -73,3 +118,11 @@ Here is the checklist when freezing a version of gdcm:
          python setup.py sdist
          python setup.py bdist --formats=rpm
          collect both source distro and binary distro
+
+  2/ Un*x
+    2a/ Packaging at the python level:
+         cd $(GDCMHOME)
+         python setup.py sdist --formats=zip
+         python setup.py bdist --formats=wininst
+         collect both source distro and binary distro
+
diff --git a/gdcm.dsw b/gdcm.dsw
index 7771a996..be905f70 100644
--- a/gdcm.dsw
+++ b/gdcm.dsw
@@ -11,6 +11,9 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name libgdcmijpeg8
+    End Project Dependency
 }}}
 
 ###############################################################################
@@ -23,6 +26,9 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name libgdcmijpeg8
+    End Project Dependency
 }}}
 
 ###############################################################################
@@ -35,6 +41,9 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name libgdcmijpeg8
+    End Project Dependency
 }}}
 
 ###############################################################################
@@ -45,6 +54,21 @@ Package=<5>
 {{{
 }}}
 
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name gdcmdll
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "libgdcmijpeg8"=.\SRC\WIN32\libgdcmijpeg8.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
 Package=<4>
 {{{
 }}}
@@ -59,6 +83,9 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name vtkgdcm
+    End Project Dependency
 }}}
 
 ###############################################################################
@@ -71,6 +98,9 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name libgdcmijpeg8
+    End Project Dependency
 }}}
 
 ###############################################################################
diff --git a/gdcmPython/win32/_vtkGdcm.dsp b/gdcmPython/win32/_vtkGdcm.dsp
index ea098265..4169f21d 100644
--- a/gdcmPython/win32/_vtkGdcm.dsp
+++ b/gdcmPython/win32/_vtkGdcm.dsp
@@ -148,190 +148,6 @@ 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
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jidctred.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jmemmgr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jmemnobs.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jquant1.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jquant2.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jutils.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\vtkGdcmInit.cxx
 # End Source File
 # Begin Source File
@@ -421,5 +237,9 @@ 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
 # End Target
 # End Project
diff --git a/gdcmPython/win32/gdcmpyembedded.dsp b/gdcmPython/win32/gdcmpyembedded.dsp
index 632798ab..17cbfff7 100644
--- a/gdcmPython/win32/gdcmpyembedded.dsp
+++ b/gdcmPython/win32/gdcmpyembedded.dsp
@@ -53,11 +53,11 @@ 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 advapi32.lib shell32.lib Wsock32.lib /nologo /dll /machine:I386 /out:"../_gdcm.dll"
+# ADD LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib Wsock32.lib /nologo /dll /machine:I386 /out:"..\_gdcm.dll"
 # Begin Special Build Tool
 ProjDir=.
 SOURCE="$(InputPath)"
-PostBuild_Cmds=move           $(ProjDir)\gdcm.py           $(ProjDir)\..\ 
+PostBuild_Cmds=move            $(ProjDir)\gdcm.py            $(ProjDir)\..\ 
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "gdcmpyembedded - Win32 Debug"
@@ -84,11 +84,11 @@ 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 kernel32.lib user32.lib advapi32.lib shell32.lib Wsock32.lib /nologo /dll /debug /machine:I386 /out:"../_gdcm_d.dll" /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib Wsock32.lib /nologo /dll /debug /machine:I386 /out:"..\_gdcm_d.dll" /pdbtype:sept
 # Begin Special Build Tool
 ProjDir=.
 SOURCE="$(InputPath)"
-PostBuild_Cmds=mv           $(ProjDir)\gdcm.py           $(ProjDir)\..\ 
+PostBuild_Cmds=mv            $(ProjDir)\gdcm.py            $(ProjDir)\..\ 
 # End Special Build Tool
 
 !ENDIF 
@@ -191,190 +191,6 @@ SOURCE=..\..\src\gdcmUtil.cxx
 
 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
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jidctred.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jmemmgr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jmemnobs.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jquant1.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jquant2.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jutils.c
-# End Source File
 # End Group
 # Begin Group "Header Files"
 
@@ -388,5 +204,9 @@ SOURCE=..\..\src\jpeg\libijg8\jutils.c
 SOURCE=c:\Creatis\Python22\libs\python22.lib
 # End Source File
 # End Group
+# Begin Source File
+
+SOURCE=..\..\lib\libgdcmijpeg8.lib
+# End Source File
 # End Target
 # End Project
diff --git a/setup.py b/setup.py
index 6d8eee5d..54d85df2 100644
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,7 @@ if(os.name=='posix'):
 	libraries=["stdc++"]
 	macros   =[('__STDC_LIMIT_MACROS', '1')]
 
-	VTK_PATH="/usr"
+	VTKPATH="/usr"
 	vtkWrapper="vtkWrapPython"
 else:
 	targetDir=os.path.join('lib','site-packages')
@@ -27,13 +27,13 @@ else:
 	macros   =[]
 
 	try:
-		VTK_PATH=os.environ['VTK_PATH']
+		VTKPATH=os.environ['VTKPATH']
 	except KeyError,e:
 		err=str(e)
 		print "Environment variable",err[err.rfind(':')+1:],'not defined, '\
 		       'please fix it!'
-		VTK_PATH="c:\\Creatis\\vtkDistrib"
-	vtkWrapper=os.path.join(VTK_PATH,"bin","vtkWrapPython")
+		VTKPATH="c:\\Creatis\\vtkDistrib"
+	vtkWrapper=os.path.join(VTKPATH,"bin","vtkWrapPython")
 
 targetDir=os.path.join(targetDir, ThisModule)
 
@@ -60,8 +60,8 @@ Sources.extend(Jpeg8Sources)
 
 # Sources 2/ The second extension contains the VTK classes (which we wrap
 #            with the vtk wrappers):
-VTK_INCLUDE_DIR=os.path.join(VTK_PATH,"include","vtk")
-VTK_LIB_DIR=os.path.join(VTK_PATH,"lib","vtk")
+VTK_INCLUDE_DIR=os.path.join(VTKPATH,"include","vtk")
+VTK_LIB_DIR=os.path.join(VTKPATH,"lib","vtk")
 vtkSources = []
 vtkSources.extend(glob.glob(os.path.join(gdcmvtkSrcDir,"vtk*.cxx")))
 vtkSources.extend(glob.glob(os.path.join(gdcmSrcDir,"*.cxx")))
diff --git a/src/jpeg/libijg/jmorecfg.h b/src/jpeg/libijg/jmorecfg.h
index a590351d..d10fb8f1 100644
--- a/src/jpeg/libijg/jmorecfg.h
+++ b/src/jpeg/libijg/jmorecfg.h
@@ -185,9 +185,17 @@ typedef unsigned int JDIMENSION;
 /* a function used only in its module: */
 #define LOCAL(type)		static type
 /* a function referenced thru EXTERNs: */
-#define GLOBAL(type)		type
+#ifdef WIN32
+  #define GLOBAL(type)		__declspec( dllexport ) type
+#else
+  #define GLOBAL(type)		type
+#endif
 /* a reference to a GLOBAL function: */
-#define EXTERN(type)		extern type
+#ifdef WIN32
+  #define EXTERN(type)		extern __declspec( dllexport ) type
+#else
+  #define EXTERN(type)		extern type
+#endif
 
 
 /* This macro is used to declare a "method", that is, a function pointer.
diff --git a/src/jpeg/libijg8/jmorecfg.h b/src/jpeg/libijg8/jmorecfg.h
index a590351d..d10fb8f1 100644
--- a/src/jpeg/libijg8/jmorecfg.h
+++ b/src/jpeg/libijg8/jmorecfg.h
@@ -185,9 +185,17 @@ typedef unsigned int JDIMENSION;
 /* a function used only in its module: */
 #define LOCAL(type)		static type
 /* a function referenced thru EXTERNs: */
-#define GLOBAL(type)		type
+#ifdef WIN32
+  #define GLOBAL(type)		__declspec( dllexport ) type
+#else
+  #define GLOBAL(type)		type
+#endif
 /* a reference to a GLOBAL function: */
-#define EXTERN(type)		extern type
+#ifdef WIN32
+  #define EXTERN(type)		extern __declspec( dllexport ) type
+#else
+  #define EXTERN(type)		extern type
+#endif
 
 
 /* This macro is used to declare a "method", that is, a function pointer.
diff --git a/src/win32/gdcmdll.dsp b/src/win32/gdcmdll.dsp
index b33fa499..7d0a42ab 100644
--- a/src/win32/gdcmdll.dsp
+++ b/src/win32/gdcmdll.dsp
@@ -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 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"
 # 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"
@@ -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
+# 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
 # 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 
@@ -158,190 +158,6 @@ SOURCE=..\gdcmUtil.cxx
 
 SOURCE=..\gdcmVR.cxx
 # End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jcapimin.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jcapistd.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jccoefct.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jccolor.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jcdctmgr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jchuff.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jcinit.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jcmainct.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jcmarker.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jcmaster.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jcomapi.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jcparam.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jcphuff.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jcprepct.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jcsample.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jctrans.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jdapimin.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jdapistd.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jdatadst.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jdatasrc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jdcoefct.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jdcolor.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jddctmgr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jdhuff.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jdinput.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jdmainct.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jdmarker.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jdmaster.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jdmerge.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jdphuff.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jdpostct.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jdsample.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jdtrans.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jerror.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jfdctflt.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jfdctfst.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jfdctint.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jidctflt.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jidctfst.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jidctint.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jidctred.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jmemmgr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jmemnobs.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jquant1.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jquant2.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg8\jutils.c
-# End Source File
 # End Group
 # Begin Group "Header Files"
 
@@ -353,7 +169,7 @@ SOURCE=..\jpeg\libijg8\jutils.c
 # End Group
 # Begin Source File
 
-SOURCE=..\jp
+SOURCE=..\..\lib\libgdcmijpeg8.lib
 # End Source File
 # End Target
 # End Project
diff --git a/src/win32/libgdcmijpeg8.dsp b/src/win32/libgdcmijpeg8.dsp
new file mode 100644
index 00000000..5e30cdce
--- /dev/null
+++ b/src/win32/libgdcmijpeg8.dsp
@@ -0,0 +1,295 @@
+# Microsoft Developer Studio Project File - Name="libgdcmijpeg8" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=libgdcmijpeg8 - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "libgdcmijpeg8.mak".
+!MESSAGE 
+!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 "libgdcmijpeg8.mak" CFG="libgdcmijpeg8 - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "libgdcmijpeg8 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "libgdcmijpeg8 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "libgdcmijpeg8 - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release__libgdcmijpeg8"
+# PROP Intermediate_Dir "Release__libgdcmijpeg8"
+# 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 "LIBGDCMIJPEG8_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGDCMIJPEG8_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"
+# ADD RSC /l 0x40c /d "NDEBUG"
+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 /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 /nologo /dll /machine:I386 /out:"..\..\lib\libgdcmijpeg8.dll"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=copy  Release__libgdcmijpeg8\libgdcmijpeg8.lib  ..\..\lib\ 	copy  ..\..\lib\libgdcmijpeg8.dll  ..\..\gdcmPython\ 	copy  ..\..\lib\libgdcmijpeg8.dll  ..\..\vtk\ 
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "libgdcmijpeg8 - 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__libgdcmijpeg8"
+# PROP Intermediate_Dir "Debug__libgdcmijpeg8"
+# 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 "LIBGDCMIJPEG8_EXPORTS" /YX /FD /GZ  /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGDCMIJPEG8_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:"..\..\lib\libgdcmijpeg8.dll" /pdbtype:sept
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=copy  Debug__libgdcmijpeg8\libgdcmijpeg8.lib  ..\..\lib\ 	copy  ..\..\lib\libgdcmijpeg8.dll  ..\..\gdcmPython\ 	copy  ..\..\lib\libgdcmijpeg8.dll  ..\..\vtk\ 
+# End Special Build Tool
+
+!ENDIF 
+
+# Begin Target
+
+# Name "libgdcmijpeg8 - Win32 Release"
+# Name "libgdcmijpeg8 - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jcapimin.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jcapistd.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jccoefct.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jccolor.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jcdctmgr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jchuff.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jcinit.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jcmainct.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jcmarker.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jcmaster.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jcomapi.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jcparam.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jcphuff.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jcprepct.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jcsample.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jctrans.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jdapimin.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jdapistd.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jdatadst.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jdatasrc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jdcoefct.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jdcolor.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jddctmgr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jdhuff.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jdinput.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jdmainct.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jdmarker.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jdmaster.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jdmerge.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jdphuff.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jdpostct.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jdsample.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jdtrans.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jerror.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jfdctflt.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jfdctfst.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jfdctint.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jidctflt.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jidctfst.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jidctint.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jidctred.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jmemmgr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jmemnobs.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jquant1.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jquant2.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\libijg8\jutils.c
+# 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
+# End Target
+# End Project
diff --git a/vtk/testvtkGdcmReader.cxx b/vtk/testvtkGdcmReader.cxx
index 62080883..6dbbff7d 100644
--- a/vtk/testvtkGdcmReader.cxx
+++ b/vtk/testvtkGdcmReader.cxx
@@ -1,4 +1,4 @@
-// $Header: /cvs/public/gdcm/vtk/Attic/testvtkGdcmReader.cxx,v 1.4 2003/05/21 16:26:29 regrain Exp $
+// $Header: /cvs/public/gdcm/vtk/Attic/testvtkGdcmReader.cxx,v 1.5 2003/07/08 09:48:43 regrain Exp $
 
 #include <vtkRenderer.h>
 #include <vtkRenderWindow.h>
@@ -25,7 +25,6 @@
   
 int main( int argc, char *argv[] )
 {
-   char a;
    int *taille;
    int x,y;
 
diff --git a/vtk/win32/vtkgdcm.dsp b/vtk/win32/vtkgdcm.dsp
index fc904fbc..92a7f89e 100644
--- a/vtk/win32/vtkgdcm.dsp
+++ b/vtk/win32/vtkgdcm.dsp
@@ -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 /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
@@ -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 /nologo /dll /debug /machine:I386 /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
@@ -156,190 +156,6 @@ 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
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jidctred.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jmemmgr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jmemnobs.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jquant1.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jquant2.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\jpeg\libijg8\jutils.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\vtkGdcmReader.cxx
 # End Source File
 # End Group
@@ -363,5 +179,9 @@ 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\libgdcmijpeg8.lib
+# End Source File
 # End Target
 # End Project