diff --git a/CMakeLists.txt b/CMakeLists.txt index fd01be3..d3d6312 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -254,7 +254,11 @@ endif() if(CROSSLANG_ENABLE_BINARIES) if(CROSSLANG_ENABLE_SHARED AND CROSSLANG_SHARED_EXECUTABLES) set(CMAKE_MACOSX_RPATH 1) -set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") +if (APPLE) + set(CMAKE_INSTALL_RPATH "@executable_path/../${CMAKE_INSTALL_LIBDIR}") +else() + set(CMAKE_INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}") +endif() add_executable(crossc src/crosslangcompiler.cpp ${CROSSLANG_WIN32_EXE_SRC}) add_executable(crossvm src/crosslangvm.cpp ${CROSSLANG_WIN32_EXE_SRC}) add_executable(crossint src/crosslanginterperter.cpp ${CROSSLANG_WIN32_EXE_SRC}) diff --git a/src/crosslang.cpp b/src/crosslang.cpp index 7dcdc39..d43d966 100644 --- a/src/crosslang.cpp +++ b/src/crosslang.cpp @@ -48,7 +48,7 @@ bool Download(Tesses::Framework::Filesystem::VFSPath filename,Tesses::Framework: int main(int argc, char** argv) { - TF_Init(); + TF_InitWithConsole(); diff --git a/src/crosslangcompiler.cpp b/src/crosslangcompiler.cpp index 25b0a4f..86da21d 100644 --- a/src/crosslangcompiler.cpp +++ b/src/crosslangcompiler.cpp @@ -34,7 +34,7 @@ int main(int argc, char** argv) ByteCodeVectorWriter w(data); gen.Save(std::filesystem::current_path(),w); */ - TF_Init(); + TF_InitWithConsole(); std::filesystem::path outputDir = std::filesystem::current_path() / "bin"; std::vector source; std::filesystem::path resourceDir = std::filesystem::current_path() / "res"; diff --git a/src/crosslangvm.cpp b/src/crosslangvm.cpp index bad0c12..c7f8738 100644 --- a/src/crosslangvm.cpp +++ b/src/crosslangvm.cpp @@ -3,7 +3,7 @@ using namespace Tesses::Framework; using namespace Tesses::CrossLang; int main(int argc, char** argv) { - TF_Init(); + TF_InitWithConsole(); if(argc < 2) { printf("USAGE: %s \n",argv[0]); diff --git a/src/runtime_methods/ogc.cpp b/src/runtime_methods/ogc.cpp index b7fa9fc..2bd4b23 100644 --- a/src/runtime_methods/ogc.cpp +++ b/src/runtime_methods/ogc.cpp @@ -58,6 +58,10 @@ namespace Tesses::CrossLang #if defined(HW_RVL) TDictionary* dict_rvl_wpad = TDictionary::Create(ls); dict_rvl_wpad->DeclareFunction(gc, "ScanPads","Scan wiimotes",{},OGC_WPAD_ScanPads); + dict_rvl_wpad->DeclareFunction(gc, "ButtonsDown","Is button down",{"pad"},OGC_WPAD_ButtonsDown); + dict_rvl_wpad->SetValue("BUTTON_A",(int64_t)WPAD_BUTTON_A); + dict_rvl_wpad->SetValue("BUTTON_B",(int64_t)WPAD_BUTTON_B); + dict_rvl_wpad->SetValue("BUTTON_HOME",(int64_t)WPAD_BUTTON_HOME); env->DeclareVariable("WPAD", dict_rvl_wpad); #endif