From 3aeca76c2e08597d7e03e87a9b963681ce88f435 Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Fri, 6 Jan 2017 22:29:38 -1000 Subject: [PATCH] Update submodules --- gbalink/CMakeLists.txt | 2 -- gbalink/main.cpp | 5 ++++- hecl | 2 +- jbus | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/gbalink/CMakeLists.txt b/gbalink/CMakeLists.txt index 9672c4612..d6bf99cce 100644 --- a/gbalink/CMakeLists.txt +++ b/gbalink/CMakeLists.txt @@ -1,5 +1,3 @@ -if (NOT WIN32) include_directories(. ./../Runtime ${ATHENA_INCLUDE_DIR} ${JBUS_INCLUDE_DIR}) add_executable(gbalink main.cpp) target_link_libraries(gbalink jbus) -endif() diff --git a/gbalink/main.cpp b/gbalink/main.cpp index 452566680..2c55cc1c6 100644 --- a/gbalink/main.cpp +++ b/gbalink/main.cpp @@ -183,7 +183,10 @@ void CGBASupport::Update(float dt) case EPhase::StartJoyBusBoot: x34_phase = EPhase::PollJoyBusBoot; 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; break; diff --git a/hecl b/hecl index c0decfe10..12c741d18 160000 --- a/hecl +++ b/hecl @@ -1 +1 @@ -Subproject commit c0decfe1079251177bb28a3e28f3db4f147dcd89 +Subproject commit 12c741d18e87e2b2efa1c700405f859acba53353 diff --git a/jbus b/jbus index ed1adfee0..e65f42c84 160000 --- a/jbus +++ b/jbus @@ -1 +1 @@ -Subproject commit ed1adfee0d024b3795c2c1dc665c81e842e789ca +Subproject commit e65f42c843cc00124c1d7b385a220e4fc963bab8