* gdcmPython/win32/gdcmpycomplet.dsp renamed to gdcmpyembedded.dsp.

      * gdcmPython/win32/gdcmpy.dsp trashed away (brain damaged).
      * src/gdcm*.cxx JPR's bad inclusion fixed.  -- BeNours + Frog

diff --git a/ChangeLog b/ChangeLog
index 7d3615616a8ce7325420cef014eae85bdf80e3bd..11328de9f185c5014f98b2779ca7d1d622799d08 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
         un*ces with sh-utils test utility.
       * gdcmPython/demo/test.py renamed to PrintHeader.py
       * gdcmPython/demo/ReorganiseFiles.py new demo script added.
+      * gdcmPython/win32/gdcmpycomplet.dsp renamed to gdcmpyembedded.dsp.
+      * gdcmPython/win32/gdcmpy.dsp trashed away (brain damaged).
+      * src/gdcm*.cxx JPR's bad inclusion fixed.
 
 2003-03-26 Eric Boix <Eric.Boix@creatis.insa-lyon.fr>
       * src/gdcmHeader[h, cxx] gdcmHeader now has an IsReadable predicate.

diff --git a/gdcm.dsw b/gdcm.dsw
index f4d6a3e940bdb5fb9be34bcf3704b4490100aba1..0efc59e799cf47220a644dda797fe00245b23128 100644 (file)
--- a/gdcm.dsw
+++ b/gdcm.dsw
@@ -15,19 +15,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "gdcmpy"=.\gdcmPython\win32\gdcmpy.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "gdcmpycomplet"=.\gdcmPython\win32\gdcmpycomplet.dsp - Package Owner=<4>
+Project: "gdcmpyembedded"=.\gdcmPython\win32\gdcmpyembedded.dsp - Package Owner=<4>
 
 Package=<5>
 {{{

diff --git a/gdcmPython/win32/gdcmpy.dsp b/gdcmPython/win32/gdcmpy.dsp
deleted file mode 100644 (file)
index 36485ff..0000000
--- a/gdcmPython/win32/gdcmpy.dsp
+++ /dev/null
@@ -1,146 +0,0 @@
-# Microsoft Developer Studio Project File - Name="gdcmpy" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=gdcmpy - 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 "gdcmpy.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 "gdcmpy.mak" CFG="gdcmpy - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "gdcmpy - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gdcmpy - 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)" == "gdcmpy - 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"
-# PROP Intermediate_Dir "Release"
-# 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 "GDCMPY_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /w /W0 /GX /O2 /I "$(CREATIS)\python22\include" /I "..\..\src" /I "$(CREATIS)\glib-1.3\src\glib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMPY_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 Wsock32.lib c:/creatis/python21/libs/python21.lib /nologo /dll /machine:I386 /out:"../_gdcm.dll"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=copy gdcm.py ..\*.*
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "gdcmpy - 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 "GDCMPY_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /w /W0 /Gm /GX /ZI /Od /I "$(CREATIS)\python22\include" /I "..\..\src" /I "$(CREATIS)\glib-1.3\src\glib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMPY_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 Wsock32.lib c:/creatis/python21/libs/python21_d.lib /nologo /dll /debug /machine:I386 /out:"../_gdcm_d.dll" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "gdcmpy - Win32 Release"
-# Name "gdcmpy - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\gdcm.i
-
-!IF  "$(CFG)" == "gdcmpy - Win32 Release"
-
-# Begin Custom Build
-ProjDir=.
-InputPath=..\gdcm.i
-InputName=gdcm
-
-"$(ProjDir)\$(InputName)_wrap.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       C:\creatis\SWIG\swig -python -c++ -I..\..\src -o $(ProjDir)\$(InputName)_wrap.cxx $(InputPath)
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "gdcmpy - Win32 Debug"
-
-# Begin Custom Build - C:\creatis\SWIG-1.3.16\swig -python -c++ -I ..\..\src -o $(ProjDir)\$(InputName)_wrap.c $(InputPath)
-ProjDir=.
-InputPath=..\gdcm.i
-InputName=gdcm
-
-"$(ProjDir)\$(InputName)_wrap.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       C:\creatis\SWIG\swig -python -c++ -I..\..\src -o $(ProjDir)\$(InputName)_wrap.cxx $(InputPath)
-
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\gdcm_wrap.cxx
-# 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=..\..\src\win32\gdcmdll\Release\gdcmdll.lib
-# End Source File
-# End Target
-# End Project

diff --git a/gdcmPython/win32/gdcmpycomplet.dsp b/gdcmPython/win32/gdcmpyembedded.dsp
similarity index 62%
rename from gdcmPython/win32/gdcmpycomplet.dsp
rename to gdcmPython/win32/gdcmpyembedded.dsp
index e2dc3ab2cc6fc1d7aa823eb38e3c00882108545c..c3b6951537cf6962b77750a89a117268038e2b77 100644 (file)
--- a/gdcmPython/win32/gdcmpycomplet.dsp
+++ b/gdcmPython/win32/gdcmpyembedded.dsp
@@ -1,196 +1,196 @@
-# Microsoft Developer Studio Project File - Name="gdcmpycomplet" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=gdcmpycomplet - 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 "gdcmpycomplet.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 "gdcmpycomplet.mak" CFG="gdcmpycomplet - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "gdcmpycomplet - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gdcmpycomplet - 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)" == "gdcmpycomplet - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "gdcmpycomplet___Win32_Release"
-# PROP BASE Intermediate_Dir "gdcmpycomplet___Win32_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "gdcmpycomplet___Win32_Release"
-# PROP Intermediate_Dir "gdcmpycomplet___Win32_Release"
-# 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 "GDCMPYCOMPLET_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /w /W0 /GX /O2 /I "$(CREATIS)\python22\include" /I "..\..\..\src" /I "$(CREATIS)\glib-1.3\src\glib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMPYCOMPLET_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 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)\..\ 
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "gdcmpycomplet - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "gdcmpycomplet___Win32_Debug"
-# PROP BASE Intermediate_Dir "gdcmpycomplet___Win32_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "gdcmpycomplet___Win32_Debug"
-# PROP Intermediate_Dir "gdcmpycomplet___Win32_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 "GDCMPYCOMPLET_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /w /W0 /Gm /GX /ZI /Od /I "$(CREATIS)\python22\include" /I "..\..\..\src" /I "$(CREATIS)\glib-1.3\src\glib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMPYCOMPLET_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 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)\..\ 
-# End Special Build Tool
-
-!ENDIF 
-
-# Begin Target
-
-# Name "gdcmpycomplet - Win32 Release"
-# Name "gdcmpycomplet - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\gdcm.i
-
-!IF  "$(CFG)" == "gdcmpycomplet - Win32 Release"
-
-# Begin Custom Build
-ProjDir=.
-InputPath=..\gdcm.i
-InputName=gdcm
-
-"$(ProjDir)\$(InputName)_wrap.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       C:\creatis\SWIG\swig -python -c++ -I..\..\..\src -o $(ProjDir)\$(InputName)_wrap.cxx $(InputPath)
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "gdcmpycomplet - Win32 Debug"
-
-# Begin Custom Build - Performing Custom Build Step on $(InputPath)
-ProjDir=.
-InputPath=..\gdcm.i
-InputName=gdcm
-
-"$(ProjDir)\$(InputName)_wrap.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       C:\creatis\SWIG\swig -python -c++ -I..\..\..\src -o $(ProjDir)\$(InputName)_wrap.cxx $(InputPath)
-
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\gdcm_wrap.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\gdcmDict.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\gdcmDictEntry.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\gdcmDictSet.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\gdcmElValSet.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\gdcmElValue.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\gdcmException.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\gdcmException.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\gdcmFile.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\gdcmHeader.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\gdcmHeaderIdo.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\gdcmUtil.cxx
-# 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"
-# Begin Source File
-
-SOURCE=..\..\..\..\..\Python22\libs\python22.lib
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="gdcmpyembedded" - Package Owner=<4>\r
+# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
+# ** DO NOT EDIT **\r
+\r
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102\r
+\r
+CFG=gdcmpyembedded - Win32 Debug\r
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
+!MESSAGE use the Export Makefile command and run\r
+!MESSAGE \r
+!MESSAGE NMAKE /f "gdcmpyembedded.mak".\r
+!MESSAGE \r
+!MESSAGE You can specify a configuration when running NMAKE\r
+!MESSAGE by defining the macro CFG on the command line. For example:\r
+!MESSAGE \r
+!MESSAGE NMAKE /f "gdcmpyembedded.mak" CFG="gdcmpyembedded - Win32 Debug"\r
+!MESSAGE \r
+!MESSAGE Possible choices for configuration are:\r
+!MESSAGE \r
+!MESSAGE "gdcmpyembedded - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE "gdcmpyembedded - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE \r
+\r
+# Begin Project\r
+# PROP AllowPerConfigDependencies 0\r
+# PROP Scc_ProjName ""\r
+# PROP Scc_LocalPath ""\r
+CPP=cl.exe\r
+MTL=midl.exe\r
+RSC=rc.exe\r
+\r
+!IF  "$(CFG)" == "gdcmpyembedded - Win32 Release"\r
+\r
+# PROP BASE Use_MFC 0\r
+# PROP BASE Use_Debug_Libraries 0\r
+# PROP BASE Output_Dir "gdcmpyembedded___Win32_Release"\r
+# PROP BASE Intermediate_Dir "gdcmpyembedded___Win32_Release"\r
+# PROP BASE Target_Dir ""\r
+# PROP Use_MFC 0\r
+# PROP Use_Debug_Libraries 0\r
+# PROP Output_Dir "gdcmpyembedded___Win32_Release"\r
+# PROP Intermediate_Dir "gdcmpyembedded___Win32_Release"\r
+# PROP Ignore_Export_Lib 0\r
+# PROP Target_Dir ""\r
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMPYembedded_EXPORTS" /YX /FD /c\r
+# ADD CPP /nologo /MT /w /W0 /GX /O2 /I "$(CREATIS)\python22\include" /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMPYembedded_EXPORTS" /YX /FD /c\r
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
+# ADD BASE RSC /l 0x40c /d "NDEBUG"\r
+# ADD RSC /l 0x40c /d "NDEBUG"\r
+BSC32=bscmake.exe\r
+# ADD BASE BSC32 /nologo\r
+# ADD BSC32 /nologo\r
+LINK32=link.exe\r
+# 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\r
+# ADD LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib Wsock32.lib /nologo /dll /machine:I386 /out:"../_gdcm.dll"\r
+# Begin Special Build Tool\r
+ProjDir=.\r
+SOURCE="$(InputPath)"\r
+PostBuild_Cmds=move       $(ProjDir)\gdcm.py       $(ProjDir)\..\ \r
+# End Special Build Tool\r
+\r
+!ELSEIF  "$(CFG)" == "gdcmpyembedded - Win32 Debug"\r
+\r
+# PROP BASE Use_MFC 0\r
+# PROP BASE Use_Debug_Libraries 1\r
+# PROP BASE Output_Dir "gdcmpyembedded___Win32_Debug"\r
+# PROP BASE Intermediate_Dir "gdcmpyembedded___Win32_Debug"\r
+# PROP BASE Target_Dir ""\r
+# PROP Use_MFC 0\r
+# PROP Use_Debug_Libraries 1\r
+# PROP Output_Dir "gdcmpyembedded___Win32_Debug"\r
+# PROP Intermediate_Dir "gdcmpyembedded___Win32_Debug"\r
+# PROP Ignore_Export_Lib 0\r
+# PROP Target_Dir ""\r
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMPYembedded_EXPORTS" /YX /FD /GZ /c\r
+# ADD CPP /nologo /MTd /w /W0 /Gm /GX /ZI /Od /I "$(CREATIS)\python22\include" /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMPYembedded_EXPORTS" /YX /FD /GZ /c\r
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
+# ADD BASE RSC /l 0x40c /d "_DEBUG"\r
+# ADD RSC /l 0x40c /d "_DEBUG"\r
+BSC32=bscmake.exe\r
+# ADD BASE BSC32 /nologo\r
+# ADD BSC32 /nologo\r
+LINK32=link.exe\r
+# 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\r
+# ADD LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib Wsock32.lib /nologo /dll /debug /machine:I386 /out:"../_gdcm_d.dll" /pdbtype:sept\r
+# Begin Special Build Tool\r
+ProjDir=.\r
+SOURCE="$(InputPath)"\r
+PostBuild_Cmds=mv       $(ProjDir)\gdcm.py       $(ProjDir)\..\ \r
+# End Special Build Tool\r
+\r
+!ENDIF \r
+\r
+# Begin Target\r
+\r
+# Name "gdcmpyembedded - Win32 Release"\r
+# Name "gdcmpyembedded - Win32 Debug"\r
+# Begin Group "Source Files"\r
+\r
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
+# Begin Source File\r
+\r
+SOURCE=..\gdcm.i\r
+\r
+!IF  "$(CFG)" == "gdcmpyembedded - Win32 Release"\r
+\r
+# Begin Custom Build\r
+ProjDir=.\r
+InputPath=..\gdcm.i\r
+InputName=gdcm\r
+\r
+"$(ProjDir)\$(InputName)_wrap.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       C:\creatis\SWIG\swig -python -c++ -I..\..\..\src -o $(ProjDir)\$(InputName)_wrap.cxx $(InputPath)\r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "gdcmpyembedded - Win32 Debug"\r
+\r
+# Begin Custom Build - Performing Custom Build Step on $(InputPath)\r
+ProjDir=.\r
+InputPath=..\gdcm.i\r
+InputName=gdcm\r
+\r
+"$(ProjDir)\$(InputName)_wrap.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       C:\creatis\SWIG\swig -python -c++ -I..\..\src -o $(ProjDir)\$(InputName)_wrap.cxx $(InputPath)\r
+\r
+# End Custom Build\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\gdcm_wrap.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\gdcmDict.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\gdcmDictEntry.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\gdcmDictSet.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\gdcmElValSet.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\gdcmElValue.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\gdcmException.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\gdcmFile.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\gdcmHeader.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\gdcmHeaderIdo.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\gdcmJpeg.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\gdcmUtil.cxx\r
+# End Source File\r
+# End Group\r
+# Begin Group "Header Files"\r
+\r
+# PROP Default_Filter "h;hpp;hxx;hm;inl"\r
+# End Group\r
+# Begin Group "Resource Files"\r
+\r
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\..\Python22\libs\python22.lib\r
+# End Source File\r
+# End Group\r
+# End Target\r
+# End Project\r

diff --git a/src/gdcmHeader.cxx b/src/gdcmHeader.cxx
index 6a6a277ae681c7250ebbbfbed2da5cdff66be044..7073582b4ddde10946270cc0aec96a2680940e9c 100644 (file)
--- a/src/gdcmHeader.cxx
+++ b/src/gdcmHeader.cxx
@@ -13,7 +13,7 @@
 #include "gdcmUtil.h"
 #include "gdcmHeader.h"
 
-#include <iddcmjpeg.h>
+#include "iddcmjpeg.h"
 
 // Refer to gdcmHeader::CheckSwap()
 #define HEADER_LENGTH_TO_READ       256

diff --git a/src/gdcmJpeg.cxx b/src/gdcmJpeg.cxx
index 8f007c01805250b5d161e8c3547659d5240c924f..120656ed2bda9ae7c50becda980b7c713eadd6f2 100644 (file)
--- a/src/gdcmJpeg.cxx
+++ b/src/gdcmJpeg.cxx
@@ -1,4 +1,4 @@
-#include <iddcmjpeg.h>
+#include "iddcmjpeg.h"
 #include <stdlib.h>    
        
 static ClbJpeg* ClbJpegAlloc(void);

diff --git a/src/win32/gdcmdll/gdcmdll.dsp b/src/win32/gdcmdll/gdcmdll.dsp
index 3cdf01c0ecfaabceb08354d88d17d70c52335645..b3e8e0ae4c67918d6f51808c50c2977928b47cde 100644 (file)
--- a/src/win32/gdcmdll/gdcmdll.dsp
+++ b/src/win32/gdcmdll/gdcmdll.dsp
@@ -58,7 +58,7 @@ LINK32=link.exe
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copy for test
-PostBuild_Cmds=copy  ..\..\..\python\gdcmdll.dll  ..\..\..\test\ 
+PostBuild_Cmds=copy   ..\..\..\python\gdcmdll.dll   ..\..\..\test\ 
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "gdcmdll - Win32 Debug"
@@ -90,7 +90,7 @@ LINK32=link.exe
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copy for test
-PostBuild_Cmds=copy  ..\..\..\python\gdcmdll.dll  ..\..\..\test\ 
+PostBuild_Cmds=copy   ..\..\..\python\gdcmdll.dll   ..\..\..\test\ 
 # End Special Build Tool
 
 !ENDIF 
@@ -140,6 +140,10 @@ SOURCE=..\..\gdcmHeaderIdo.cxx
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\gdcmJpeg.cxx
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\gdcmUtil.cxx
 # End Source File
 # End Group
@@ -150,10 +154,6 @@ SOURCE=..\..\gdcmUtil.cxx
 # Begin Group "Resource Files"
 
 # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# Begin Source File
-
-SOURCE="C:\creatis\glib-1.3\src\glib\glib-1.3.lib"
-# End Source File
 # End Group
 # End Target
 # End Project