3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed mangling of the slic3r_main symbol on win32.

Browse Source
This commit is contained in:
bubnikv 2018-10-26 18:31:50 +02:00
parent de55a60bf5
commit 35d984b812
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/slic3r_app_msvc.cpp
View File

@ -227,7 +227,14 @@ int wmain(int argc, wchar_t **argv)
} }
// resolve function address here // resolve function address here
slic3r_main = (Slic3rMainFunc)GetProcAddress(hInstance_Slic3r, "slic3r_main"); slic3r_main = (Slic3rMainFunc)GetProcAddress(hInstance_Slic3r,
#ifdef _WIN64
// there is just a single calling conversion, therefore no mangling of the function name.
"slic3r_main"
#else // stdcall calling convention declaration
"_slic3r_main@8"
#endif
);
if (slic3r_main == nullptr) { if (slic3r_main == nullptr) {
printf("could not locate the function slic3r_main in slic3r.dll\n"); printf("could not locate the function slic3r_main in slic3r.dll\n");
return -1; return -1;