Some fixes to allow build with mingw (#2304)

AcademySoftwareFoundation · Aug 1, 2019 · 7d3ebb8 · 7d3ebb8
1 parent 68d972d
commit 7d3ebb8
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -215,7 +215,7 @@ add_subdirectory (src/fonts)
 add_subdirectory (src/nuke)
 
 # install pkgconfig file
-IF ( NOT WIN32 )
+IF ( NOT MSVC )
    configure_file(src/build-scripts/OpenImageIO.pc.in "${CMAKE_BINARY_DIR}/OpenImageIO.pc" @ONLY) 
    install (FILES "${CMAKE_BINARY_DIR}/OpenImageIO.pc"
             DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig

diff --git a/src/include/OpenImageIO/export.h b/src/include/OpenImageIO/export.h
@@ -70,7 +70,7 @@
 ///
 ///
 
-#if defined(_MSC_VER) || defined(__CYGWIN__)
+#if defined(_WIN32) || defined(__CYGWIN__)
 #    ifndef OIIO_STATIC_BUILD
 #        define OIIO_IMPORT __declspec(dllimport)
 #        define OIIO_EXPORT __declspec(dllexport)

diff --git a/src/include/OpenImageIO/simd.h b/src/include/OpenImageIO/simd.h
@@ -87,7 +87,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 // OIIO_SIMD_HAS_SIMD8 : nonzero if vfloat8, vint8, vbool8 are defined
 // OIIO_SIMD_HAS_SIMD16 : nonzero if vfloat16, vint16, vbool16 are defined
 
-#if defined(_MSC_VER)
+#if defined(_WIN32)
 #  include <intrin.h>
 #elif defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__))
 #  include <x86intrin.h>

diff --git a/src/iv/ivmain.cpp b/src/iv/ivmain.cpp
@@ -102,7 +102,7 @@ getargs(int argc, char* argv[])
     }
 }
 
-#ifdef WIN32
+#ifdef _MSC_VER
 // if we are not in DEBUG mode this code switch the app to
 // full windowed mode (no console and no need to define WinMain)
 // FIXME: this should be done in CMakeLists.txt but first we have to

diff --git a/src/libOpenImageIO/CMakeLists.txt b/src/libOpenImageIO/CMakeLists.txt
@@ -160,8 +160,10 @@ if (MSVC)
                   APPEND_STRING PROPERTY COMPILE_FLAGS " /bigobj ")
 endif ()
 
-if (WIN32)
+if (MSVC)
     target_link_libraries (OpenImageIO psapi.lib)
+elseif(MINGW)
+    target_link_libraries (OpenImageIO psapi ws2_32)
 endif ()
 
 if (VISIBILITY_MAP_FILE)

diff --git a/src/libutil/farmhash.cpp b/src/libutil/farmhash.cpp
@@ -116,7 +116,7 @@
 
 #if defined(FARMHASH_UNKNOWN_ENDIAN) || !defined(bswap_64)
 
-#ifdef _MSC_VER
+#ifdef _WIN32
 
 #undef bswap_32
 #undef bswap_64