1
1
diff --git a/CMakeLists.txt b/CMakeLists.txt
2
- index 7f9e5d6..a0fd4b4 100644
2
+ index 95e7b0c..ce59937 100644
3
3
--- a/CMakeLists.txt
4
4
+++ b/CMakeLists.txt
5
- @@ -944,15 +944,15 @@ if(NOT _x86 AND NOT _x86_64)
5
+ @@ -1159,11 +1159,11 @@ if(NOT _x86 AND NOT _x86_64)
6
6
if(NOT NO_CONF_INSTALL)
7
7
configure_file(system/box64.conf.cmake system/box64.conf)
8
8
if(NOT TERMUX)
9
- - install(FILES ${CMAKE_BINARY_DIR}/system/box64.conf DESTINATION /etc/binfmt.d/)
10
- - install(FILES ${CMAKE_SOURCE_DIR}/system/box64.box64rc DESTINATION /etc/)
11
- + install(FILES ${CMAKE_BINARY_DIR}/system/box64.conf DESTINATION @TERMUX_PREFIX@/etc/binfmt.d/)
12
- + install(FILES ${CMAKE_SOURCE_DIR}/system/box64.box64rc DESTINATION @TERMUX_PREFIX@/etc/)
13
- else()
14
- install(FILES ${CMAKE_BINARY_DIR}/system/box64.conf DESTINATION ${TERMUX_PATH}/usr/etc/binfmt.d/)
15
- install(FILES ${CMAKE_SOURCE_DIR}/system/box64.box64rc DESTINATION ${TERMUX_PATH}/usr/etc/)
9
+ - install(FILES ${CMAKE_BINARY_DIR}/system/box64.conf DESTINATION /etc/binfmt.d/)
10
+ - install(FILES ${CMAKE_SOURCE_DIR}/system/box64.box64rc DESTINATION /etc/)
11
+ + install(FILES ${CMAKE_BINARY_DIR}/system/box64.conf DESTINATION @TERMUX_PREFIX@/etc/binfmt.d/)
12
+ + install(FILES ${CMAKE_SOURCE_DIR}/system/box64.box64rc DESTINATION @TERMUX_PREFIX@/etc/)
13
+ if(BOX32_BINFMT)
14
+ configure_file(system/box32.conf.cmake system/box32.conf)
15
+ - install(FILES ${CMAKE_BINARY_DIR}/system/box32.conf DESTINATION /etc/binfmt.d/)
16
+ + install(FILES ${CMAKE_BINARY_DIR}/system/box32.conf DESTINATION @TERMUX_PREFIX@/etc/binfmt.d/)
17
+ endif()
18
+ else()
19
+ install(FILES ${CMAKE_BINARY_DIR}/system/box64.conf DESTINATION ${TERMUX_PATH}/usr/etc/binfmt.d/)
20
+ @@ -1175,7 +1175,7 @@ if(NOT _x86 AND NOT _x86_64)
16
21
endif()
17
22
18
23
endif()
19
- - set(INSTALL_PATH "/usr/lib/x86_64-linux-gnu/")
20
- + set(INSTALL_PATH "@TERMUX_PREFIX@/lib/x86_64-linux-gnu/")
24
+ - set(INSTALL_PATH "/usr/lib/box64- x86_64-linux-gnu/")
25
+ + set(INSTALL_PATH "@TERMUX_PREFIX@/lib/box64- x86_64-linux-gnu/")
21
26
if(NOT NO_LIB_INSTALL)
22
- if(NOT TERMUX)
23
- install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libstdc++.so.5 DESTINATION ${INSTALL_PATH})
27
+ if(NOT TERMUX AND NOT ANDROID)
28
+ install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libstdc++.so.5 DESTINATION ${INSTALL_PATH})
29
+ @@ -1214,7 +1214,7 @@ if(NOT _x86 AND NOT _x86_64)
30
+ endif()
31
+ endif()
32
+ if(BOX32)
33
+ - set(INSTALL_PATH "/usr/lib/box64-i386-linux-gnu/")
34
+ + set(INSTALL_PATH "@TERMUX_PREFIX@/lib/box64-i386-linux-gnu/")
35
+ if(NOT NO_LIB_INSTALL)
36
+ if(NOT TERMUX AND NOT ANDROID)
37
+ install(FILES ${CMAKE_SOURCE_DIR}/x86lib/libstdc++.so.5 DESTINATION ${INSTALL_PATH})
24
38
diff --git a/src/core.c b/src/core.c
25
- index b1a552b..b9d924a 100644
39
+ index c43fd05..ab850b0 100644
26
40
--- a/src/core.c
27
41
+++ b/src/core.c
28
- @@ -1658 ,7 +1658 ,7 @@ int initialize(int argc, const char **argv, char** env, x64emu_t** emulator, elf
42
+ @@ -1904 ,7 +1904 ,7 @@ int initialize(int argc, const char **argv, char** env, x64emu_t** emulator, elf
29
43
printf("See 'box64 --help' for more information.\n");
30
44
exit(0);
31
45
}
@@ -35,26 +49,26 @@ index b1a552b..b9d924a 100644
35
49
// uname -m is redirected to box64 -m
36
50
if(argc==2 && (!strcmp(argv[1], "-m") || !strcmp(argv[1], "-p") || !strcmp(argv[1], "-i")))
37
51
diff --git a/src/steam.c b/src/steam.c
38
- index 52461a3..0e14ad7 100644
52
+ index 710fb84..24e1f53 100644
39
53
--- a/src/steam.c
40
54
+++ b/src/steam.c
41
55
@@ -39,13 +39,13 @@ void pressure_vessel(int argc, const char** argv, int nextarg, const char* prog)
42
56
if(is_usr) {
43
57
// transform RESSURE_VESSEL_APP_LD_LIBRARY_PATH to BOX86_ / BOX64_ LD_LIBRARY_PATH
44
58
char tmp[strlen(argv[nextarg])+150];
45
- - strcpy(tmp, "BOX86_LD_LIBRARY_PATH=/lib/box86:/usr/lib/box86:/lib/i386-linux-gnu:/usr/lib/i386-linux-gnu:/usr/lib/i686-pc-linux-gnu:/usr/lib32:");
46
- + strcpy(tmp, "BOX86_LD_LIBRARY_PATH=@TERMUX_PREFIX@/lib/box86:@TERMUX_PREFIX@/lib/i386-linux-gnu:@TERMUX_PREFIX@/lib/i686-pc-linux-gnu:@TERMUX_PREFIX@/lib32:");
59
+ - strcpy(tmp, "BOX86_LD_LIBRARY_PATH=/lib/box86:/usr/lib/box86:/lib/i386-linux-gnu:/usr/lib/i386-linux-gnu:/usr/lib/box86-i386-linux-gnu:/usr/lib/box64-i386-linux-gnu:/usr/lib/ i686-pc-linux-gnu:/usr/lib32:");
60
+ + strcpy(tmp, "BOX86_LD_LIBRARY_PATH=@TERMUX_PREFIX@/lib/box86:@TERMUX_PREFIX@/lib/i386-linux-gnu:@TERMUX_PREFIX@/lib/box86-i386-linux-gnu:@TERMUX_PREFIX@/lib/box64-i386-linux-gnu:@TERMUX_PREFIX@/lib/ i686-pc-linux-gnu:@TERMUX_PREFIX@/lib32:");
47
61
strcat(tmp, argv[nextarg]+strlen("--env-if-host=STEAM_RUNTIME_LIBRARY_PATH="));
48
62
char *p = strchr(tmp, '=');
49
63
*p ='\0'; ++p;
50
64
setenv(tmp, p, 1);
51
65
printf_log(LOG_DEBUG, "setenv(%s, %s, 1)\n", tmp, p);
52
- - strcpy(tmp, "BOX64_LD_LIBRARY_PATH=/lib/x86_64-linux-gnu:/usr/lib/x86_64-linux-gnu:");
53
- + strcpy(tmp, "BOX64_LD_LIBRARY_PATH=@TERMUX_PREFIX@/lib/x86_64-linux-gnu:");
66
+ - strcpy(tmp, "BOX64_LD_LIBRARY_PATH=/lib/x86_64-linux-gnu:/usr/lib/x86_64-linux-gnu:/usr/lib/box64-x86_64-linux-gnu:/usr/lib/box64-i386-linux-gnu: ");
67
+ + strcpy(tmp, "BOX64_LD_LIBRARY_PATH=@TERMUX_PREFIX@/lib/x86_64-linux-gnu:@TERMUX_PREFIX@/lib/box64-x86_64-linux-gnu:@TERMUX_PREFIX@/lib/box64-i386-linux-gnu: ");
54
68
strcat(tmp, argv[nextarg]+strlen("--env-if-host=STEAM_RUNTIME_LIBRARY_PATH="));
55
69
p = strchr(tmp, '=');
56
70
*p ='\0'; ++p;
57
- @@ -81 ,14 +81 ,8 @@ void pressure_vessel(int argc, const char** argv, int nextarg, const char* prog)
71
+ @@ -93 ,14 +93 ,8 @@ void pressure_vessel(int argc, const char** argv, int nextarg, const char* prog)
58
72
strcat(sniper, "/files"); // this is the sniper root
59
73
// do LD_LIBRARY_PATH
60
74
{
@@ -70,7 +84,7 @@ index 52461a3..0e14ad7 100644
70
84
// prepare folders, using ldconfig
71
85
snprintf(tmp, sizeof(tmp), "%s -i -n %s/lib/x86_64-linux-gnu", ldcmd, sniper);
72
86
diff --git a/src/tools/fileutils.c b/src/tools/fileutils.c
73
- index 327f798..79d22c8 100644
87
+ index 11dc690..8e2a625 100644
74
88
--- a/src/tools/fileutils.c
75
89
+++ b/src/tools/fileutils.c
76
90
@@ -17,9 +17,9 @@
@@ -100,10 +114,10 @@ index de962ee..67a786f 100644
100
114
typedef void* (*pFp_t)(void*);
101
115
102
116
diff --git a/src/wrapped/wrappedlibdl.c b/src/wrapped/wrappedlibdl.c
103
- index 2725285..fd94673 100644
117
+ index d8b73b3..d886411 100644
104
118
--- a/src/wrapped/wrappedlibdl.c
105
119
+++ b/src/wrapped/wrappedlibdl.c
106
- @@ -101 ,7 +101 ,7 @@ void* my_dlopen(x64emu_t* emu, void *filename, int flag)
120
+ @@ -141 ,7 +141 ,7 @@ void* my_dlopen(x64emu_t* emu, void *filename, int flag)
107
121
if(sys)
108
122
return sys;
109
123
}
0 commit comments