mtashley
diff --git a/‎.gitignore
+2-2 b/‎.gitignore
+2-2
diff --git a/‎cmake/FindMySQL.cmake
+1-1 b/‎cmake/FindMySQL.cmake
+1-1
diff --git a/‎cmake/FindZeroMQ.cmake
+1-1 b/‎cmake/FindZeroMQ.cmake
+1-1
diff --git a/‎win32/external/mysql/config-win.h ‎ext/include/mysql/config-win.h b/‎win32/external/mysql/config-win.h ‎ext/include/mysql/config-win.h
diff --git a/‎win32/external/mysql/dbug.h ‎ext/include/mysql/dbug.h b/‎win32/external/mysql/dbug.h ‎ext/include/mysql/dbug.h
diff --git a/‎win32/external/mysql/errmsg.h ‎ext/include/mysql/errmsg.h b/‎win32/external/mysql/errmsg.h ‎ext/include/mysql/errmsg.h
diff --git a/‎win32/external/mysql/getopt.h ‎ext/include/mysql/getopt.h b/‎win32/external/mysql/getopt.h ‎ext/include/mysql/getopt.h
diff --git a/‎win32/external/mysql/global.h ‎ext/include/mysql/global.h b/‎win32/external/mysql/global.h ‎ext/include/mysql/global.h
diff --git a/‎win32/external/mysql/hash.h ‎ext/include/mysql/hash.h b/‎win32/external/mysql/hash.h ‎ext/include/mysql/hash.h
diff --git a/‎win32/external/mysql/m_ctype.h ‎ext/include/mysql/m_ctype.h b/‎win32/external/mysql/m_ctype.h ‎ext/include/mysql/m_ctype.h
diff --git a/‎win32/external/mysql/m_string.h ‎ext/include/mysql/m_string.h b/‎win32/external/mysql/m_string.h ‎ext/include/mysql/m_string.h
diff --git a/‎win32/external/mysql/my_alarm.h ‎ext/include/mysql/my_alarm.h b/‎win32/external/mysql/my_alarm.h ‎ext/include/mysql/my_alarm.h
diff --git a/‎win32/external/mysql/my_base.h ‎ext/include/mysql/my_base.h b/‎win32/external/mysql/my_base.h ‎ext/include/mysql/my_base.h
diff --git a/‎win32/external/mysql/my_config.h ‎ext/include/mysql/my_config.h b/‎win32/external/mysql/my_config.h ‎ext/include/mysql/my_config.h
diff --git a/‎win32/external/mysql/my_dir.h ‎ext/include/mysql/my_dir.h b/‎win32/external/mysql/my_dir.h ‎ext/include/mysql/my_dir.h
diff --git a/‎win32/external/mysql/my_global.h ‎ext/include/mysql/my_global.h b/‎win32/external/mysql/my_global.h ‎ext/include/mysql/my_global.h
diff --git a/‎win32/external/mysql/my_list.h ‎ext/include/mysql/my_list.h b/‎win32/external/mysql/my_list.h ‎ext/include/mysql/my_list.h
diff --git a/‎win32/external/mysql/my_net.h ‎ext/include/mysql/my_net.h b/‎win32/external/mysql/my_net.h ‎ext/include/mysql/my_net.h
diff --git a/‎win32/external/mysql/my_no_pthread.h ‎ext/include/mysql/my_no_pthread.h b/‎win32/external/mysql/my_no_pthread.h ‎ext/include/mysql/my_no_pthread.h
diff --git a/‎win32/external/mysql/my_pthread.h ‎ext/include/mysql/my_pthread.h b/‎win32/external/mysql/my_pthread.h ‎ext/include/mysql/my_pthread.h
diff --git a/‎win32/external/mysql/my_secure.h ‎ext/include/mysql/my_secure.h b/‎win32/external/mysql/my_secure.h ‎ext/include/mysql/my_secure.h
diff --git a/‎win32/external/mysql/my_stmt.h ‎ext/include/mysql/my_stmt.h b/‎win32/external/mysql/my_stmt.h ‎ext/include/mysql/my_stmt.h
diff --git a/‎win32/external/mysql/my_sys.h ‎ext/include/mysql/my_sys.h b/‎win32/external/mysql/my_sys.h ‎ext/include/mysql/my_sys.h
diff --git a/‎win32/external/mysql/mysql.h ‎ext/include/mysql/mysql.h b/‎win32/external/mysql/mysql.h ‎ext/include/mysql/mysql.h
diff --git a/‎win32/external/mysql/mysql/client_plugin.h ‎ext/include/mysql/mysql/client_plugin.h b/‎win32/external/mysql/mysql/client_plugin.h ‎ext/include/mysql/mysql/client_plugin.h
diff --git a/‎win32/external/mysql/mysql/plugin_auth.h ‎ext/include/mysql/mysql/plugin_auth.h b/‎win32/external/mysql/mysql/plugin_auth.h ‎ext/include/mysql/mysql/plugin_auth.h
diff --git a/‎win32/external/mysql/mysql/plugin_auth_common.h ‎ext/include/mysql/mysql/plugin_auth_common.h b/‎win32/external/mysql/mysql/plugin_auth_common.h ‎ext/include/mysql/mysql/plugin_auth_common.h
diff --git a/‎win32/external/mysql/mysql_com.h ‎ext/include/mysql/mysql_com.h b/‎win32/external/mysql/mysql_com.h ‎ext/include/mysql/mysql_com.h
diff --git a/‎win32/external/mysql/mysql_io.h ‎ext/include/mysql/mysql_io.h b/‎win32/external/mysql/mysql_io.h ‎ext/include/mysql/mysql_io.h
diff --git a/‎win32/external/mysql/mysql_mm.h ‎ext/include/mysql/mysql_mm.h b/‎win32/external/mysql/mysql_mm.h ‎ext/include/mysql/mysql_mm.h
diff --git a/‎win32/external/mysql/mysql_priv.h ‎ext/include/mysql/mysql_priv.h b/‎win32/external/mysql/mysql_priv.h ‎ext/include/mysql/mysql_priv.h
diff --git a/‎win32/external/mysql/mysql_version.h ‎ext/include/mysql/mysql_version.h b/‎win32/external/mysql/mysql_version.h ‎ext/include/mysql/mysql_version.h
diff --git a/‎win32/external/mysql/mysql_wireprotocol.h ‎ext/include/mysql/mysql_wireprotocol.h b/‎win32/external/mysql/mysql_wireprotocol.h ‎ext/include/mysql/mysql_wireprotocol.h
diff --git a/‎win32/external/mysql/mysqld_error.h ‎ext/include/mysql/mysqld_error.h b/‎win32/external/mysql/mysqld_error.h ‎ext/include/mysql/mysqld_error.h
diff --git a/‎win32/external/mysql/mysys_err.h ‎ext/include/mysql/mysys_err.h b/‎win32/external/mysql/mysys_err.h ‎ext/include/mysql/mysys_err.h
diff --git a/‎win32/external/mysql/sha1.h ‎ext/include/mysql/sha1.h b/‎win32/external/mysql/sha1.h ‎ext/include/mysql/sha1.h
diff --git a/‎win32/external/mysql/thr_alarm.h ‎ext/include/mysql/thr_alarm.h b/‎win32/external/mysql/thr_alarm.h ‎ext/include/mysql/thr_alarm.h
diff --git a/‎win32/external/mysql/violite.h ‎ext/include/mysql/violite.h b/‎win32/external/mysql/violite.h ‎ext/include/mysql/violite.h
diff --git a/‎win32/external/zmq/zmq.h ‎ext/include/zmq/zmq.h b/‎win32/external/zmq/zmq.h ‎ext/include/zmq/zmq.h
diff --git a/‎win32/external/zmq/zmq.hpp ‎ext/include/zmq/zmq.hpp b/‎win32/external/zmq/zmq.hpp ‎ext/include/zmq/zmq.hpp
diff --git a/‎win32/external/zmq/zmq_utils.h ‎ext/include/zmq/zmq_utils.h b/‎win32/external/zmq/zmq_utils.h ‎ext/include/zmq/zmq_utils.h
diff --git a/‎win32/README.md
+17-1 b/‎win32/README.md
+17-1
diff --git a/‎win32/generate_sln.cmd
+4-1 b/‎win32/generate_sln.cmd
+4-1
diff --git a/‎win32/generate_sln_x64.cmd
+4 b/‎win32/generate_sln_x64.cmd
+4
diff --git a/‎win32/topaz.sln
-51 b/‎win32/topaz.sln
-51
@@ -167,8 +167,8 @@ log/tpz.leaks
 .vscode
 
 # Visual Studio
-*.vcxproj*
-win32/topaz.sln
+**/*.vcxproj*
+**/*.sln
 
 # CMake files
 CMakeCache.txt
 
@@ -23,7 +23,7 @@ find_path(MYSQL_INCLUDE_DIR
         mysql.h
     PATHS
         ${MYSQL_ADD_INCLUDE_PATH}
-        ${PROJECT_SOURCE_DIR}/win32/external/mysql
+        ${PROJECT_SOURCE_DIR}/ext/include/mysql
         /usr/include
         /usr/local/bin/
         /usr/bin/)
 
@@ -23,7 +23,7 @@ find_path(ZeroMQ_INCLUDE_DIR
         zmq.h
     PATHS
         ${ZeroMQ_ADD_INCLUDE_PATH}
-        ${PROJECT_SOURCE_DIR}/win32/external/zmq
+        ${PROJECT_SOURCE_DIR}/ext/include/zmq
         /usr/include
         /usr/local/bin/
         /usr/bin/)
 
@@ -1 +1,4 @@
-cmake -G "Visual Studio 15 2017" ..
+IF EXIST CMakeCache.txt (
+    del CMakeCache.txt
+)
+cmake -G "Visual Studio 15 2017" -A Win32 ..
@@ -0,0 +1,4 @@
+IF EXIST CMakeCache.txt (
+    del CMakeCache.txt
+)
+cmake -G "Visual Studio 15 2017" -A x64 ..