Skip to content

Commit 998812f

Browse files
committed
ci: use xcode11
quiet linking errors
1 parent 92cfe5c commit 998812f

3 files changed

Lines changed: 10 additions & 6 deletions

File tree

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ matrix:
2323
script: "./.travis/android/run-container.sh"
2424
- name: macOS
2525
os: osx
26-
osx_image: xcode10.1
26+
osx_image: xcode11
2727
install: "./.travis/macos/install-dependencies.sh"
2828
script: "./.travis/macos/build.sh"
2929

.travis/macos/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ccache --set-config=sloppiness=pch_defines,time_macros
1515
premake5 xcode4
1616

1717
# Build
18-
xcodebuild -workspace Avocado.xcworkspace -scheme avocado -configuration release -quiet
18+
xcodebuild -workspace Avocado.xcworkspace -scheme avocado -configuration release -parallelizeTargets -jobs 4 | xcpretty
1919

2020
# Package
2121
mkdir -p $ARTIFACT

premake5.lua

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,13 @@ filter "action:gmake"
9999
"-Wextra",
100100
}
101101

102+
filter "action:vs*"
103+
defines "_CRT_SECURE_NO_WARNINGS"
104+
105+
filter "action:xcode*"
106+
buildoptions "-fvisibility=hidden"
107+
linkoptions "-fvisibility=hidden"
108+
102109
filter "kind:*App"
103110
targetdir "build/%{cfg.buildcfg}_%{cfg.platform}"
104111

@@ -120,12 +127,9 @@ filter "configurations:Release"
120127

121128
filter {"configurations:Release"}
122129
if os.getenv("CI") == true then
123-
flags { "LinkTimeOptimization" }
130+
flags { "LinkTimeOptimization" }
124131
end
125132

126-
filter "action:vs*"
127-
defines "_CRT_SECURE_NO_WARNINGS"
128-
129133
include "premake/chdr.lua"
130134
include "premake/flac.lua"
131135
include "premake/glad.lua"

0 commit comments

Comments
 (0)