this repo has no description
0
fork

Configure Feed

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

fixed html export #2061

nesbox 457bded1 ac65f75b

+67 -64
+65 -62
.github/workflows/build.yml
··· 11 11 runs-on: windows-2019 12 12 13 13 steps: 14 - - uses: actions/checkout@v2 14 + - uses: actions/checkout@v3 15 15 with: 16 16 submodules: recursive 17 17 fetch-depth: 0 ··· 28 28 cmake --build . --config %BUILD_TYPE% --parallel 29 29 30 30 - name: Deploy 31 - uses: actions/upload-artifact@v2 31 + uses: actions/upload-artifact@v3 32 32 with: 33 33 name: "tic80-winxp" 34 34 path: build/bin/tic80.exe 35 35 36 36 - name: Deploy stubs 37 - uses: actions/upload-artifact@v2 37 + uses: actions/upload-artifact@v3 38 38 with: 39 39 name: "tic80-winxp-stub" 40 40 path: build/bin/tic80*.exe ··· 44 44 runs-on: windows-2019 45 45 46 46 steps: 47 - - uses: actions/checkout@v2 47 + - uses: actions/checkout@v3 48 48 with: 49 49 submodules: recursive 50 50 fetch-depth: 0 ··· 61 61 cmake --build . --config %BUILD_TYPE% --parallel 62 62 63 63 - name: Deploy 64 - uses: actions/upload-artifact@v2 64 + uses: actions/upload-artifact@v3 65 65 with: 66 66 name: "tic80-winxp-pro" 67 67 path: build/bin/tic80.exe ··· 71 71 runs-on: windows-2019 72 72 73 73 steps: 74 - - uses: actions/checkout@v2 74 + - uses: actions/checkout@v3 75 75 with: 76 76 submodules: recursive 77 77 fetch-depth: 0 ··· 88 88 cmake --build . --config %BUILD_TYPE% --parallel 89 89 90 90 - name: Deploy 91 - uses: actions/upload-artifact@v2 91 + uses: actions/upload-artifact@v3 92 92 with: 93 93 name: "tic80-windows" 94 94 path: build/bin/tic80.exe 95 95 96 96 - name: Deploy stubs 97 - uses: actions/upload-artifact@v2 97 + uses: actions/upload-artifact@v3 98 98 with: 99 99 name: "tic80-windows-stub" 100 100 path: build/bin/tic80*.exe ··· 104 104 runs-on: windows-2019 105 105 106 106 steps: 107 - - uses: actions/checkout@v2 107 + - uses: actions/checkout@v3 108 108 with: 109 109 submodules: recursive 110 110 fetch-depth: 0 ··· 121 121 cmake --build . --config %BUILD_TYPE% --parallel 122 122 123 123 - name: Deploy 124 - uses: actions/upload-artifact@v2 124 + uses: actions/upload-artifact@v3 125 125 with: 126 126 name: "tic80-windows-pro" 127 127 path: build/bin/tic80.exe ··· 131 131 runs-on: windows-2019 132 132 133 133 steps: 134 - - uses: actions/checkout@v2 134 + - uses: actions/checkout@v3 135 135 with: 136 136 submodules: recursive 137 137 fetch-depth: 0 ··· 149 149 cp bin/tic80-sokol.exe bin/tic80.exe 150 150 151 151 - name: Deploy 152 - uses: actions/upload-artifact@v2 152 + uses: actions/upload-artifact@v3 153 153 with: 154 154 name: "tic80-windows-sokol" 155 155 path: build/bin/tic80.exe ··· 159 159 runs-on: ubuntu-18.04 160 160 161 161 steps: 162 - - uses: actions/checkout@v2 162 + - uses: actions/checkout@v3 163 163 with: 164 164 submodules: recursive 165 165 fetch-depth: 0 ··· 181 181 cpack 182 182 183 183 - name: Deploy DEB 184 - uses: actions/upload-artifact@v2 184 + uses: actions/upload-artifact@v3 185 185 with: 186 186 name: "tic80-linux-deb-pro" 187 187 path: build/tic80.deb 188 188 189 189 - name: Deploy ZIP 190 - uses: actions/upload-artifact@v2 190 + uses: actions/upload-artifact@v3 191 191 with: 192 192 name: "tic80-linux-pro" 193 193 path: build/bin/tic80 ··· 197 197 runs-on: ubuntu-18.04 198 198 199 199 steps: 200 - - uses: actions/checkout@v2 200 + - uses: actions/checkout@v3 201 201 with: 202 202 submodules: recursive 203 203 fetch-depth: 0 ··· 219 219 cpack 220 220 221 221 - name: Deploy DEB 222 - uses: actions/upload-artifact@v2 222 + uses: actions/upload-artifact@v3 223 223 with: 224 224 name: "tic80-linux-deb" 225 225 path: build/tic80.deb 226 226 227 227 - name: Deploy ZIP 228 - uses: actions/upload-artifact@v2 228 + uses: actions/upload-artifact@v3 229 229 with: 230 230 name: "tic80-linux" 231 231 path: build/bin/tic80 232 232 233 233 - name: Deploy stubs 234 - uses: actions/upload-artifact@v2 234 + uses: actions/upload-artifact@v3 235 235 with: 236 236 name: "tic80-linux-stub" 237 237 path: build/bin/tic80* ··· 242 242 container: nesbox/rpi-tic80:latest 243 243 244 244 steps: 245 - - uses: actions/checkout@v2 245 + - uses: actions/checkout@v3 246 246 with: 247 247 submodules: recursive 248 248 fetch-depth: 0 ··· 260 260 cpack 261 261 262 262 - name: Deploy DEB 263 - uses: actions/upload-artifact@v2 263 + uses: actions/upload-artifact@v3 264 264 with: 265 265 name: "tic80-rpi-dep" 266 266 path: build/tic80.deb 267 267 268 268 - name: Deploy 269 - uses: actions/upload-artifact@v2 269 + uses: actions/upload-artifact@v3 270 270 with: 271 271 name: "tic80-rpi" 272 272 path: build/bin/tic80 273 273 274 274 - name: Deploy stubs 275 - uses: actions/upload-artifact@v2 275 + uses: actions/upload-artifact@v3 276 276 with: 277 277 name: "tic80-rpi-stub" 278 278 path: build/bin/tic80* ··· 283 283 container: nesbox/rpi-tic80:latest 284 284 285 285 steps: 286 - - uses: actions/checkout@v2 286 + - uses: actions/checkout@v3 287 287 with: 288 288 submodules: recursive 289 289 fetch-depth: 0 ··· 301 301 cpack 302 302 303 303 - name: Deploy DEB 304 - uses: actions/upload-artifact@v2 304 + uses: actions/upload-artifact@v3 305 305 with: 306 306 name: "tic80-rpi-deb-pro" 307 307 path: build/tic80.deb 308 308 309 309 - name: Deploy 310 - uses: actions/upload-artifact@v2 310 + uses: actions/upload-artifact@v3 311 311 with: 312 312 name: "tic80-rpi-pro" 313 313 path: build/bin/tic80 ··· 318 318 container: nesbox/baremetalpi-tic80:latest 319 319 320 320 steps: 321 - - uses: actions/checkout@v2 321 + - uses: actions/checkout@v3 322 322 with: 323 323 submodules: recursive 324 324 fetch-depth: 0 ··· 357 357 cp build/baremetalpi/boot/config.txt vendor/circle-stdlib/libs/circle/boot/config.txt 358 358 359 359 - name: Deploy 360 - uses: actions/upload-artifact@v2 360 + uses: actions/upload-artifact@v3 361 361 with: 362 362 name: "tic80-rpi-baremetal" 363 363 path: | ··· 374 374 container: nesbox/baremetalpi-tic80:latest 375 375 376 376 steps: 377 - - uses: actions/checkout@v2 377 + - uses: actions/checkout@v3 378 378 with: 379 379 submodules: recursive 380 380 fetch-depth: 0 ··· 413 413 cp build/baremetalpi/boot/config.txt vendor/circle-stdlib/libs/circle/boot/config.txt 414 414 415 415 - name: Deploy 416 - uses: actions/upload-artifact@v2 416 + uses: actions/upload-artifact@v3 417 417 with: 418 418 name: "tic80-rpi4-baremetal" 419 419 path: | ··· 433 433 container: nesbox/devkitpro-tic80:latest 434 434 435 435 steps: 436 - - uses: actions/checkout@v2 436 + - uses: actions/checkout@v3 437 437 with: 438 438 submodules: recursive 439 439 fetch-depth: 0 ··· 450 450 make -j$(nproc) 451 451 452 452 - name: Deploy 453 - uses: actions/upload-artifact@v2 453 + uses: actions/upload-artifact@v3 454 454 with: 455 455 name: "tic80-nintendo-3ds" 456 456 path: build/bin/tic80.3dsx ··· 460 460 runs-on: macos-10.15 461 461 462 462 steps: 463 - - uses: actions/checkout@v2 463 + - uses: actions/checkout@v3 464 464 with: 465 465 submodules: recursive 466 466 fetch-depth: 0 ··· 477 477 cp *.dmg tic80.dmg 478 478 479 479 - name: Deploy DMG 480 - uses: actions/upload-artifact@v2 480 + uses: actions/upload-artifact@v3 481 481 with: 482 482 name: "tic80-macos-dmg" 483 483 path: build/tic80.dmg 484 484 485 485 - name: Deploy 486 - uses: actions/upload-artifact@v2 486 + uses: actions/upload-artifact@v3 487 487 with: 488 488 name: "tic80-macos" 489 489 path: build/bin/tic80 490 490 491 491 - name: Deploy stubs 492 - uses: actions/upload-artifact@v2 492 + uses: actions/upload-artifact@v3 493 493 with: 494 494 name: "tic80-macos-stub" 495 495 path: build/bin/tic80* ··· 499 499 runs-on: macos-10.15 500 500 501 501 steps: 502 - - uses: actions/checkout@v2 502 + - uses: actions/checkout@v3 503 503 with: 504 504 submodules: recursive 505 505 fetch-depth: 0 ··· 516 516 cp *.dmg tic80.dmg 517 517 518 518 - name: Deploy DMG 519 - uses: actions/upload-artifact@v2 519 + uses: actions/upload-artifact@v3 520 520 with: 521 521 name: "tic80-macos-dmg-pro" 522 522 path: build/tic80.dmg 523 523 524 524 - name: Deploy 525 - uses: actions/upload-artifact@v2 525 + uses: actions/upload-artifact@v3 526 526 with: 527 527 name: "tic80-macos-pro" 528 528 path: build/bin/tic80 ··· 533 533 container: nesbox/android-tic80:latest 534 534 535 535 steps: 536 - - uses: actions/checkout@v2 536 + - uses: actions/checkout@v3 537 537 with: 538 538 submodules: recursive 539 539 fetch-depth: 0 ··· 545 545 cp app/build/outputs/apk/release/app-release.apk tic80.apk 546 546 547 547 - name: Deploy 548 - uses: actions/upload-artifact@v2 548 + uses: actions/upload-artifact@v3 549 549 with: 550 550 name: "tic80-android" 551 551 path: build/android/tic80.apk ··· 557 557 steps: 558 558 - uses: mymindstorm/setup-emsdk@v7 559 559 560 - - uses: actions/checkout@v2 560 + - uses: actions/checkout@v3 561 561 with: 562 562 submodules: recursive 563 563 fetch-depth: 0 ··· 572 572 emcmake cmake -DBUILD_SDLGPU=On -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_STUB=On .. 573 573 cmake --build . --config $BUILD_TYPE --parallel 574 574 mkdir bin/html bin/html-export 575 - cp html-export/index.html bin/html-export/index.html 575 + cp html/export.html bin/html-export/index.html 576 576 cp bin/tic80*.js bin/html-export/ 577 577 cp bin/tic80*.wasm bin/html-export/ 578 578 cp html/index.html bin/html/index.html 579 + cp html/export.html bin/html/export.html 579 580 cp bin/tic80.js bin/html/tic80.js 580 581 cp bin/tic80.wasm bin/html/tic80.wasm 581 582 cp bin/tic80.js webapp/tic80.js 582 583 cp bin/tic80.wasm webapp/tic80.wasm 583 584 584 585 - name: Deploy 585 - uses: actions/upload-artifact@v2 586 + uses: actions/upload-artifact@v3 586 587 with: 587 588 name: "tic80-html" 588 589 path: | 589 590 build/bin/html/tic80.js 590 591 build/bin/html/tic80.wasm 591 592 build/bin/html/index.html 593 + build/bin/html/export.html 592 594 593 595 - name: Deploy WebApp 594 - uses: actions/upload-artifact@v2 596 + uses: actions/upload-artifact@v3 595 597 with: 596 598 name: "tic80-webapp" 597 599 path: | ··· 605 607 build/webapp/tic80.wasm 606 608 607 609 - name: Deploy stubs 608 - uses: actions/upload-artifact@v2 610 + uses: actions/upload-artifact@v3 609 611 with: 610 612 name: "tic80-html-stub" 611 613 path: | ··· 620 622 621 623 steps: 622 624 - name: Download Windows XP artifact 623 - uses: actions/download-artifact@v2 625 + uses: actions/download-artifact@v3 624 626 with: 625 627 name: tic80-winxp 626 628 path: winxpdir 627 629 628 630 - name: Download Windows artifact 629 - uses: actions/download-artifact@v2 631 + uses: actions/download-artifact@v3 630 632 with: 631 633 name: tic80-windows 632 634 path: windir 633 635 634 636 - name: Download Ubuntu artifact 635 - uses: actions/download-artifact@v2 637 + uses: actions/download-artifact@v3 636 638 with: 637 639 name: tic80-linux 638 640 path: linuxdir 639 641 640 642 - name: Download RPI artifact 641 - uses: actions/download-artifact@v2 643 + uses: actions/download-artifact@v3 642 644 with: 643 645 name: tic80-rpi 644 646 path: rpidir 645 647 646 648 - name: Download MacOS artifact 647 - uses: actions/download-artifact@v2 649 + uses: actions/download-artifact@v3 648 650 with: 649 651 name: tic80-macos 650 652 path: macdir 651 653 652 654 - name: Download HTML artifact 653 - uses: actions/download-artifact@v2 655 + uses: actions/download-artifact@v3 654 656 with: 655 657 name: tic80-html 656 658 ··· 661 663 cp linuxdir/* linux 662 664 cp macdir/* mac 663 665 cp rpidir/* rpi 666 + mv -f export.html index.html 664 667 zip html.zip index.html tic80.js tic80.wasm 665 668 mv -f html.zip html 666 669 667 670 - name: Deploy 668 - uses: actions/upload-artifact@v2 671 + uses: actions/upload-artifact@v3 669 672 with: 670 673 name: "tic80-export" 671 674 path: | ··· 686 689 687 690 steps: 688 691 - name: Download Windows XP artifact 689 - uses: actions/download-artifact@v2 692 + uses: actions/download-artifact@v3 690 693 with: 691 694 name: tic80-winxp-stub 692 695 path: winxpdir 693 696 694 697 - name: Download Windows artifact 695 - uses: actions/download-artifact@v2 698 + uses: actions/download-artifact@v3 696 699 with: 697 700 name: tic80-windows-stub 698 701 path: windir 699 702 700 703 - name: Download Ubuntu artifact 701 - uses: actions/download-artifact@v2 704 + uses: actions/download-artifact@v3 702 705 with: 703 706 name: tic80-linux-stub 704 707 path: linuxdir 705 708 706 709 - name: Download RPI artifact 707 - uses: actions/download-artifact@v2 710 + uses: actions/download-artifact@v3 708 711 with: 709 712 name: tic80-rpi-stub 710 713 path: rpidir 711 714 712 715 - name: Download MacOS artifact 713 - uses: actions/download-artifact@v2 716 + uses: actions/download-artifact@v3 714 717 with: 715 718 name: tic80-macos-stub 716 719 path: macdir 717 720 718 721 - name: Download HTML artifact 719 - uses: actions/download-artifact@v2 722 + uses: actions/download-artifact@v3 720 723 with: 721 724 name: tic80-html-stub 722 725 ··· 732 735 mv -f html${{ matrix.script }}.zip html${{ matrix.script }} 733 736 734 737 - name: Deploy 735 - uses: actions/upload-artifact@v2 738 + uses: actions/upload-artifact@v3 736 739 with: 737 740 name: "tic80-export" 738 741 path: | ··· 750 753 751 754 steps: 752 755 - name: Delete artifacts 753 - uses: geekyeggo/delete-artifact@v1 756 + uses: geekyeggo/delete-artifact@v2 754 757 with: 755 758 name: | 756 759 tic80-winxp-stub ··· 767 770 768 771 steps: 769 772 - name: Delete artifacts 770 - uses: geekyeggo/delete-artifact@v1 773 + uses: geekyeggo/delete-artifact@v2 771 774 with: 772 775 name: | 773 776 tic80-macos-pro
+1 -1
build/html-export/index.html build/html/export.html
··· 11 11 } 12 12 13 13 .tic80-container { 14 - width: 100%; padding-top: 56.66%; position: relative; 14 + width: 100%; padding-top: 50%; position: relative; 15 15 } 16 16 17 17 .tic80-canvas {
+1 -1
build/html/index.html
··· 11 11 } 12 12 13 13 .tic80-container { 14 - width: 100%; padding-top: 56.66%; position: relative; 14 + width: 100%; padding-top: 50%; position: relative; 15 15 } 16 16 17 17 .tic80-canvas {