suyu/Yucom
25
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: Install proper license file for OS X builds

Browse source 
Pass OSX variable to make, conditionally select LICENSE.osx
This commit is contained in:
John Schoenick 2018-08-28 14:53:04 -07:00
parent f5e8954c5f
commit 0b192a548a
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
build/makefile_base.mak
View file

@ -28,6 +28,7 @@ else # (Rest of the file is the else)
# We expect the configure script to conditionally set the following: # We expect the configure script to conditionally set the following:
# SRCDIR - Path to source # SRCDIR - Path to source
# NO_DXVK - 1 if skipping DXVK steps # NO_DXVK - 1 if skipping DXVK steps
# OSX - 1 if OS X build
# STEAMRT64_MODE - 'docker' or '' for automatic Steam Runtime container # STEAMRT64_MODE - 'docker' or '' for automatic Steam Runtime container
# STEAMRT64_IMAGE - Name of the image if mode is set # STEAMRT64_IMAGE - Name of the image if mode is set
# STEAMRT32_MODE - Same as above for 32-bit container (can be different type) # STEAMRT32_MODE - Same as above for 32-bit container (can be different type)
@ -132,6 +133,10 @@ MAKEFILE_DEP :=
endif endif
COMPAT_MANIFEST_TEMPLATE := $(SRCDIR)/compatibilitytool.vdf.template COMPAT_MANIFEST_TEMPLATE := $(SRCDIR)/compatibilitytool.vdf.template
LICENSE := $(SRCDIR)/dist.LICENSE.lin
ifeq ($(OSX),1)
LICENSE := $(SRCDIR)/dist.LICENSE.osx
endif
TOOLS_DIR32 := ./obj-tools32 TOOLS_DIR32 := ./obj-tools32
TOOLS_DIR64 := ./obj-tools64 TOOLS_DIR64 := ./obj-tools64
@ -276,8 +281,7 @@ DIST_LICENSE := $(DST_DIR)/LICENSE
DIST_TARGETS := $(DIST_COPY_TARGETS) $(DIST_VERSION) $(DIST_VERSION_OUTER) $(DIST_OVR32) $(DIST_OVR64) \ DIST_TARGETS := $(DIST_COPY_TARGETS) $(DIST_VERSION) $(DIST_VERSION_OUTER) $(DIST_OVR32) $(DIST_OVR64) \
$(DIST_COMPAT_MANIFEST) $(DIST_LICENSE) $(DIST_COMPAT_MANIFEST) $(DIST_LICENSE)
# TODO OS X license $(DIST_LICENSE): $(LICENSE)
$(DIST_LICENSE): $(SRCDIR)/dist.LICENSE.lin
cp -a $< $@ cp -a $< $@
$(DIST_OVR32): $(SRCDIR)/openvr/bin/win32/openvr_api.dll | $(DST_DIR) $(DIST_OVR32): $(SRCDIR)/openvr/bin/win32/openvr_api.dll | $(DST_DIR)

5
configure.sh
View file

@ -90,6 +90,11 @@ function configure() {
echo >> "$MAKEFILE" "NO_DXVK := 1" echo >> "$MAKEFILE" "NO_DXVK := 1"
fi fi
# OS X?
if [[ -n $OSX ]]; then
echo >> "$MAKEFILE" "OSX := 1"
fi
# SteamRT # SteamRT
echo >> "$MAKEFILE" "STEAMRT64_MODE := $(escape_for_make "$steamrt64_type")" echo >> "$MAKEFILE" "STEAMRT64_MODE := $(escape_for_make "$steamrt64_type")"
echo >> "$MAKEFILE" "STEAMRT64_IMAGE := $(escape_for_make "$steamrt64_name")" echo >> "$MAKEFILE" "STEAMRT64_IMAGE := $(escape_for_make "$steamrt64_name")"