Skip to content

Commit 64ec99d

Browse files
committed
some more rpath trix
1 parent beb6864 commit 64ec99d

2 files changed

Lines changed: 4 additions & 7 deletions

File tree

nsl/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ if(DENGINE_HAS_BULLET)
1212
set_target_properties(nsl-bulletphysics PROPERTIES
1313
PREFIX ""
1414
SUFFIX ".nsl"
15+
INSTALL_RPATH "$ORIGIN/../"
1516
LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/tests-build/bin"
1617
)
1718
target_link_libraries(nsl-bulletphysics ${dengine} ${bullet_LIBRARIES} nsl-bulletphysics-common)
@@ -45,6 +46,7 @@ if(DENGINE_HAS_BULLET)
4546
)
4647
set_target_properties(nsl-bulletphysics-car PROPERTIES
4748
PREFIX ""
49+
INSTALL_RPATH "$ORIGIN/../"
4850
SUFFIX ".nsl"
4951
LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/tests-build/bin"
5052
)
@@ -106,6 +108,7 @@ add_library(nsl-test SHARED
106108
set_target_properties(nsl-test PROPERTIES
107109
PREFIX ""
108110
SUFFIX ".nsl"
111+
INSTALL_RPATH "$ORIGIN/../"
109112
LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/tests-build/bin"
110113
)
111114
target_link_libraries(nsl-test ${dengine})

tests/src/testdengine-script/script-python.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,9 @@ int main(int argc, char *argv[])
66
opts->window_title = "testdengine-script-python";
77
dengine_init();
88

9-
const size_t prtbf_sz = 2048;
10-
char* prtbf = malloc(prtbf_sz);
11-
129
const char* script_file = "scripts/printmouse.py";
1310
File2Mem f2m;
14-
snprintf(prtbf, prtbf_sz, "%s/%s", dengineutils_filesys_get_assetsdir(), script_file);
15-
f2m.file = prtbf;
16-
dengineutils_filesys_file2mem_load(&f2m);
11+
dengine_load_asset(script_file, &f2m.mem, &f2m.size);
1712

1813
Script printmouse;
1914
int compiled = denginescript_python_compile(f2m.mem, script_file, &printmouse);
@@ -59,7 +54,6 @@ int main(int argc, char *argv[])
5954
if(compiled)
6055
denginescript_python_call(&printmouse, DENGINE_SCRIPT_FUNC_UPDATE, NULL);
6156
}
62-
free(prtbf);
6357

6458
dengine_terminate();
6559
return 0;

0 commit comments

Comments
 (0)