this repo has no description
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

#2163: fixed Janet build on MinGW

nesbox 572dc070 8182ce84

+15 -7
+15 -7
CMakeLists.txt
··· 463 463 # Janet 464 464 ################################ 465 465 466 - set(BUILD_WITH_JANET_DEFAULT FALSE) 466 + set(BUILD_WITH_JANET_DEFAULT TRUE) 467 467 468 468 option(BUILD_WITH_JANET "Janet Enabled" ${BUILD_WITH_JANET_DEFAULT}) 469 469 message("BUILD_WITH_JANET: ${BUILD_WITH_JANET}") ··· 471 471 if(BUILD_WITH_JANET) 472 472 473 473 if(MINGW) 474 + find_program(GIT git) 475 + get_filename_component(GIT_DIR ${GIT} DIRECTORY) 476 + find_program(GITBASH bash PATHS "${GIT_DIR}/../bin" NO_DEFAULT_PATH) 477 + 478 + if(NOT GITBASH) 479 + message(FATAL_ERROR "Git Bash not found!") 480 + endif() 481 + 474 482 add_custom_command( 475 - OUTPUT ${THIRDPARTY_DIR}/janet/build/c/janet.c 476 - COMMAND mingw32-make build/c/janet.c 477 - WORKING_DIRECTORY ${THIRDPARTY_DIR}/janet/ 483 + OUTPUT ${THIRDPARTY_DIR}/janet/build/c/janet.c 484 + COMMAND ${GITBASH} -c "CC=gcc mingw32-make build/c/janet.c" 485 + WORKING_DIRECTORY ${THIRDPARTY_DIR}/janet/ 478 486 ) 479 487 elseif(WIN32) 480 488 add_custom_command( 481 - OUTPUT ${THIRDPARTY_DIR}/janet/build/c/janet.c 482 - COMMAND ./build_win.bat 483 - WORKING_DIRECTORY ${THIRDPARTY_DIR}/janet/ 489 + OUTPUT ${THIRDPARTY_DIR}/janet/build/c/janet.c 490 + COMMAND ./build_win.bat 491 + WORKING_DIRECTORY ${THIRDPARTY_DIR}/janet/ 484 492 ) 485 493 else() 486 494 add_custom_command(