diff --git a/src/connector/odbc/CMakeLists.txt b/src/connector/odbc/CMakeLists.txt
index 3a179fc175620347ba58eccacca55630ca450cf4..1480a0af73daec446b9025335963e445c7e8e009 100644
--- a/src/connector/odbc/CMakeLists.txt
+++ b/src/connector/odbc/CMakeLists.txt
@@ -26,3 +26,12 @@ IF (TD_LINUX_64)
   ENDIF ()
 ENDIF ()
 
+IF (TD_WINDOWS_64)
+  find_package(FLEX)
+  if(NOT FLEX_FOUND)
+    message(FATAL_ERROR "you need to install flex first")
+  else ()
+    ADD_SUBDIRECTORY(src)
+    ADD_SUBDIRECTORY(tests)
+  endif()
+ENDIF ()
diff --git a/src/connector/odbc/src/CMakeLists.txt b/src/connector/odbc/src/CMakeLists.txt
index d8438e981786d0d020c71c54d15cc172dac6fa9f..19ee23b19f996efabd2966d45aacd0293768ded5 100644
--- a/src/connector/odbc/src/CMakeLists.txt
+++ b/src/connector/odbc/src/CMakeLists.txt
@@ -22,3 +22,21 @@ IF (TD_LINUX_64)
   install(CODE "execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/install.sh ${CMAKE_BINARY_DIR})")
 ENDIF ()
 
+IF (TD_WINDOWS_64)
+  FLEX_TARGET(todbcFlexScanner
+              todbc_scanner.l
+              ${CMAKE_CURRENT_BINARY_DIR}/todbc_scanner.c
+  )
+  set(todbc_flex_scanner_src
+      ${FLEX_todbcFlexScanner_OUTPUTS}
+  )
+  AUX_SOURCE_DIRECTORY(. SRC)
+
+  # generate dynamic library (*.so)
+  ADD_LIBRARY(todbc SHARED ${SRC} ${todbc_flex_scanner_src})
+  SET_TARGET_PROPERTIES(todbc PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+  SET_TARGET_PROPERTIES(todbc PROPERTIES VERSION ${TD_VER_NUMBER} SOVERSION 1)
+  TARGET_LINK_LIBRARIES(todbc taos_static)
+  target_include_directories(todbc PUBLIC
+                             .)
+ENDIF ()
diff --git a/src/connector/odbc/src/todbc_log.h b/src/connector/odbc/src/todbc_log.h
index ff0409fef6ccc01fb2173905208833983c7833f9..4f5b008d05a918e6fa5212f212be3c1abc2d56b9 100644
--- a/src/connector/odbc/src/todbc_log.h
+++ b/src/connector/odbc/src/todbc_log.h
@@ -16,7 +16,11 @@
 #ifndef _todbc_log_h_
 #define _todbc_log_h_
 
+#ifdef _MSC_VER
+#include "msvcLibgen.h"
+#else
 #include <libgen.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/src/connector/odbc/tests/CMakeLists.txt b/src/connector/odbc/tests/CMakeLists.txt
index ac57a5647fce8bd036e133936284f3f4c847d8c8..1649b45e02fd8474ea1964434d7417c4d186d897 100644
--- a/src/connector/odbc/tests/CMakeLists.txt
+++ b/src/connector/odbc/tests/CMakeLists.txt
@@ -5,3 +5,9 @@ IF (TD_LINUX)
   ADD_EXECUTABLE(tcodbc main.c)
   TARGET_LINK_LIBRARIES(tcodbc odbc)
 ENDIF ()
+
+IF (TD_WINDOWS_64)
+  AUX_SOURCE_DIRECTORY(. SRC)
+  ADD_EXECUTABLE(tcodbc main.c)
+  TARGET_LINK_LIBRARIES(tcodbc odbc)
+ENDIF ()