diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8c59c62e6..8f7c87403 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -212,8 +212,7 @@ if(WIN32)
 		add_definitions(-DNOMINMAX -DWIN32_LEAN_AND_MEAN)
 		add_definitions(-D_UNICODE -DUNICODE)
 	else()
-		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -municode")
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -municode")
+		add_definitions(-D_GNU_SOURCE)
 	endif()
 	list(APPEND OS_LIB ws2_32 shlwapi)
 	list(APPEND CORE_VFS_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/util/vfs/vfs-fd.c ${CMAKE_CURRENT_SOURCE_DIR}/src/platform/windows/vfs-w32.c)
diff --git a/src/platform/qt/CMakeLists.txt b/src/platform/qt/CMakeLists.txt
index b2f77d1ae..b6a06d900 100644
--- a/src/platform/qt/CMakeLists.txt
+++ b/src/platform/qt/CMakeLists.txt
@@ -310,6 +310,9 @@ set_target_properties(${BINARY_NAME}-qt PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CM
 
 if(WIN32)
 	set_target_properties(${BINARY_NAME}-qt PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
+	if(NOT MSVC)
+		target_link_libraries(${BINARY_NAME}-qt -municode)
+	endif()
 endif()
 
 list(APPEND QT_LIBRARIES Qt5::Widgets Qt5::Network)
diff --git a/src/platform/test/cinema-main.c b/src/platform/test/cinema-main.c
index 55a7bcfa6..88fcf2a66 100644
--- a/src/platform/test/cinema-main.c
+++ b/src/platform/test/cinema-main.c
@@ -715,7 +715,11 @@ static struct VDir* _makeOutDir(const char* testName) {
 		strncpy(pathEnd, testName, len);
 		pathEnd += len;
 
+#ifndef _WIN32
 		mkdir(path, 0777);
+#else
+		mkdir(path);
+#endif
 
 		if (!pos) {
 			break;