Merge pull request #26 from tribal-tec/master

Fix MSVC build
BlueBrain · Jul 13, 2015 · 2a192ad · 2a192ad
2 parents e51d643 + 8567569
commit 2a192ad
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.gitexternals b/.gitexternals
@@ -1,2 +1,2 @@
 # -*- mode: cmake -*-
-# CMake/common https://github.com/Eyescale/CMake.git 188cf22
+# CMake/common https://github.com/Eyescale/CMake.git b5baa4e
diff --git a/apps/DesktopStreamer/CMakeLists.txt b/apps/DesktopStreamer/CMakeLists.txt
@@ -38,7 +38,7 @@ if(APPLE)
   else()
     list(APPEND DESKTOPSTREAMER_LINK_LIBRARIES "-framework CoreGraphics")
   endif()
-elseif(WIN32)
+elseif(MSVC)
   list(APPEND DESKTOPSTREAMER_LINK_LIBRARIES Ws2_32)
 endif()
 

diff --git a/deflect/ImageWrapper.h b/deflect/ImageWrapper.h
@@ -67,7 +67,7 @@ enum CompressionPolicy {
  * (disabled by default).
  * @version 1.0
  */
-struct DEFLECT_API ImageWrapper
+struct ImageWrapper
 {
     /**
      * ImageWrapper constructor