diff --git a/librecomp/include/librecomp/helpers.hpp b/librecomp/include/librecomp/helpers.hpp index 86ada4d..9f02367 100644 --- a/librecomp/include/librecomp/helpers.hpp +++ b/librecomp/include/librecomp/helpers.hpp @@ -53,4 +53,4 @@ void _return(recomp_context* ctx, T val) { } } -#endif \ No newline at end of file +#endif diff --git a/ultramodern/CMakeLists.txt b/ultramodern/CMakeLists.txt index 91a3335..23276d5 100644 --- a/ultramodern/CMakeLists.txt +++ b/ultramodern/CMakeLists.txt @@ -11,9 +11,9 @@ set(CMAKE_CXX_EXTENSIONS OFF) add_library(ultramodern STATIC "${CMAKE_CURRENT_SOURCE_DIR}/src/audio.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/src/cont.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/src/error_handling.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/src/events.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/src/input.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/src/mesgqueue.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/src/misc_ultra.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/src/rsp.cpp" diff --git a/ultramodern/include/ultramodern/input.hpp b/ultramodern/include/ultramodern/input.hpp index 1ce2284..efbe5e8 100644 --- a/ultramodern/include/ultramodern/input.hpp +++ b/ultramodern/include/ultramodern/input.hpp @@ -16,8 +16,6 @@ namespace ultramodern { }; void set_callbacks(const callbacks_t& callbacks); - - } } diff --git a/ultramodern/src/cont.cpp b/ultramodern/src/input.cpp similarity index 99% rename from ultramodern/src/cont.cpp rename to ultramodern/src/input.cpp index bc843cb..cb9cca2 100644 --- a/ultramodern/src/cont.cpp +++ b/ultramodern/src/input.cpp @@ -57,6 +57,7 @@ extern "C" s32 osContInit(RDRAM_ARG PTR(OSMesgQueue) mq, PTR(u8) bitpattern_, PT extern "C" s32 osContReset(RDRAM_ARG PTR(OSMesgQueue) mq, PTR(OSContStatus) data) { assert(false); + return 0; } extern "C" s32 osContStartQuery(RDRAM_ARG PTR(OSMesgQueue) mq) {