AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update submodules

This commit is contained in:
Jack Andersen 2017-01-06 22:29:38 -10:00
parent 6925ba3f77
commit 3aeca76c2e
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gbalink/CMakeLists.txt
View File

@ -1,5 +1,3 @@
if (NOT WIN32)
include_directories(. ./../Runtime ${ATHENA_INCLUDE_DIR} ${JBUS_INCLUDE_DIR}) include_directories(. ./../Runtime ${ATHENA_INCLUDE_DIR} ${JBUS_INCLUDE_DIR})
add_executable(gbalink main.cpp) add_executable(gbalink main.cpp)
target_link_libraries(gbalink jbus) target_link_libraries(gbalink jbus)
endif()

5
gbalink/main.cpp
View File

@ -183,7 +183,10 @@ void CGBASupport::Update(float dt)
case EPhase::StartJoyBusBoot: case EPhase::StartJoyBusBoot:
x34_phase = EPhase::PollJoyBusBoot; x34_phase = EPhase::PollJoyBusBoot;
if (m_endpoint->GBAJoyBootAsync(x40_siChan * 2, 2, if (m_endpoint->GBAJoyBootAsync(x40_siChan * 2, 2,
x2c_buffer.get(), x28_fileSize, &x3c_status, JoyBootDone) != jbus::GBA_READY) x2c_buffer.get(), x28_fileSize, &x3c_status,
std::bind(JoyBootDone,
std::placeholders::_1,
std::placeholders::_2)) != jbus::GBA_READY)
x34_phase = EPhase::Failed; x34_phase = EPhase::Failed;
break; break;

2
hecl

@ -1 +1 @@
Subproject commit c0decfe1079251177bb28a3e28f3db4f147dcd89 Subproject commit 12c741d18e87e2b2efa1c700405f859acba53353

2
jbus

@ -1 +1 @@
Subproject commit ed1adfee0d024b3795c2c1dc665c81e842e789ca Subproject commit e65f42c843cc00124c1d7b385a220e4fc963bab8