diff --git a/Engine/source/CMakeLists.txt b/Engine/source/CMakeLists.txt
index 1dad4d119..3d11409fc 100644
--- a/Engine/source/CMakeLists.txt
+++ b/Engine/source/CMakeLists.txt
@@ -47,7 +47,7 @@ if (APPLE)
     addFramework("IOKit")
     #grrr damn you sdl!
     addFramework("Carbon")
-    addLib("iconv")
+    set(TORQUE_LINK_LIBRARIES ${TORQUE_LINK_LIBRARIES} iconv)
     if(NOT TORQUE_DEDICATED)
         addFramework("OpenGL")
         addFramework("CoreVideo")
diff --git a/Tools/CMake/torque_configs.cmake b/Tools/CMake/torque_configs.cmake
index c018c2c7d..ff4e6bb11 100644
--- a/Tools/CMake/torque_configs.cmake
+++ b/Tools/CMake/torque_configs.cmake
@@ -17,6 +17,11 @@ set(TORQUE_COMPILE_DEFINITIONS ICE_NO_DLL PCRE_STATIC TORQUE_ADVANCED_LIGHTING T
 set(TORQUE_LINK_LIBRARIES tinyxml collada ljpeg squish png_static opcode assimp
                           SDL2 glad pcre convexDecomp zlib)
 
+if(NOT WIN32)
+   set(WIN32 OFF CACHE Bool "" FORCE)
+endif()
+mark_as_advanced(WIN32)
+
 #general
 advanced_option(TORQUE_MULTITHREAD "Multi Threading" ON)
 advanced_option(TORQUE_DISABLE_MEMORY_MANAGER "Disable memory manager" ON)