[Bf-blender-cvs] [b6edf860fe2] master: build_environment: mingw32 fix repeated unpack of gcc tarball

Ray Molenkamp noreply at git.blender.org
Sun Aug 26 03:41:23 CEST 2018


Commit: b6edf860fe2aab445c381ccc84d73c65a4d9faa5
Author: Ray Molenkamp
Date:   Sat Aug 25 19:37:11 2018 -0600
Branches: master
https://developer.blender.org/rBb6edf860fe2aab445c381ccc84d73c65a4d9faa5

build_environment: mingw32 fix repeated unpack of gcc tarball

===================================================================

M	build_files/build_environment/cmake/setup_mingw32.cmake

===================================================================

diff --git a/build_files/build_environment/cmake/setup_mingw32.cmake b/build_files/build_environment/cmake/setup_mingw32.cmake
index ece12ddc179..afb44e8e88d 100644
--- a/build_files/build_environment/cmake/setup_mingw32.cmake
+++ b/build_files/build_environment/cmake/setup_mingw32.cmake
@@ -49,7 +49,7 @@ if(NOT EXISTS "${DOWNLOAD_DIR}/mingw")
 endif()
 
 # extract mingw32
-if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/mingw32env.cmd") AND (EXISTS "${DOWNLOAD_DIR}/i686-4.9.4-release-win32-sjlj-rt_v5-rev0.7z"))
+if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/ming32sh.cmd") AND (EXISTS "${DOWNLOAD_DIR}/i686-4.9.4-release-win32-sjlj-rt_v5-rev0.7z"))
 	message("Extracting mingw32")
 	execute_process(
 		COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/i686-4.9.4-release-win32-sjlj-rt_v5-rev0.7z



More information about the Bf-blender-cvs mailing list