diff --git a/cmake/emscripten.cmake b/cmake/emscripten.cmake
index e82d1b63c..1780dee98 100644
--- a/cmake/emscripten.cmake
+++ b/cmake/emscripten.cmake
@@ -1,29 +1,20 @@
 SET(CMAKE_SYSTEM_NAME Linux)
 SET(CMAKE_SYSTEM_PROCESSOR x86)
 
-SET(CMAKE_CROSSCOMPILING TRUE)
-SET_PROPERTY(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS FALSE)
-
-# Unset WIN32 and APPLE
-SET(WIN32)
-SET(APPLE)
-
-# Emscripten is able to mimic Unix systems
-SET(UNIX 1)
-
 if (CMAKE_HOST_WIN32)
-  SET(CMAKE_C_COMPILER   "emcc.bat")
-  SET(CMAKE_CXX_COMPILER "em++.bat")
+  SET(EMSCRIPTEN_EXTENSION ".bat")
 else ()
-  SET(CMAKE_C_COMPILER   "emcc")
-  SET(CMAKE_CXX_COMPILER "em++")
+  SET(EMSCRIPTEN_EXTENSION "")
 endif()
 
+SET(CMAKE_C_COMPILER   emcc${EMSCRIPTEN_EXTENSION})
+SET(CMAKE_CXX_COMPILER em++${EMSCRIPTEN_EXTENSION})
+
 if(NOT DEFINED CMAKE_AR)
-  find_program(CMAKE_AR NAMES emar)
+  find_program(CMAKE_AR NAMES emar${EMSCRIPTEN_EXTENSION})
 endif()
 if(NOT DEFINED CMAKE_RANLIB)
-  find_program(CMAKE_RANLIB NAMES emranlib)
+  find_program(CMAKE_RANLIB NAMES emranlib${EMSCRIPTEN_EXTENSION})
 endif()
 
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)