tesses50/crosslang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make rpath relative

Browse Source
This commit is contained in:
Mike Nolan
2025-05-30 22:31:39 -05:00
parent 4e4771f1ab
commit 77ea0906da
5 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -254,7 +254,11 @@ endif()
if(CROSSLANG_ENABLE_BINARIES) if(CROSSLANG_ENABLE_BINARIES)
if(CROSSLANG_ENABLE_SHARED AND CROSSLANG_SHARED_EXECUTABLES) if(CROSSLANG_ENABLE_SHARED AND CROSSLANG_SHARED_EXECUTABLES)
set(CMAKE_MACOSX_RPATH 1) 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(crossc src/crosslangcompiler.cpp ${CROSSLANG_WIN32_EXE_SRC})
add_executable(crossvm src/crosslangvm.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}) add_executable(crossint src/crosslanginterperter.cpp ${CROSSLANG_WIN32_EXE_SRC})

2
src/crosslang.cpp
View File

@ -48,7 +48,7 @@ bool Download(Tesses::Framework::Filesystem::VFSPath filename,Tesses::Framework:
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
TF_Init(); TF_InitWithConsole();

2
src/crosslangcompiler.cpp
View File

@ -34,7 +34,7 @@ int main(int argc, char** argv)
ByteCodeVectorWriter w(data); ByteCodeVectorWriter w(data);
gen.Save(std::filesystem::current_path(),w); gen.Save(std::filesystem::current_path(),w);
*/ */
TF_Init(); TF_InitWithConsole();
std::filesystem::path outputDir = std::filesystem::current_path() / "bin"; std::filesystem::path outputDir = std::filesystem::current_path() / "bin";
std::vector<std::filesystem::path> source; std::vector<std::filesystem::path> source;
std::filesystem::path resourceDir = std::filesystem::current_path() / "res"; std::filesystem::path resourceDir = std::filesystem::current_path() / "res";

2
src/crosslangvm.cpp
View File

@ -3,7 +3,7 @@ using namespace Tesses::Framework;
using namespace Tesses::CrossLang; using namespace Tesses::CrossLang;
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
TF_Init(); TF_InitWithConsole();
if(argc < 2) if(argc < 2)
{ {
printf("USAGE: %s <filename.crvm> <args...>\n",argv[0]); printf("USAGE: %s <filename.crvm> <args...>\n",argv[0]);

4
src/runtime_methods/ogc.cpp
View File

@ -58,6 +58,10 @@ namespace Tesses::CrossLang
#if defined(HW_RVL) #if defined(HW_RVL)
TDictionary* dict_rvl_wpad = TDictionary::Create(ls); TDictionary* dict_rvl_wpad = TDictionary::Create(ls);
dict_rvl_wpad->DeclareFunction(gc, "ScanPads","Scan wiimotes",{},OGC_WPAD_ScanPads); 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); env->DeclareVariable("WPAD", dict_rvl_wpad);
#endif #endif