diff --git a/CMakeLists.txt b/CMakeLists.txt
index 76babf2..3803ad8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -100,26 +100,23 @@ ADD_DEFINITIONS(-Du_int8_t=uint8_t -Du_int16_t=uint16_t)
 
 IF(MINGW)
   IF (CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
-    # force MinGW-w64 in 32bit mode
-    SET(CMAKE_C_FLAGS "-m32 ${CMAKE_C_FLAGS}")
-    SET(CMAKE_MODULE_LINKER_FLAGS "-m32 -Wl,--enable-stdcall-fixup ${CMAKE_SHARED_LINKER_FLAGS}")
-    SET(CMAKE_SHARED_LINKER_FLAGS "-m32 -Wl,--enable-stdcall-fixup ${CMAKE_SHARED_LINKER_FLAGS}")
-    SET(CMAKE_EXE_LINKER_FLAGS "-m32 -Wl,--enable-stdcall-fixup ${CMAKE_EXE_LINKER_FLAGS}")
-    SET(CMAKE_RC_FLAGS "--target=pe-i386 --output-format=coff ${CMAKE_RC_FLAGS}")
   ELSE(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
     IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86")
-        # force MinGW-w64 in 32bit mode
-        MESSAGE("Building 32-bit Windows DLL")
-        #SET(CMAKE_C_FLAGS "-m32 ${CMAKE_C_FLAGS}")
-        #SET(CMAKE_MODULE_LINKER_FLAGS "--Wl,--enable-stdcall-fixup ${CMAKE_SHARED_LINKER_FLAGS}")
-        #SET(CMAKE_SHARED_LINKER_FLAGS "--Wl,--enable-stdcall-fixup ${CMAKE_SHARED_LINKER_FLAGS}")
-        #SET(CMAKE_EXE_LINKER_FLAGS "--Wl,--enable-stdcall-fixup ${CMAKE_EXE_LINKER_FLAGS}")
-        SET(CMAKE_RC_FLAGS "--target=pe-i386 --output-format=coff ${CMAKE_RC_FLAGS}")
+      MESSAGE("Building 32-bit Windows DLL")
+      SET(CMAKE_C_FLAGS "-m32 ${CMAKE_C_FLAGS}")
+      SET(CMAKE_MODULE_LINKER_FLAGS "-m32 -Wl,--enable-stdcall-fixup ${CMAKE_SHARED_LINKER_FLAGS}")
+      SET(CMAKE_SHARED_LINKER_FLAGS "-m32 -Wl,--enable-stdcall-fixup ${CMAKE_SHARED_LINKER_FLAGS}")
+      SET(CMAKE_EXE_LINKER_FLAGS "-m32 -Wl,--enable-stdcall-fixup ${CMAKE_EXE_LINKER_FLAGS}")
+      SET(CMAKE_RC_FLAGS "--target=pe-i386 --output-format=coff ${CMAKE_RC_FLAGS}")
     ELSEIF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-        MESSAGE("Building 64-bit Windows DLL")
-        SET(CMAKE_RC_FLAGS "--target=pe-x86-64 --output-format=coff ${CMAKE_RC_FLAGS}")
+      MESSAGE("Building 64-bit Windows DLL")
+      SET(CMAKE_C_FLAGS "-m64 ${CMAKE_C_FLAGS}")
+      SET(CMAKE_MODULE_LINKER_FLAGS "-m64 -Wl,--enable-stdcall-fixup ${CMAKE_SHARED_LINKER_FLAGS}")
+      SET(CMAKE_SHARED_LINKER_FLAGS "-m64 -Wl,--enable-stdcall-fixup ${CMAKE_SHARED_LINKER_FLAGS}")
+      SET(CMAKE_EXE_LINKER_FLAGS "-m64 -Wl,--enable-stdcall-fixup ${CMAKE_EXE_LINKER_FLAGS}")
+      SET(CMAKE_RC_FLAGS "--target=pe-x86-64 --output-format=coff ${CMAKE_RC_FLAGS}")
     ELSE(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86")
-        MESSAGE(FATAL_ERROR "Unknown Processor: ${CMAKE_SYSTEM_PROCESSOR}")
+      MESSAGE(FATAL_ERROR "Unknown Processor: ${CMAKE_SYSTEM_PROCESSOR}")
     ENDIF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86")
   ENDIF(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")