X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2Fwin32%2Fgdcmdll.dsp;h=86f281ac39e58ffc4c0c33798f1083321bc26fef;hb=398de28036f1804dd0a77d5b715315f014253496;hp=4c38ef9f30a5e523415ea1b69a0ce52c70d96871;hpb=217d29dae64cbc4c1049e3617da4f2df6b82e8ef;p=gdcm.git

diff --git a/src/win32/gdcmdll.dsp b/src/win32/gdcmdll.dsp
index 4c38ef9f..86f281ac 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" /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" /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
+# ADD LINK32 kernel32.lib msvcrtd.lib msvcprtd.lib Wsock32.lib /nologo /dll /debug /machine:I386 /nodefaultlib /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 
@@ -136,6 +136,10 @@ SOURCE=..\gdcmHeader.cxx
 # End Source File
 # Begin Source File
 
+SOURCE=..\gdcmHeaderHelper.cxx
+# End Source File
+# Begin Source File
+
 SOURCE=..\gdcmHeaderIdo.cxx
 # End Source File
 # Begin Source File
@@ -144,6 +148,22 @@ SOURCE=..\gdcmJpeg.cxx
 # End Source File
 # Begin Source File
 
+SOURCE=..\gdcmJpeg12.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\gdcmJpeg2000.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\gdcmRLE.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\gdcmTS.cxx
+# End Source File
+# Begin Source File
+
 SOURCE=..\gdcmUtil.cxx
 # End Source File
 # Begin Source File
@@ -159,5 +179,17 @@ SOURCE=..\gdcmVR.cxx
 
 # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
 # 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