3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-31 04:31:15 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Added /bigobj (Increase Number of Sections in .Obj file)

Browse source 
Fixed external declaration of slic3r_main()
This commit is contained in:
bubnikv 2018-10-26 18:08:43 +02:00
parent 135ee60db4
commit de55a60bf5
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
CMakeLists.txt
View file

@ -27,8 +27,12 @@ option(SLIC3R_MSVC_COMPILE_PARALLEL "Compile on Visual Studio in parallel" 1)
option(SLIC3R_MSVC_PDB "Generate PDB files on MSVC in Release mode" 1) option(SLIC3R_MSVC_PDB "Generate PDB files on MSVC in Release mode" 1)
option(SLIC3R_PERL_XS "Compile XS Perl module and enable Perl unit and integration tests" 0) option(SLIC3R_PERL_XS "Compile XS Perl module and enable Perl unit and integration tests" 0)
if (MSVC AND SLIC3R_MSVC_COMPILE_PARALLEL) if (MSVC)
add_compile_options(/MP) if (SLIC3R_MSVC_COMPILE_PARALLEL)
add_compile_options(/MP)
endif ()
# /bigobj (Increase Number of Sections in .Obj file)
add_compile_options(-bigobj)
endif () endif ()
# CMAKE_PREFIX_PATH is used to point CMake to the remaining dependencies (Boost, TBB, ...) # CMAKE_PREFIX_PATH is used to point CMake to the remaining dependencies (Boost, TBB, ...)

7
src/slic3r_app_msvc.cpp
View file

@ -175,7 +175,10 @@ protected:
} }
}; };
typedef int (__stdcall *Slic3rMainFunc)(int argc, wchar_t **argv); extern "C" {
typedef int (__stdcall *Slic3rMainFunc)(int argc, wchar_t **argv);
Slic3rMainFunc slic3r_main = nullptr;
}
#ifdef SLIC3R_WRAPPER_NOCONSOLE #ifdef SLIC3R_WRAPPER_NOCONSOLE
int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, wchar_t *lpCmdLine, int nCmdShow) int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, wchar_t *lpCmdLine, int nCmdShow)
@ -224,7 +227,7 @@ int wmain(int argc, wchar_t **argv)
} }
// resolve function address here // resolve function address here
Slic3rMainFunc slic3r_main = (Slic3rMainFunc)GetProcAddress(hInstance_Slic3r, "slic3r_main"); slic3r_main = (Slic3rMainFunc)GetProcAddress(hInstance_Slic3r, "slic3r_main");
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;