Merge pull request #7 from kuroneko/update-physfs

Update physfs
kuroneko · Oct 14, 2020 · ea6467d · ea6467d
2 parents c499e27 + 88c674c
commit ea6467d
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 3 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -34,12 +34,16 @@ pipeline {
                         label 'macos'
                     }
                     steps {
+                        sh '''
+                        export PATH=/usr/local/bin:$PATH
+                        conan config install "${WORKSPACE}/saisgpl/conan"
+                        '''
                         dir('saisgpl.m64') {
                             deleteDir()
                             sh '''
                             export PATH=/usr/local/bin:$PATH
             			    export MACOS_DEPLOYMENT_TARGET=10.11
-                            conan install ../saisgpl --build --update --profile=default -s os.version=10.11
+                            conan install ../saisgpl --build --update --profile=release-m64
                             '''
                         }
                         cmakeBuild buildDir: 'saisgpl.m64',
@@ -101,10 +105,13 @@ pipeline {
                         label 'windows'
                     }
                     steps {
+                        bat '''
+                            conan config install %WORKSPACE%\\saisgpl\\conan
+                        '''
                         dir('saisgpl.w64') {
                             deleteDir()
                             bat '''
-                            conan install ..\\saisgpl --build=outdated --build=cascade --update --profile=default -s compiler.runtime=MT
+                            conan install ..\\saisgpl --build=outdated --build=cascade --update --profile=release-w64
                             '''
                         }
                         cmakeBuild generator: 'Visual Studio 16 2019',

diff --git a/conan/profiles/release-m64 b/conan/profiles/release-m64
@@ -0,0 +1,13 @@
+[settings]
+os=Macos
+os.version=10.11
+os_build=Macos
+arch=x86_64
+arch_build=x86_64
+compiler=apple-clang
+compiler.version=11.0
+compiler.libcxx=libc++
+build_type=Release
+[options]
+[build_requires]
+[env]
diff --git a/conan/profiles/release-w64 b/conan/profiles/release-w64
@@ -0,0 +1,12 @@
+[settings]
+os=Windows
+os_build=Windows
+compiler=Visual Studio
+compiler.version=16
+compiler.runtime=MT
+build_type=Release
+arch=x86_64
+arch_build=x86_64
+[options]
+[build_requires]
+[env]
diff --git a/conan/remotes.txt b/conan/remotes.txt
@@ -0,0 +1,3 @@
+conan-center https://conan.bintray.com True
+bincrafters https://api.bintray.com/conan/bincrafters/public-conan True
+xsquawkbox-public https://api.bintray.com/conan/akuneko/xsquawkbox True
diff --git a/conanfile.py b/conanfile.py
@@ -8,7 +8,7 @@ class SaisConan(ConanFile):
     requires = [
         'sdl2/2.0.12@bincrafters/stable',
         'sdl2_mixer/2.0.4@bincrafters/stable',
-        'physfs/3.0.1@bincrafters/stable',
+        'physfs/3.0.2@xsquawkbox/testing',
     ]
     default_options = {
         "*:shared": False,