Skip to content

Commit

Permalink
ci: use xcode11
Browse files Browse the repository at this point in the history
quiet linking errors
  • Loading branch information
JaCzekanski committed Aug 17, 2019
1 parent 92cfe5c commit 998812f
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ matrix:
script: "./.travis/android/run-container.sh"
- name: macOS
os: osx
osx_image: xcode10.1
osx_image: xcode11
install: "./.travis/macos/install-dependencies.sh"
script: "./.travis/macos/build.sh"

Expand Down
2 changes: 1 addition & 1 deletion .travis/macos/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ ccache --set-config=sloppiness=pch_defines,time_macros
premake5 xcode4

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

# Package
mkdir -p $ARTIFACT
Expand Down
12 changes: 8 additions & 4 deletions premake5.lua
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,13 @@ filter "action:gmake"
"-Wextra",
}

filter "action:vs*"
defines "_CRT_SECURE_NO_WARNINGS"

filter "action:xcode*"
buildoptions "-fvisibility=hidden"
linkoptions "-fvisibility=hidden"

filter "kind:*App"
targetdir "build/%{cfg.buildcfg}_%{cfg.platform}"

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

filter {"configurations:Release"}
if os.getenv("CI") == true then
flags { "LinkTimeOptimization" }
flags { "LinkTimeOptimization" }
end

filter "action:vs*"
defines "_CRT_SECURE_NO_WARNINGS"

include "premake/chdr.lua"
include "premake/flac.lua"
include "premake/glad.lua"
Expand Down

0 comments on commit 998812f

Please sign in to comment.