Maybe fix Win32 compat
This commit is contained in:
parent
6a1b491844
commit
1b93f5d09d
2 changed files with 3 additions and 2 deletions
2
main.cpp
2
main.cpp
|
@ -64,7 +64,7 @@ int main(int argc, char **argv) {
|
|||
uint8_t br, bg, bb;
|
||||
bool border_set = false;
|
||||
bool probe_only = false;
|
||||
std::filesystem::path executable_path = std::filesystem::weakly_canonical(*argv).parent_path();
|
||||
std::string executable_path = std::filesystem::weakly_canonical(*argv).parent_path().generic_string();
|
||||
#ifdef _WIN32
|
||||
setenv("MAGICK_CODER_MODULE_PATH", executable_path.c_str(), 0);
|
||||
#endif
|
||||
|
|
|
@ -2,8 +2,9 @@
|
|||
|
||||
#ifdef _WIN32
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
inline void setenv(const char *variable, const char *value, char replace) {
|
||||
if (replace || getenv(variable) == NULL || getenv(variable) == "") {
|
||||
if (replace || getenv(variable) == NULL || !strcmp(getenv(variable), "")) {
|
||||
if (value == NULL) {
|
||||
_putenv_s(variable, "");
|
||||
} else {
|
||||
|
|
Loading…
Reference in a new issue