diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-05-26 13:07:45 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-05-26 13:07:45 -0400 |
| commit | 28f58ab0ae5bbb8b36668d8db56ec395177c80c0 (patch) | |
| tree | 546c35a2d4707733a707b541c3130f8fa641af82 | |
| parent | 8e08eaa6e8cbf31ff27fd319278f824b68320e4c (diff) | |
Ensure calcrom is executed from the correct directory
| -rw-r--r-- | .travis/calcrom/webhook.sh | 6 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/.travis/calcrom/webhook.sh b/.travis/calcrom/webhook.sh index cb467cf0..fc02eef1 100644 --- a/.travis/calcrom/webhook.sh +++ b/.travis/calcrom/webhook.sh @@ -12,6 +12,8 @@ if [ ! -f $map_file ]; then exit 1 fi -make -C $(dirname "$0") -output=$($(dirname "$0")/calcrom | sed -E ':a;N;$!ba;s/\r{0,1}\n/\\n/g') +pushd $(dirname "$0") +make +output=$(./calcrom | sed -E ':a;N;$!ba;s/\r{0,1}\n/\\n/g') curl -d "{\"username\": \"$CALCROM_DISCORD_WEBHOOK_USERNAME\", \"avatar_url\": \"$CALCROM_DISCORD_WEBHOOK_AVATAR_URL\", \"content\":\"\`\`\`$build_name progress:\\n$output\`\`\`\"}" -H "Content-Type: application/json" -X POST $CALCROM_DISCORD_WEBHOOK_URL +popd diff --git a/CMakeLists.txt b/CMakeLists.txt index 3eb28627..60be15bc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,5 +10,5 @@ file(GLOB_RECURSE SOURCES RELATIVE ${CMAKE_SOURCE_DIR} "*.c" "*.cpp") add_executable(PokeDiamond ${SOURCES}) target_include_directories(PokeDiamond PRIVATE include include-mw arm9/lib/include) -add_executable(calcrom scratch.cpp) +add_executable(calcrom .travis/calcrom/calcrom.cpp) target_include_directories(calcrom PRIVATE /usr/local/include) |