diff --git a/external/mapbox-gl-native.cmake b/external/mapbox-gl-native.cmake
index b27a3661..910a6849 100644
--- a/external/mapbox-gl-native.cmake
+++ b/external/mapbox-gl-native.cmake
@@ -3,6 +3,7 @@ set(PROJECT_NAME scwx-mbgl)
 
 set(gtest_disable_pthreads ON)
 set(MBGL_WITH_QT ON)
+set(MBGL_QT_WITH_INTERNAL_ICU ON)
 add_subdirectory(mapbox-gl-native)
 
 find_package(ZLIB)
diff --git a/scwx-qt/scwx-qt.cmake b/scwx-qt/scwx-qt.cmake
index d6e3a615..fe097017 100644
--- a/scwx-qt/scwx-qt.cmake
+++ b/scwx-qt/scwx-qt.cmake
@@ -373,7 +373,7 @@ target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets
                                      Boost::json
                                      Boost::timer
                                      qmaplibregl
-                                     opengl32
+                                     $<$<CXX_COMPILER_ID:MSVC>:opengl32>
                                      freetype-gl
                                      GeographicLib::GeographicLib
                                      glm::glm