Skip to content

Commit

Permalink
Merge pull request libretro#1087 from RobLoach/tic80-branch
Browse files Browse the repository at this point in the history
Fix branch for TIC-80
  • Loading branch information
inactive123 authored Jul 17, 2019
2 parents 5b80bb2 + cfabba6 commit 990ad8c
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion recipes/android/cores-android
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ stella libretro-stella https://github.com/stella-emu/stella.git master YES GENER
tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC_JNI Makefile jni
theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC_JNI Makefile jni
thepowdertoy libretro-thepowdertoy https://github.com/libretro/ThePowderToy.git master YES ANDROID_CMAKE Makefile build
tic80 libretro-tic80 https://github.com/nesbox/TIC-80.git libretro YES ANDROID_CMAKE Makefile builddir -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_DEMO_CARTS=OFF
tic80 libretro-tic80 https://github.com/nesbox/TIC-80.git master YES ANDROID_CMAKE Makefile builddir -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_DEMO_CARTS=OFF
tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git master YES GENERIC_JNI Makefile jni
uzem libretro-uzem https://github.com/libretro/libretro-uzem.git master YES GENERIC_JNI Makefile jni
vba_next libretro-vba-next https://github.com/libretro/vba-next.git master YES GENERIC_JNI Makefile libretro/jni
Expand Down
2 changes: 1 addition & 1 deletion recipes/linux/cores-linux-arm7neonhf
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ stella libretro-stella https://github.com/stella-emu/stella.git master YES GENER
tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC Makefile .
theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC Makefile .
thepowdertoy libretro-thepowdertoy https://github.com/libretro/ThePowderToy.git master YES CMAKE Makefile build -DCMAKE_BUILD_TYPE=Release
tic80 libretro-tic80 https://github.com/nesbox/TIC-80.git libretro YES CMAKE Makefile builddir -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_DEMO_CARTS=OFF
tic80 libretro-tic80 https://github.com/nesbox/TIC-80.git master YES CMAKE Makefile builddir -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_DEMO_CARTS=OFF
tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git master YES GENERIC Makefile .
uzem libretro-uzem https://github.com/libretro/libretro-uzem.git master YES GENERIC Makefile .
vba_next libretro-vba_next https://github.com/libretro/vba-next.git master YES GENERIC Makefile.libretro .
Expand Down
2 changes: 1 addition & 1 deletion recipes/linux/cores-linux-armhf-generic
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ stella libretro-stella https://github.com/stella-emu/stella.git master YES GENER
tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC Makefile .
theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC Makefile .
thepowdertoy libretro-thepowdertoy https://github.com/libretro/ThePowderToy.git master YES CMAKE Makefile build -DCMAKE_BUILD_TYPE=Release
tic80 libretro-tic80 https://github.com/nesbox/TIC-80.git libretro YES CMAKE Makefile builddir -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_DEMO_CARTS=OFF
tic80 libretro-tic80 https://github.com/nesbox/TIC-80.git master YES CMAKE Makefile builddir -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_DEMO_CARTS=OFF
tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git master YES GENERIC Makefile .
uzem libretro-uzem https://github.com/libretro/libretro-uzem.git master YES GENERIC Makefile .
vba_next libretro-vba_next https://github.com/libretro/vba-next.git master YES GENERIC Makefile.libretro .
Expand Down
2 changes: 1 addition & 1 deletion recipes/linux/cores-linux-x64-generic
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ stella libretro-stella https://github.com/stella-emu/stella.git master YES GENER
tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC Makefile .
theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC Makefile .
thepowdertoy libretro-thepowdertoy https://github.com/libretro/ThePowderToy.git master YES CMAKE Makefile build -DCMAKE_BUILD_TYPE=Release
tic80 libretro-tic80 https://github.com/nesbox/TIC-80.git libretro YES CMAKE Makefile builddir -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_DEMO_CARTS=OFF
tic80 libretro-tic80 https://github.com/nesbox/TIC-80.git master YES CMAKE Makefile builddir -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_DEMO_CARTS=OFF
tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git master YES GENERIC Makefile .
uzem libretro-uzem https://github.com/libretro/libretro-uzem.git master YES GENERIC Makefile .
vba_next libretro-vba_next https://github.com/libretro/vba-next.git master YES GENERIC Makefile.libretro .
Expand Down
2 changes: 1 addition & 1 deletion recipes/linux/cores-linux-x86-generic
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ stella libretro-stella https://github.com/stella-emu/stella.git master YES GENER
tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC Makefile .
theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC Makefile .
thepowdertoy libretro-thepowdertoy https://github.com/libretro/ThePowderToy.git master YES CMAKE Makefile build -DCMAKE_BUILD_TYPE=Release
tic80 libretro-tic80 https://github.com/nesbox/TIC-80.git libretro YES CMAKE Makefile builddir -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_DEMO_CARTS=OFF
tic80 libretro-tic80 https://github.com/nesbox/TIC-80.git master YES CMAKE Makefile builddir -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_DEMO_CARTS=OFF
tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git master YES GENERIC Makefile .
uzem libretro-uzem https://github.com/libretro/libretro-uzem.git master YES GENERIC Makefile .
vba_next libretro-vba_next https://github.com/libretro/vba-next.git master YES GENERIC Makefile.libretro .
Expand Down
2 changes: 1 addition & 1 deletion recipes/windows/cores-windows-x64_seh-generic
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ stella libretro-stella https://github.com/stella-emu/stella.git master YES GENER
squirreljme libretro-squirreljme https://github.com/XerTheSquirrel/SquirrelJME.git trunk YES GENERIC makefilelibretro ratufacoat
tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC Makefile .
theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC Makefile .
tic80 libretro-tic80 https://github.com/nesbox/TIC-80.git libretro YES CMAKE Makefile build -G\"Unix Makefiles\" -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_DEMO_CARTS=OFF
tic80 libretro-tic80 https://github.com/nesbox/TIC-80.git master YES CMAKE Makefile build -G\"Unix Makefiles\" -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_DEMO_CARTS=OFF
tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git master YES GENERIC Makefile .
uzem libretro-uzem https://github.com/libretro/libretro-uzem.git master YES GENERIC Makefile .
vba_next libretro-vba_next https://github.com/libretro/vba-next.git master YES GENERIC Makefile.libretro .
Expand Down
2 changes: 1 addition & 1 deletion recipes/windows/cores-windows-x86_dw2-generic
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ squirreljme libretro-squirreljme https://github.com/XerTheSquirrel/SquirrelJME.g
tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC Makefile .
theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC Makefile .
thepowdertoy libretro-thepowdertoy https://github.com/libretro/ThePowderToy.git master YES CMAKE Makefile build -DCMAKE_BUILD_TYPE="Release"
tic80 libretro-tic80 https://github.com/nesbox/TIC-80.git libretro YES CMAKE Makefile build -G\"Unix Makefiles\" -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_DEMO_CARTS=OFF
tic80 libretro-tic80 https://github.com/nesbox/TIC-80.git master YES CMAKE Makefile build -G\"Unix Makefiles\" -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_DEMO_CARTS=OFF
tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git master YES GENERIC Makefile .
uzem libretro-uzem https://github.com/libretro/libretro-uzem.git master YES GENERIC Makefile .
vba_next libretro-vba_next https://github.com/libretro/vba-next.git master YES GENERIC Makefile.libretro .
Expand Down

0 comments on commit 990ad8c

Please sign in to comment.