mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-19 12:47:50 -06:00
Merge some BS1.7 changes:
Boolean operation feature
This commit is contained in:
parent
9e73dfeb5d
commit
da05ae02da
73 changed files with 2496 additions and 481 deletions
|
@ -204,7 +204,7 @@ bool OpenGLVersionCheck::message_pump_exit = false;
|
|||
|
||||
extern "C" {
|
||||
typedef int (__stdcall *Slic3rMainFunc)(int argc, wchar_t **argv);
|
||||
Slic3rMainFunc bambustu_main = nullptr;
|
||||
Slic3rMainFunc orcaslicer_main = nullptr;
|
||||
}
|
||||
|
||||
extern "C" {
|
||||
|
@ -292,19 +292,19 @@ int wmain(int argc, wchar_t **argv)
|
|||
}
|
||||
|
||||
// resolve function address here
|
||||
bambustu_main = (Slic3rMainFunc)GetProcAddress(hInstance_Slic3r,
|
||||
orcaslicer_main = (Slic3rMainFunc)GetProcAddress(hInstance_Slic3r,
|
||||
#ifdef _WIN64
|
||||
// there is just a single calling conversion, therefore no mangling of the function name.
|
||||
"bambustu_main"
|
||||
"orcaslicer_main"
|
||||
#else // stdcall calling convention declaration
|
||||
"_bambustu_main@8"
|
||||
#endif
|
||||
);
|
||||
if (bambustu_main == nullptr) {
|
||||
printf("could not locate the function bambustu_main in OrcaSlicer.dll\n");
|
||||
if (orcaslicer_main == nullptr) {
|
||||
printf("could not locate the function orcaslicer_main in OrcaSlicer.dll\n");
|
||||
return -1;
|
||||
}
|
||||
// argc minus the trailing nullptr of the argv
|
||||
return bambustu_main((int)argv_extended.size() - 1, argv_extended.data());
|
||||
return orcaslicer_main((int)argv_extended.size() - 1, argv_extended.data());
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue