diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e5f944cf71ffb8c231bef45cf4a569fb455bad9..22e56e93ed5278f261d77edf8ede2b296840b401 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,6 +7,8 @@ find_program(PATCH_PATH NAMES patch HINTS "C:/Program Files/Git/usr/bin" "C:/Pro find_program(SH_PATH NAMES sh HINTS "C:/Program Files/Git/usr/bin" "C:/Program Files (x86)/Git/usr/bin" REQUIRED) find_program(FIND_PATH NAMES find PATHS "C:/Program Files/Git/usr/bin" "C:/Program Files (x86)/Git/usr/bin" NO_DEFAULT_PATH) find_program(FIND_PATH NAMES find) +find_program(CP_PATH NAMES cp PATHS "C:/Program Files/Git/usr/bin" "C:/Program Files (x86)/Git/usr/bin" NO_DEFAULT_PATH) +find_program(CP_PATH NAMES cp) if(WIN32) if(MSVC) @@ -48,7 +50,7 @@ ExternalProject_Add( DOWNLOAD_COMMAND ${DOWNLOAD_CMD} UPDATE_COMMAND "" CONFIGURE_COMMAND "" - PATCH_COMMAND ${SH_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/patch.sh" "${CMAKE_CURRENT_SOURCE_DIR}" "<SOURCE_DIR>" ${FIND_PATH} ${PATCH_PATH} + PATCH_COMMAND ${SH_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/patch.sh" "${CMAKE_CURRENT_SOURCE_DIR}" "<SOURCE_DIR>" ${FIND_PATH} ${PATCH_PATH} ${CP_PATH} BUILD_IN_SOURCE TRUE BUILD_COMMAND ${BUILD_CMD} # This is actually an install byproduct but hey... ¯\_(ツ)_/¯ diff --git a/dist/aescryptx86.obj b/dist/aescryptx86.obj new file mode 100644 index 0000000000000000000000000000000000000000..eb0fe00e608bd2cc6b4f714c56d59310cf05fe2c Binary files /dev/null and b/dist/aescryptx86.obj differ diff --git a/dist/d-win32.obj b/dist/d-win32.obj new file mode 100644 index 0000000000000000000000000000000000000000..ee21b36e9e06a1e35e0ad1de222e24573b13d626 Binary files /dev/null and b/dist/d-win32.obj differ diff --git a/patch.sh b/patch.sh index b1255a80d38cabe26060470ce9294e9770987e52..bc590435818e02a57595ae7ca9bf9d1357367861 100755 --- a/patch.sh +++ b/patch.sh @@ -5,3 +5,4 @@ for patch in `"$3" "$1/patches" -type f` do "$4" -p0 -t -d "$2" < $patch done +"$5" $1/dist/*.obj $2/crypt