catmeow/bmxconverter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add compatibility layer for env setting.

Browse source
This commit is contained in:
Zachary Hall 2023-12-01 16:01:45 -08:00
parent 677bfb4020
commit a222773214
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
main.cpp
View file

@ -10,6 +10,7 @@
#include <lib.h> #include <lib.h>
#include <stdlib.h> #include <stdlib.h>
#include <filesystem> #include <filesystem>
#include "win32compat.h"
#include "bitmapx16.h" #include "bitmapx16.h"
using std::vector; using std::vector;
using std::map; using std::map;
@ -65,7 +66,7 @@ int main(int argc, char **argv) {
bool probe_only = false; bool probe_only = false;
std::filesystem::path executable_path = std::filesystem::weakly_canonical(*argv).parent_path(); std::filesystem::path executable_path = std::filesystem::weakly_canonical(*argv).parent_path();
#ifdef _WIN32 #ifdef _WIN32
_setenv("MAGICK_CODER_MODULE_PATH", executable_path.c_str(), 0); setenv("MAGICK_CODER_MODULE_PATH", executable_path.c_str(), 0);
#endif #endif
InitializeMagick(*argv); InitializeMagick(*argv);
argc--; argc--;

16
win32compat.h Normal file
View file

@ -0,0 +1,16 @@
#pragma once
#ifdef _WIN32
#include <stdlib.h>
inline void setenv(char const *variable, char const *value, bool replace) {
if (replace || getenv(variable) == NULL || getenv(variable) == "") {
if (value == NULL) {
_putenv_s(variable, "");
} else {
_putenv_s(variable, value);
}
}
}
#else
#include <unistd.h>
#endif