Skip to content

Commit

Permalink
Merge pull request #94 from runlevel5/travis-ppc64le-fix
Browse files Browse the repository at this point in the history
Add ppc64le build for Travis
  • Loading branch information
kondrak authored Apr 10, 2020
2 parents cc297ca + 672ec9f commit 7d13abe
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 6 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ xcuserdata
macos/vkQuake2
debugx64
releasex64
debugppc64le
releaseppc64le
Debug
Release
Quake2
16 changes: 15 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,21 @@ before_install:

matrix:
include:
- os: linux
dist: bionic
arch: ppc64le
compiler: g++
sudo: required
install:
- export VULKAN_SDK=$TRAVIS_BUILD_DIR/$VK_VERSION/ppc64le
- sudo apt-get -qq update
- sudo apt-get install -y make gcc g++ mesa-common-dev libglu1-mesa-dev libxxf86dga-dev libxxf86vm-dev libasound2-dev libx11-dev libxcb1-dev
- curl -L -v -o vulkansdk-linux-ppc64le-$VK_VERSION.tar.gz -O https://raw.githubusercontent.com/runlevel5/vulkansdk-linux-ppc64le/master/vulkansdk-linux-ppc64le-$VK_VERSION.tar.gz
- tar zxf vulkansdk-linux-ppc64le-$VK_VERSION.tar.gz
script:
- cd $TRAVIS_BUILD_DIR/linux
- make clean debug
- make clean release
- os: linux
dist: xenial
compiler: g++
Expand All @@ -33,7 +48,6 @@ matrix:
- cd macos
- make clean-xcode debug-xcode
- make clean-xcode release-xcode

notifications:
email:
recipients:
Expand Down
24 changes: 19 additions & 5 deletions linux/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,21 @@ else
GLIBC=
endif

ifneq (,$(findstring alpha,$(shell uname -m)))
ARCH=axp
RPMARCH=alpha
KERNEL_ARCH=$(shell uname -m)

ifeq ($(KERNEL_ARCH),x86_64)
ARCH=x64
RPMARCH=i386
else ifeq ($(KERNEL_ARCH),ppc64le)
ARCH=ppc64le
RPMARCH=ppc64le
else ifneq (,$(findstring alpha,$(KERNEL_ARCH)))
ARCH=axp
RPMARCH=alpha
else
ARCH=x64
RPMARCH=i386
$(error "Unsupported ARCH: ${KERNEL_ARCH}")
endif

NOARCH=noarch

MOUNT_DIR=..
Expand Down Expand Up @@ -70,7 +78,13 @@ XCFLAGS=

GLLDFLAGS=-L/usr/X11R6/lib -L/usr/local/lib -L$(MESA_DIR)/lib -lX11 -lXext -lvga -lm
GLXLDFLAGS=-L/usr/X11R6/lib -L/usr/local/lib -L$(MESA_DIR)/lib -lX11 -lXext -lXxf86dga -lXxf86vm -lm

ifeq ($(ARCH),ppc64le)
VKLDFLAGS=-L/usr/X11R6/lib -L$(VULKAN_SDK)/lib64 -L/usr/local/lib -lX11 -lXext -lXxf86dga -lXxf86vm -lm -lvulkan -lstdc++
else
VKLDFLAGS=-L/usr/X11R6/lib -L$(VULKAN_SDK)/lib -L/usr/local/lib -lX11 -lXext -lXxf86dga -lXxf86vm -lm -lvulkan -lstdc++
endif

GLCFLAGS=-I$(MESA_DIR)/include -I/usr/include/glide
VKCFLAGS=-I$(VULKAN_SDK)/include

Expand Down

0 comments on commit 7d13abe

Please sign in to comment.