From 31d377d09f0a987519acba069bec9c01eb11204f Mon Sep 17 00:00:00 2001 From: Vojtech Bubnik Date: Tue, 23 Apr 2019 12:35:26 +0200 Subject: Some refactoring and documentation, modified Windows dependencies to compile against patched wxWidgets --- deps/deps-windows.cmake | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'deps/deps-windows.cmake') diff --git a/deps/deps-windows.cmake b/deps/deps-windows.cmake index 0806c2388..b3b31e5f3 100644 --- a/deps/deps-windows.cmake +++ b/deps/deps-windows.cmake @@ -210,10 +210,12 @@ endif () ExternalProject_Add(dep_wxwidgets EXCLUDE_FROM_ALL 1 - URL "https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.1/wxWidgets-3.1.1.tar.bz2" - URL_HASH SHA256=c925dfe17e8f8b09eb7ea9bfdcfcc13696a3e14e92750effd839f5e10726159e + GIT_REPOSITORY "https://github.com/prusa3d/wxWidgets" + GIT_TAG v3.1.1-patched +# URL "https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.1/wxWidgets-3.1.1.tar.bz2" +# URL_HASH SHA256=c925dfe17e8f8b09eb7ea9bfdcfcc13696a3e14e92750effd839f5e10726159e BUILD_IN_SOURCE 1 - PATCH_COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}\\wxwidgets-pngprefix.h" src\\png\\pngprefix.h +# PATCH_COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}\\wxwidgets-pngprefix.h" src\\png\\pngprefix.h CONFIGURE_COMMAND "" BUILD_COMMAND cd build\\msw && nmake /f makefile.vc BUILD=release SHARED=0 UNICODE=1 USE_GUI=1 "${DEP_WXWIDGETS_TARGET}" INSTALL_COMMAND "${CMAKE_COMMAND}" -E copy_directory include "${DESTDIR}\\usr\\local\\include" -- cgit v1.2.3