Skip to content

Commit bbbf4e6

Browse files
committed
Use caching during builds.
Change library name/path depending on arch.
1 parent b826f8b commit bbbf4e6

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ environment:
99
BOOST_DIR: C:\dev\boost_1_63_0
1010
WXDIR: C:\dev\wxwidgets
1111
WXSHARED: SHARED=0
12-
FORCE_WX_BUILD: 1
13-
FORCE_BOOST_REINSTALL: 1
12+
FORCE_WX_BUILD: 0
13+
FORCE_BOOST_REINSTALL: 0
1414
ENC_SECRET:
1515
secure: QfeTOSKXz1uFCEACqFKLNw==
1616
UPLOAD_USER:

package/win/package_win32.ps1

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,12 @@ New-Variable -Name "STRAWBERRY_PATH" -Value "C:\Strawberry"
4343
cpanm "PAR::Packer"
4444
if ($env:ARCH -eq "32bit") {
4545
$perlarch = "sjlj"
46+
$glut = "libglut-0_.dll"
47+
$pthread= "pthreadGC2-w32.dll"
4648
} else {
4749
$perlarch = "seh"
50+
$glut = "libglut-0__.dll"
51+
$pthread= "pthreadGC2-w64.dll"
4852
}
4953

5054

@@ -62,9 +66,8 @@ pp `
6266
-a "${STRAWBERRY_PATH}\perl\bin\libstdc++-6.dll;libstdc++-6.dll" `
6367
-a "${STRAWBERRY_PATH}\perl\bin\libgcc_s_${perlarch}-1.dll;libgcc_s_${perlarch}-1.dll" `
6468
-a "${STRAWBERRY_PATH}\perl\bin\libwinpthread-1.dll;libwinpthread-1.dll" `
65-
-a "${STRAWBERRY_PATH}\c\bin\pthreadGC2-w64.dll;pthreadGC2-w64.dll" `
66-
-a "${STRAWBERRY_PATH}\c\bin\pthreadGC2-w32.dll;pthreadGC2-w32.dll" `
67-
-a "${STRAWBERRY_PATH}\c\bin\libglut-0__.dll;libglut-0__.dll" `
69+
-a "${STRAWBERRY_PATH}\c\bin\${pthread};${pthread}" `
70+
-a "${STRAWBERRY_PATH}\c\bin\${glut};${glut}" `
6871
-M AutoLoader `
6972
-M B `
7073
-M Carp `

0 commit comments

Comments
 (0)