fixed "tiffio" header inclusion to use user version on Win32 system only (otherwise...

[openjpeg.git] / jpwl / LibOpenJPEG_JPWL.dsp

diff --git a/jpwl/LibOpenJPEG_JPWL.dsp b/jpwl/LibOpenJPEG_JPWL.dsp
index 73f4889e0904b296029a3d58a68e5f78d73f56fa..d7bf7937d5ce3d219ab964bebc4f4348c03f0342 100644 (file)
--- a/jpwl/LibOpenJPEG_JPWL.dsp
+++ b/jpwl/LibOpenJPEG_JPWL.dsp
@@ -41,7 +41,8 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c\r
-# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "OPJ_STATIC" /D "USE_JPWL" /D "USE_JPSEC" /YX /FD /c\r
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../libopenjpeg" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "OPJ_STATIC" /D "USE_JPWL" /D "USE_JPSEC" /FD /c\r
+# SUBTRACT CPP /YX\r
 # ADD BASE RSC /l 0x80c /d "NDEBUG"\r
 # ADD RSC /l 0x80c /d "NDEBUG"\r
 BSC32=bscmake.exe\r
@@ -64,7 +65,8 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Debug"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "OPJ_STATIC" /D "USE_JPWL" /D "USE_JPSEC" /YX /FD /GZ /c\r
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../libopenjpeg" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "OPJ_STATIC" /D "USE_JPWL" /D "USE_JPSEC" /FD /GZ /c\r
+# SUBTRACT CPP /YX\r
 # ADD BASE RSC /l 0x80c /d "_DEBUG"\r
 # ADD RSC /l 0x80c /d "_DEBUG"\r
 BSC32=bscmake.exe\r
@@ -245,6 +247,10 @@ SOURCE=..\libopenjpeg\opj_includes.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\libopenjpeg\opj_malloc.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\libopenjpeg\pi.h\r
 # End Source File\r
 # Begin Source File\r