Skip to content

Commit

Permalink
Fix AppVeyor build.
Browse files Browse the repository at this point in the history
  • Loading branch information
gibbed committed Jun 17, 2020
1 parent a9bd491 commit 48edf2d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ build:
verbosity: minimal

before_build:
- clang.exe -target ppc64-unknown-unknown -m64 -mllvm --x86-asm-syntax=intel -c debug_patch.S -o bin\debug_patch.o
- ld.lld.exe -v --section-start .text=0x10200 bin\debug_patch.o -o bin\debug_patch.elf
- set "LLVM_PATH=C:\Program Files\LLVM"
- call build.bat

after_build:
- set TZ=GMT
- git log . > git-log.txt
- 7z a -r -tzip -mx=9 -x!*/LICENSE.txt DemonsSoulsDebug-%APPVEYOR_BUILD_VERSION%.zip bin/debug_patch.elf tools/bin/*.exe tools/bin/*.dll ./deploy/build.bat ./LICENSE.txt ./deploy/README.txt ./git-log.txt
artifacts:
- path: '*-*.zip'
- path: '*.zip'
8 changes: 7 additions & 1 deletion build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ if not exist "%LLVM_PATH%\bin\ld.lld.exe" (
goto no_llvm
)

if not defined APPVEYOR (

if not exist "tools\bin\PatchElf.exe" (
goto no_patchelf
)
Expand All @@ -15,6 +17,8 @@ if not exist "bin\boot.elf" (
goto no_boot
)

)

cd "bin" 2>NUL && cd .. || mkdir "bin"
cd "build" 2>NUL && cd .. || mkdir "build"

Expand All @@ -32,7 +36,9 @@ set "AS_FLAGS=-target ppc64-unknown-unknown -m64 -mllvm --x86-asm-syntax=intel"

"%LLVM_PATH%\bin\ld.lld.exe" --script link.x --no-check-sections build/debug_menu.o build/debug_menu_localize.o build/disable_system_cache.o build/increase_memory_zones.o build/lua_print_to_stdout.o build/redirect_fs.o build/start.o build/symbols.o -o bin/debug_patch.elf

tools\bin\PatchElf.exe bin\boot.elf bin\debug_patch.elf bin\debug.elf -v 83681f6110d33442329073b72b8dc88a2f677172 -a --dca=0x01842d48 --dcs=53944 --ocs=0x1832d48
if not defined APPVEYOR (
tools\bin\PatchElf.exe bin\boot.elf bin\debug_patch.elf bin\debug.elf -v 83681f6110d33442329073b72b8dc88a2f677172 -a --dca=0x01842d48 --dcs=53944 --ocs=0x1832d48
)

exit /B 0

Expand Down

0 comments on commit 48edf2d

Please sign in to comment.