* src/win32/libgdcmijpeg12.dsp was missing

* modified gdcm.dsw accordingly

diff --git a/ChangeLog b/ChangeLog
index f08d55ffb08e441ebf8d7a2a37c2271d4f631227..122c3d6aa95d2e5993cae9ab659698e2cb5e7bad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
+2003-07-29  Mathieu Malaterre  <Mathieu.Malaterre@creatis.insa-lyon.fr>
+      * src/win32/libgdcmijpeg12.dsp was missing
+      * modified gdcm.dsw accordingly
 2003-07-28  Mathieu Malaterre  <Mathieu.Malaterre@creatis.insa-lyon.fr>
-       * src/gdcmHeader.cxx : misplaced return 0.; for ACR/NEMA
+          * src/gdcmHeader.cxx : misplaced return 0.; for ACR/NEMA
 2003-07-24 Benoit Regrain <Benoit.Regrain@creatis.insa-lyon.fr>
       * src/jpeg/libijg12/.cvsignore, jconfig.* : ommited files while last
         commit of JPR (before his hollidays to facilitate our work).

diff --git a/gdcm.dsw b/gdcm.dsw
index be905f70e6c0a8bee1886c6defb381db6ab323e9..1df4fee2e6ac8e8c03930f2b753a114977fe8d22 100644 (file)
--- a/gdcm.dsw
+++ b/gdcm.dsw
@@ -75,6 +75,18 @@ Package=<4>
 
 ###############################################################################
 
+Project: "libgdcmijpeg12"=.\SRC\WIN32\libgdcmijpeg12.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "vtkGdcmTest"=.\VTK\WIN32\vtkGdcmTest.dsp - Package Owner=<4>
 
 Package=<5>

diff --git a/src/win32/libgdcmijpeg12.dsp b/src/win32/libgdcmijpeg12.dsp
new file mode 100644 (file)
index 0000000..03af71f
--- /dev/null
+++ b/src/win32/libgdcmijpeg12.dsp
@@ -0,0 +1,295 @@
+# Microsoft Developer Studio Project File - Name="libgdcmijpeg12" - 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=libgdcmijpeg12 - 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 "libgdcmijpeg12.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 "libgdcmijpeg12.mak" CFG="libgdcmijpeg12 - Win32 Debug"\r
+!MESSAGE \r
+!MESSAGE Possible choices for configuration are:\r
+!MESSAGE \r
+!MESSAGE "libgdcmijpeg12 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE "libgdcmijpeg12 - 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)" == "libgdcmijpeg12 - Win32 Release"\r
+\r
+# PROP BASE Use_MFC 0\r
+# PROP BASE Use_Debug_Libraries 0\r
+# PROP BASE Output_Dir "Release"\r
+# PROP BASE Intermediate_Dir "Release"\r
+# PROP BASE Target_Dir ""\r
+# PROP Use_MFC 0\r
+# PROP Use_Debug_Libraries 0\r
+# PROP Output_Dir "Release__libgdcmijpeg12"\r
+# PROP Intermediate_Dir "Release__libgdcmijpeg12"\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 "libgdcmijpeg12_EXPORTS" /YX /FD /c\r
+# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libgdcmijpeg12_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 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\libgdcmijpeg12.dll"\r
+# Begin Special Build Tool\r
+SOURCE="$(InputPath)"\r
+PostBuild_Cmds=copy  Release__libgdcmijpeg12\libgdcmijpeg12.lib  ..\..\lib\    copy  ..\..\lib\libgdcmijpeg12.dll  ..\..\gdcmPython\   copy  ..\..\lib\libgdcmijpeg12.dll  ..\..\vtk\ \r
+# End Special Build Tool\r
+\r
+!ELSEIF  "$(CFG)" == "libgdcmijpeg12 - Win32 Debug"\r
+\r
+# PROP BASE Use_MFC 0\r
+# PROP BASE Use_Debug_Libraries 1\r
+# PROP BASE Output_Dir "Debug"\r
+# PROP BASE Intermediate_Dir "Debug"\r
+# PROP BASE Target_Dir ""\r
+# PROP Use_MFC 0\r
+# PROP Use_Debug_Libraries 1\r
+# PROP Output_Dir "Debug__libgdcmijpeg12"\r
+# PROP Intermediate_Dir "Debug__libgdcmijpeg12"\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 "libgdcmijpeg12_EXPORTS" /YX /FD /GZ  /c\r
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libgdcmijpeg12_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 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\libgdcmijpeg12.dll" /pdbtype:sept\r
+# Begin Special Build Tool\r
+SOURCE="$(InputPath)"\r
+PostBuild_Cmds=copy  Debug__libgdcmijpeg12\libgdcmijpeg12.lib  ..\..\lib\      copy  ..\..\lib\libgdcmijpeg12.dll  ..\..\gdcmPython\   copy  ..\..\lib\libgdcmijpeg12.dll  ..\..\vtk\ \r
+# End Special Build Tool\r
+\r
+!ENDIF \r
+\r
+# Begin Target\r
+\r
+# Name "libgdcmijpeg12 - Win32 Release"\r
+# Name "libgdcmijpeg12 - 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=..\jpeg\libijg12\jcapimin.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jcapistd.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jccoefct.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jccolor.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jcdctmgr.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jchuff.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jcinit.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jcmainct.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jcmarker.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jcmaster.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jcomapi.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jcparam.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jcphuff.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jcprepct.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jcsample.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jctrans.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jdapimin.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jdapistd.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jdatadst.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jdatasrc.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jdcoefct.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jdcolor.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jddctmgr.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jdhuff.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jdinput.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jdmainct.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jdmarker.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jdmaster.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jdmerge.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jdphuff.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jdpostct.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jdsample.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jdtrans.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jerror.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jfdctflt.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jfdctfst.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jfdctint.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jidctflt.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jidctfst.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jidctint.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jidctred.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jmemmgr.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jmemnobs.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jquant1.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jquant2.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jutils.c\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
+# End Group\r
+# End Target\r
+# End Project\r