Skip to content
Permalink
Browse files

Bump vcpkg deps

  • Loading branch information...
TheCycoONE committed Jun 4, 2019
1 parent 9d7b17f commit ca13445f22ec85edd7a245c12853fe584c88329d
Showing with 9 additions and 15 deletions.
  1. +7 −13 CMake/CopyVcpkgLua.cmake
  2. +1 −1 CMake/VcpkgDeps.cmake
  3. +1 −1 scripts/build_vcpkg_deps.ps1
@@ -1,25 +1,19 @@
# Add an extra step to copy LUA files from vcpkg
add_custom_command(TARGET CorsixTH POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_directory
"${VCPKG_INSTALLED_PATH}/share/lua"
$<TARGET_FILE_DIR:CorsixTH>
)

add_custom_command(TARGET CorsixTH POST_BUILD
COMMAND ${CMAKE_COMMAND} -E remove
$<TARGET_FILE_DIR:CorsixTH>/COPYRIGHT
"${VCPKG_INSTALLED_PATH}/share/lua/socket"
$<TARGET_FILE_DIR:CorsixTH>/mime
)

add_custom_command(TARGET CorsixTH POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy
"${VCPKG_INSTALLED_PATH}/share/lua/ltn12.lua"
"${VCPKG_INSTALLED_PATH}/share/lua/mime.lua"
"${VCPKG_INSTALLED_PATH}/share/lua/re.lua"
"${VCPKG_INSTALLED_PATH}/share/lua/socket.lua"
"${VCPKG_INSTALLED_PATH}/$<$<CONFIG:Debug>:debug/>bin/lfs.dll"
$<TARGET_FILE_DIR:CorsixTH>/lfs.dll
)

add_custom_command(TARGET CorsixTH POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy
"${VCPKG_INSTALLED_PATH}/$<$<CONFIG:Debug>:debug/>bin/lpeg.dll"
$<TARGET_FILE_DIR:CorsixTH>/lpeg.dll
$<TARGET_FILE_DIR:CorsixTH>
)

add_custom_command(TARGET CorsixTH POST_BUILD
@@ -18,7 +18,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.

set(VCPKG_COMMIT_SHA "1a9f008c2b532eac72ebe6e988574dc260bf7151")
set(VCPKG_COMMIT_SHA "36675cf48853dc70a64c4e31bde50b439d1448fc")

# Setup the various paths we are using
set(_VCPKG_SCRIPT_NAME "build_vcpkg_deps.ps1")
@@ -34,7 +34,7 @@ Param(
################

$anim_view_libs = "wxwidgets"
$corsixth_libs = "ffmpeg", "freetype", "lua", "luafilesystem", "lpeg", "sdl2", "sdl2-mixer", "luasocket"
$corsixth_libs = "ffmpeg", "freetype", "lua", "luafilesystem", "lpeg", "sdl2", "sdl2-mixer[libflac,mpg123,libmodplug,libvorbis]", "luasocket"

$vcpkg_git_url = "https://github.com/CorsixTH/vcpkg"

0 comments on commit ca13445

Please sign in to comment.
You can’t perform that action at this time.