diff --git a/CMakeLists.txt b/CMakeLists.txt
index 515cefc..be68dc0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -216,6 +216,6 @@ include_directories(${CMAKE_SOURCE_DIR}/asymptote/PRCTools)
 add_executable(mshtopdf WIN32 ${MSHTOPDF_SRCS})
 target_link_libraries(mshtopdf ${ADDITIONAL_LIBRARIES})
 
-if(WIN32)
+if(MSVC)
    set_target_properties(mshtopdf PROPERTIES LINK_FLAGS "/SUBSYSTEM:CONSOLE")
-endif(WIN32)
+endif(MSVC)
diff --git a/mshtoprc/mshtoprc.cpp b/mshtoprc/mshtoprc.cpp
index 883618c..dc08921 100644
--- a/mshtoprc/mshtoprc.cpp
+++ b/mshtoprc/mshtoprc.cpp
@@ -21,7 +21,7 @@
  IDTFConverter.exe  -en 1 -rzf 0 -pq 500 -input test.idtf -output test.u3d
 */
 
-#ifdef WIN32
+#ifdef _MSC_VER
 # pragma warning(disable : 4244)
 # define NOMINMAX
 # include <Windows.h>