diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c074ea2ef..d55a725dd 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -210,22 +210,16 @@ ENDFOREACH()
 
 set_target_properties(lmms PROPERTIES
 	ENABLE_EXPORTS ON
+	WIN32_EXECUTABLE $<NOT:$<CONFIG:DEBUG>>
 )
 
-IF(LMMS_BUILD_WIN32)
-	IF(NOT MSVC)
-		SET_PROPERTY(TARGET lmms
-			APPEND_STRING PROPERTY LINK_FLAGS " -mwindows"
-		)
-	ENDIF()
-	IF(LMMS_BUILD_MSYS)
-		# ENABLE_EXPORTS property has no effect in some MSYS2 configurations.
-		# Add the linker flag manually to create liblmms.dll.a import library
-		SET_PROPERTY(TARGET lmms
-			APPEND_STRING PROPERTY LINK_FLAGS " -Wl,--out-implib,liblmms.dll.a"
-		)
-	ENDIF()
-ELSE()
+IF(LMMS_BUILD_MSYS)
+	# ENABLE_EXPORTS property has no effect in some MSYS2 configurations.
+	# Add the linker flag manually to create liblmms.dll.a import library
+	SET_PROPERTY(TARGET lmms
+		APPEND_STRING PROPERTY LINK_FLAGS " -Wl,--out-implib,liblmms.dll.a"
+	)
+ELSEIF(NOT WIN32)
 	if(CMAKE_INSTALL_MANDIR)
 		SET(INSTALL_MANDIR ${CMAKE_INSTALL_MANDIR})
 	ELSE(CMAKE_INSTALL_MANDIR)