imports/imhex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex.git synced 2026-03-27 23:37:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use custom "argc" and "argv" exposing. Fixes #6

Browse Source
This commit is contained in:
WerWolv
2020-12-01 18:19:49 +01:00
parent 76d56c9ed4
commit 6aed140ecf
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/hex.hpp
View File

@@ -18,6 +18,9 @@ using s128 = __int128_t;
#include "lang/result.hpp" #include "lang/result.hpp"
#include "lang/results.hpp" #include "lang/results.hpp"
extern int mainArgc;
extern char **mainArgv;
#if defined(__EMX__) || defined (WIN32) #if defined(__EMX__) || defined (WIN32)
#define MAGIC_PATH_SEPARATOR ";" #define MAGIC_PATH_SEPARATOR ";"
#else #else

6
source/helpers/loader_script_handler.cpp
View File

@@ -148,10 +148,10 @@ namespace hex {
} }
bool LoaderScript::processFile(std::string_view scriptPath) { bool LoaderScript::processFile(std::string_view scriptPath) {
Py_SetProgramName(Py_DecodeLocale(__argv[0], nullptr)); Py_SetProgramName(Py_DecodeLocale(mainArgv[0], nullptr));
if (std::filesystem::exists(std::filesystem::path(__argv[0]).parent_path().string() + "/lib/python3.8")) if (std::filesystem::exists(std::filesystem::path(mainArgv[0]).parent_path().string() + "/lib/python3.8"))
Py_SetPythonHome(Py_DecodeLocale(std::filesystem::path(__argv[0]).parent_path().string().c_str(), nullptr)); Py_SetPythonHome(Py_DecodeLocale(std::filesystem::path(mainArgv[0]).parent_path().string().c_str(), nullptr));
PyImport_AppendInittab("_imhex", []() -> PyObject* { PyImport_AppendInittab("_imhex", []() -> PyObject* {

8
source/main.cpp
View File

@@ -18,7 +18,13 @@
#include <vector> #include <vector>
int main() { int mainArgc;
char **mainArgv;
int main(int argc, char **argv) {
mainArgc = argc;
mainArgv = argv;
hex::Window window; hex::Window window;
// Shared Data // Shared Data