GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-11 00:39:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use caching during builds.

Browse Source 
Change library name/path depending on arch.
This commit is contained in:
Joseph Lenox 2017-05-15 18:41:07 -05:00
parent b826f8baea
commit bbbf4e6172
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
appveyor.yml
View File

@ -9,8 +9,8 @@ environment:
BOOST_DIR: C:\dev\boost_1_63_0 BOOST_DIR: C:\dev\boost_1_63_0
WXDIR: C:\dev\wxwidgets WXDIR: C:\dev\wxwidgets
WXSHARED: SHARED=0 WXSHARED: SHARED=0
FORCE_WX_BUILD: 1 FORCE_WX_BUILD: 0
FORCE_BOOST_REINSTALL: 1 FORCE_BOOST_REINSTALL: 0
ENC_SECRET: ENC_SECRET:
secure: QfeTOSKXz1uFCEACqFKLNw== secure: QfeTOSKXz1uFCEACqFKLNw==
UPLOAD_USER: UPLOAD_USER:

9
package/win/package_win32.ps1
View File

@ -43,8 +43,12 @@ New-Variable -Name "STRAWBERRY_PATH" -Value "C:\Strawberry"
cpanm "PAR::Packer" cpanm "PAR::Packer"
if ($env:ARCH -eq "32bit") { if ($env:ARCH -eq "32bit") {
$perlarch = "sjlj" $perlarch = "sjlj"
$glut = "libglut-0_.dll"
$pthread= "pthreadGC2-w32.dll"
} else { } else {
$perlarch = "seh" $perlarch = "seh"
$glut = "libglut-0__.dll"
$pthread= "pthreadGC2-w64.dll"
} }
@ -62,9 +66,8 @@ pp `
-a "${STRAWBERRY_PATH}\perl\bin\libstdc++-6.dll;libstdc++-6.dll" ` -a "${STRAWBERRY_PATH}\perl\bin\libstdc++-6.dll;libstdc++-6.dll" `
-a "${STRAWBERRY_PATH}\perl\bin\libgcc_s_${perlarch}-1.dll;libgcc_s_${perlarch}-1.dll" ` -a "${STRAWBERRY_PATH}\perl\bin\libgcc_s_${perlarch}-1.dll;libgcc_s_${perlarch}-1.dll" `
-a "${STRAWBERRY_PATH}\perl\bin\libwinpthread-1.dll;libwinpthread-1.dll" ` -a "${STRAWBERRY_PATH}\perl\bin\libwinpthread-1.dll;libwinpthread-1.dll" `
-a "${STRAWBERRY_PATH}\c\bin\pthreadGC2-w64.dll;pthreadGC2-w64.dll" ` -a "${STRAWBERRY_PATH}\c\bin\${pthread};${pthread}" `
-a "${STRAWBERRY_PATH}\c\bin\pthreadGC2-w32.dll;pthreadGC2-w32.dll" ` -a "${STRAWBERRY_PATH}\c\bin\${glut};${glut}" `
-a "${STRAWBERRY_PATH}\c\bin\libglut-0__.dll;libglut-0__.dll" `
-M AutoLoader ` -M AutoLoader `
-M B ` -M B `
-M Carp ` -M Carp `