X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=gdcmPython%2Fwin32%2Fgdcmpyembedded.dsp;h=17cbfff7eb439a2fc981142f5adeea34c3c011f2;hb=2d80f3c3dc0de0087e7a11ffec6be009e97405a5;hp=caa48e4cad3c2137ca92014860e4ddf28a8eefff;hpb=3e78befc911eac2ecc70747854911d1f803797b5;p=gdcm.git

diff --git a/gdcmPython/win32/gdcmpyembedded.dsp b/gdcmPython/win32/gdcmpyembedded.dsp
index caa48e4c..17cbfff7 100644
--- a/gdcmPython/win32/gdcmpyembedded.dsp
+++ b/gdcmPython/win32/gdcmpyembedded.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 "GDCMPYembedded_EXPORTS" /YX /FD /c
-# 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
+# ADD CPP /nologo /MT /w /W0 /GX /O2 /I "$(CREATIS)\python22\include" /I "..\..\src" /I "..\..\src\jpeg\libijg8" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMPYembedded_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,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"
@@ -74,7 +74,7 @@ PostBuild_Cmds=move        $(ProjDir)\gdcm.py        $(ProjDir)\..\
 # 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 "GDCMPYembedded_EXPORTS" /YX /FD /GZ /c
-# 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
+# ADD CPP /nologo /MTd /w /W0 /Gm /GX /ZI /I "..\..\src\jpeg\libijg8" /I "$(CREATIS)\python22\include" /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMPYembedded_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"
@@ -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 
@@ -112,7 +112,7 @@ 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)
+	C:\creatis\SWIG\swig -python -c++ -I..\..\src -o $(ProjDir)\$(InputName)_wrap.cxx $(InputPath)
 
 # End Custom Build
 
@@ -177,6 +177,14 @@ SOURCE=..\..\src\gdcmJpeg.cxx
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\gdcmJpegIdo.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\gdcmTS.cxx
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\gdcmUtil.cxx
 # End Source File
 # Begin Source File
@@ -193,8 +201,12 @@ SOURCE=..\..\src\gdcmVR.cxx
 # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
 # Begin Source File
 
-SOURCE=..\..\..\..\Python22\libs\python22.lib
+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