[GM-commit] GraphicsMagick: Even more dependencies of webp must be dropped. ...

[GraphicsMagick C. <gra...@li...>]

changeset 5859816b1100 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=5859816b1100
summary: Even more dependencies of webp must be dropped. Now it should work.

diffstat:

 VisualMagick/configure/configure.cpp |  18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diffs (56 lines):

diff -r 13d8d4b4d36a -r 5859816b1100 VisualMagick/configure/configure.cpp
--- a/VisualMagick/configure/configure.cpp	Sun Aug 17 18:30:55 2014 +0200
+++ b/VisualMagick/configure/configure.cpp	Sun Aug 17 19:33:16 2014 +0200
@@ -366,6 +366,11 @@
           if (LocalFindNoCase(strName,"CORE_%sjpeg",0) == 0)
             continue;
         }
+      if(!visualStudio7)
+      {
+        if(LocalFindNoCase(strName,"CORE_%swebp",0) == 0)
+            continue;
+      }
       if (LocalFindNoCase(strName,s,0) == 0)
         {
           // NOTE: This is case sensitive - so be warned!
@@ -1038,8 +1043,11 @@
   add_includes(includes_list, extra, levels-2);
   extra = "..\\ttf\\include";
   add_includes(includes_list, extra, levels-2);
-  extra = "..\\webp\\src";
-  add_includes(includes_list, extra, levels-2);
+  if(visualStudio7)
+  {
+    extra = "..\\webp\\src";
+    add_includes(includes_list, extra, levels-2);
+  }
   extra = "..\\libxml\\include";
   add_includes(includes_list, extra, levels-2);
   add_includes(includes_list, staging, levels-2);
@@ -1324,7 +1332,7 @@
       extra = "..\\zlib";
       add_includes(includes_list, extra, levels-2);
     }
-  if (name.compare("webp") == 0)
+  if (name.compare("webp") == 0 && visualStudio7)
     {
       extra = "..\\webp\\src";
       add_includes(includes_list, extra, levels-2);
@@ -3585,7 +3593,7 @@
 	   lib_shared_list.push_back("CORE_RL_filters_.lib");
 	   lib_shared_list.push_back("CORE_RL_coders_.lib");
 	   lib_shared_list.push_back("CORE_RL_libxml_.lib");
-           if(visualStudio7)
+       if(visualStudio7)
 	     lib_shared_list.push_back("CORE_RL_webp_.lib");
 	   lib_shared_list.push_back("CORE_RL_wmf_.lib");
 	   lib_shared_list.push_back("CORE_RL_magick_.lib");
@@ -3651,7 +3659,7 @@
 	   lib_shared_list.push_back("CORE_DB_coders_.lib");
 	   lib_shared_list.push_back("CORE_DB_libxml_.lib");
 	   lib_shared_list.push_back("CORE_DB_wmf_.lib");
-           if(visualStudio7)
+       if(visualStudio7)
 	     lib_shared_list.push_back("CORE_DB_webp_.lib");
 	   lib_shared_list.push_back("CORE_DB_magick_.lib");
 	 }