diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4b91565da..aa4e746c0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,9 +31,6 @@ ELSE (HAVE_LIBBSD)
 CHECK_FUNCTION_EXISTS(strlcat HAVE_STRLCAT)
 ENDIF(HAVE_LIBBSD)
 
-endif (MSVC)
-
-if (MSVC)
 find_package (PDCurses)
 SET(CURSES_FOUND ${PDCURSES_FOUND})
 SET(CURSES_LIBRARIES ${PDCURSES_LIBRARY})
@@ -42,7 +39,8 @@ else (MSVC)
 find_package (Curses)
 endif (MSVC)
 
-find_package (Readline)
+# find_package (Readline)
+find_package (EXPAT REQUIRED)
 
 if (ERESSEA_DB STREQUAL "db")
 find_package (BerkeleyDB REQUIRED QUIET)
@@ -50,7 +48,6 @@ else()
 find_package (SQLite3 REQUIRED QUIET)
 endif()
 
-find_package(EXPAT REQUIRED)
 find_package (ToLua REQUIRED)
 if (TOLUA_FOUND)
 if (${TOLUA_VERSION_STRING} VERSION_EQUAL "5.2")
diff --git a/cmake/Modules/FindToLua.cmake b/cmake/Modules/FindToLua.cmake
index 52c721112..92732981b 100644
--- a/cmake/Modules/FindToLua.cmake
+++ b/cmake/Modules/FindToLua.cmake
@@ -58,7 +58,9 @@ elseif(TOLUA_INCLUDE_DIR AND EXISTS "${TOLUA_INCLUDE_DIR}/tolua.h")
     string(REGEX REPLACE "^#define[\t ]+TOLUA_VERSION[\t ]+\"tolua ([^\"]*)\".*" "\\1"
            TOLUA_VERSION_STRING "${tolua_version_str}")
     unset(tolua_version_str)
-endif()
+else(PC_TOLUA_VERSION)
+message(ERROR "TOLUA_VERSION_STRING cannot be determined")
+endif(PC_TOLUA_VERSION)
 
 # handle the QUIETLY and REQUIRED arguments and set TOLUA_FOUND to TRUE if
 # all listed variables are TRUE
diff --git a/vs2017-build.bat b/vs2017-build.bat
index 7503153fe..22e153874 100644
--- a/vs2017-build.bat
+++ b/vs2017-build.bat
@@ -1,13 +1,16 @@
 @ECHO OFF
+IF "%WIN32_DEV%" == "" SET WIN32_DEV="C:\Libraries"
+SET CMAKE_ROOT=%ProgramFiles%\CMake
+IF "%LUA_DEV%" == "" SET LUA_DEV="%ProgramFiles(x86)%/Lua/5.1"
 SET VSVERSION=15
 SET SRCDIR=%CD%
-CD ..
-SET ERESSEA=%CD%
+REM CD ..
+REM SET ERESSEA=%CD%
+REM CD %SRCDIR%
 
-CD %SRCDIR%
 IF exist build-vs%VSVERSION% goto HAVEDIR
 mkdir build-vs%VSVERSION%
 :HAVEDIR
 cd build-vs%VSVERSION%
-"%ProgramFiles%\CMake\bin\cmake.exe" -G "Visual Studio %VSVERSION%" -DCMAKE_PREFIX_PATH="%ProgramFiles(x86)%/Lua/5.1;%ERESSEA%/dependencies-win32" -DCMAKE_MODULE_PATH="%SRCDIR%/cmake/Modules" -DCMAKE_SUPPRESS_REGENERATION=TRUE ..
+"%CMAKE_ROOT%\bin\cmake.exe" -G "Visual Studio %VSVERSION%" -DCMAKE_PREFIX_PATH="%LUA_DEV%;%WIN32_DEV%" -DCMAKE_MODULE_PATH="%SRCDIR%/cmake/Modules" -DCMAKE_SUPPRESS_REGENERATION=TRUE ..
 PAUSE