From 6fe0f3a32c35a2eaade0cd494e09de0dddc3ed99 Mon Sep 17 00:00:00 2001 From: Paul Kulchenko Date: Wed, 27 May 2015 21:39:39 -0700 Subject: [PATCH] Updated build script on Windows to support compiling winapi for different versions. --- build/build-win32.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/build-win32.sh b/build/build-win32.sh index 26bc5121c6..915b3ca009 100644 --- a/build/build-win32.sh +++ b/build/build-win32.sh @@ -287,9 +287,9 @@ fi if [ $BUILD_WINAPI ]; then git clone "$WINAPI_URL" "$WINAPI_BASENAME" cd "$WINAPI_BASENAME" - gcc $BUILD_FLAGS -DPSAPI_VERSION=1 -o "$INSTALL_DIR/lib/lua/5.1/winapi.dll" winapi.c wutils.c -lpsapi -lmpr -llua51 \ + gcc $BUILD_FLAGS -DPSAPI_VERSION=1 -o "$INSTALL_DIR/lib/lua/$LUAD/winapi.dll" winapi.c wutils.c -lpsapi -lmpr -llua$LUAV \ || { echo "Error: failed to build winapi"; exit 1; } - [ -f "$INSTALL_DIR/lib/lua/5.1/winapi.dll" ] || { echo "Error: winapi.dll isn't found"; exit 1; } + [ -f "$INSTALL_DIR/lib/lua/$LUAD/winapi.dll" ] || { echo "Error: winapi.dll isn't found"; exit 1; } cd .. rm -rf "$WINAPI_BASENAME" fi @@ -307,7 +307,7 @@ mkdir -p "$BIN_DIR" || { echo "Error: cannot create directory $BIN_DIR"; exit 1; [ $BUILD_LUA ] && cp "$INSTALL_DIR/bin/lua$LUAS.exe" "$INSTALL_DIR/lib/lua$LUAV.dll" "$BIN_DIR" [ $BUILD_WXLUA ] && cp "$INSTALL_DIR/bin/libwx.dll" "$BIN_DIR/wx.dll" -[ $BUILD_WINAPI ] && cp "$INSTALL_DIR/lib/lua/5.1/winapi.dll" "$BIN_DIR" +[ $BUILD_WINAPI ] && cp "$INSTALL_DIR/lib/lua/$LUAD/winapi.dll" "$BIN_DIR/clibs$LUAS" [ $BUILD_LUASEC ] && cp "$INSTALL_DIR/lib/lua/5.1/ssl.dll" "$BIN_DIR" if [ $BUILD_LUASOCKET ]; then