GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-01 04:02:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update file encodings and add some commentary. Also make 524 the default perl lib

Browse Source
This commit is contained in:
Joseph Lenox 2017-04-19 02:30:19 +00:00
parent b26681ef58
commit 3274b75e5f
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/common/shell.cpp
View File

@ -1,7 +1,6 @@
#include <EXTERN.h> // from the Perl distribution #include <EXTERN.h> // from the Perl distribution
#include <perl.h> // from the Perl distribution #include <perl.h> // from the Perl distribution
#ifdef WIN32 #ifdef WIN32
// Perl win32 specific includes, found in perl\\lib\\CORE\\win32.h // Perl win32 specific includes, found in perl\\lib\\CORE\\win32.h
// Defines the windows specific convenience RunPerl() function, // Defines the windows specific convenience RunPerl() function,
@ -17,13 +16,8 @@
int main(int argc, char **argv, char **env) int main(int argc, char **argv, char **env)
{ {
// replaces following Windows batch file: @"%~dp0\perl5.24.0.exe"
// "%~dp0\slic3r.pl" --DataDir "C:\Users\Public\Documents\Prusa3D\Slic3r
// settings MK2"%*
// If the Slic3r is installed in a localized directory (containing non-iso // If the Slic3r is installed in a localized directory (containing non-iso
// characters), spaces or semicolons, use short file names. // characters), spaces or semicolons, use short file names.
char exe_path[MAX_PATH] = {0}; char exe_path[MAX_PATH] = {0};
char script_path[MAX_PATH]; char script_path[MAX_PATH];
char gui_flag[6] = {"--gui"}; char gui_flag[6] = {"--gui"};

1
package/win/autorun.bat
View File

@ -1 +0,0 @@
@perl5.24.0.exe slic3r.pl %*

13
package/win/compile_wrapper.ps1
View File

@ -4,16 +4,27 @@ if ($args[0])
$perlver = $args[0] $perlver = $args[0]
} else } else
{ {
$perlver = 518 $perlver = 524
} }
$perllib = "-lperl$perlver" $perllib = "-lperl$perlver"
$shell_loc = "..\common\shell.cpp" $shell_loc = "..\common\shell.cpp"
# Build the resource file (used to load icon, etc)
windres slic3r.rc -O coff -o slic3r.res windres slic3r.rc -O coff -o slic3r.res
# Compile an object file that does not have gui forced.
g++ -c -I'C:\strawberry\perl\lib\CORE\' $shell_loc -o slic3r.o g++ -c -I'C:\strawberry\perl\lib\CORE\' $shell_loc -o slic3r.o
# Compile an object file with --gui automatically passed as an argument
g++ -c -I'C:\strawberry\perl\lib\CORE\' -DFORCE_GUI $shell_loc -o slic3r-gui.o g++ -c -I'C:\strawberry\perl\lib\CORE\' -DFORCE_GUI $shell_loc -o slic3r-gui.o
# Build the EXE for the unforced version as slic3r-console
g++ -static-libgcc -static-libstdc++ -L'C:\strawberry\c\lib' -L'C:\strawberry\perl\bin' -L'C:\strawberry\perl\lib\CORE\' $perllib slic3r.o slic3r.res -o slic3r-console.exe | Write-Host g++ -static-libgcc -static-libstdc++ -L'C:\strawberry\c\lib' -L'C:\strawberry\perl\bin' -L'C:\strawberry\perl\lib\CORE\' $perllib slic3r.o slic3r.res -o slic3r-console.exe | Write-Host
# Build the EXE for the forced GUI
g++ -static-libgcc -static-libstdc++ -L'C:\strawberry\c\lib' -mwindows -L'C:\strawberry\perl\bin' -L'C:\strawberry\perl\lib\CORE\' $perllib slic3r-gui.o slic3r.res -o slic3r.exe | Write-Host g++ -static-libgcc -static-libstdc++ -L'C:\strawberry\c\lib' -mwindows -L'C:\strawberry\perl\bin' -L'C:\strawberry\perl\lib\CORE\' $perllib slic3r-gui.o slic3r.res -o slic3r.exe | Write-Host
# Build an extra copy of the GUI version that creates a console window
g++ -static-libgcc -static-libstdc++ -L'C:\strawberry\c\lib' -L'C:\strawberry\perl\bin' -L'C:\strawberry\perl\lib\CORE\' $perllib slic3r-gui.o slic3r.res -o slic3r-debug-console.exe | Write-Host g++ -static-libgcc -static-libstdc++ -L'C:\strawberry\c\lib' -L'C:\strawberry\perl\bin' -L'C:\strawberry\perl\lib\CORE\' $perllib slic3r-gui.o slic3r.res -o slic3r-debug-console.exe | Write-Host

4
package/win/package_win32.ps1
View File

@ -1,7 +1,7 @@
# Written by Joseph Lenox # Written by Joseph Lenox
# Licensed under the same license as the rest of Slic3r. # Licensed under the same license as the rest of Slic3r.
# ------------------------ # ------------------------
# You need to have Strawberry Perl 5.24.0.1 installed for this to work, # You need to have Strawberry Perl 5.24.0.1 (or slic3r-perl) installed for this to work,
param ( param (
[switch]$exe = $false [switch]$exe = $false
) )