John Schoenick
d616614dce
makefile_base.mak: Fix inverted logic on wine-preloader install
...
Should not install on OS X, rather than only install on OS X (oops!)
2018-09-07 17:11:11 -07:00
John Schoenick
c3a326be07
makefile_base.mak: Replace container-test step with sudo test
...
The real use of this step is obtaining sudo access to avoid having
sudo prompts buried in the build output when building in parallel,
making it non-obvious why the build is hanging. Just warn that this
may happen and obtain sudo immediately to mitigate. Building without
-j will always build subprojects in serial and won't have this
issue (similar to build_proton.sh)
2018-09-07 16:58:53 -07:00
John Schoenick
e5efde2575
build: Add --with-ffmpeg to makefile path
...
Rather than having 'ffmpeg' be an optional thing that may or may not
be in your build depending on if you've run 'make ffmpeg'
2018-09-07 16:57:30 -07:00
John Schoenick
15b4f5b84a
makefile_base.mak: Don't install wine-preloader on OS X
...
Carryover from build_proton.sh
2018-09-06 15:56:25 -07:00
John Schoenick
dde5b89ecc
makefile_base.mak: Remove some already-addressed OS X TODO comments
2018-09-06 15:55:39 -07:00
John Schoenick
accb799a68
configure.sh: Add --help / --usage
...
Just shows the usage text anyway, but without scolding you
2018-09-06 15:42:31 -07:00
John Schoenick
9cc535e653
makefile_base.mak: Fix autoconf flags passed to wine for OS X builds
...
This wasn't really fully hooked up, just mimic'd from build_proton.sh
2018-09-06 15:25:43 -07:00
John Schoenick
0330fc30dc
makefile_base.mak: Re-order config sections so FREETYPE_CFLAGS works
...
TOOLS_DIR32 needs to be defined before this chunk
2018-09-06 15:25:43 -07:00
John Schoenick
c6e558f947
makefile_base.mak: Fix and improve targets, add help
...
make help or make targets will show a target list, the 'all' and
all32/etc helper targets now work right.
2018-09-06 15:25:43 -07:00
John Schoenick
452ce8de07
makefile_base.mak: Fix nested_make with no goals specified
2018-09-06 15:25:43 -07:00
John Schoenick
e47b3646b2
makefile_base.mak: Additional wine deps are OS X only
2018-09-06 15:25:43 -07:00
John Schoenick
1bf5b59071
makefile_base.mak: Add moltenvk build steps for OS X
2018-09-06 15:25:43 -07:00
John Schoenick
de1796ae91
makefile_base.mak: Fix quoting hazards
...
Some of these variables are expanded into shell assignments, in which
case we want them to be single-element variables and not lists under
make.
2018-09-06 15:25:43 -07:00
John Schoenick
e6d905c135
makefile_base.mak: Add libsdl build steps for OS X
2018-09-06 15:25:43 -07:00
John Schoenick
6bff02aff6
makefile_base.mak: Add libjpeg build steps for OS X
2018-09-06 15:25:43 -07:00
John Schoenick
bbe3decd78
makefile_base.mak: Add libpng build steps for OS X
2018-09-06 15:25:43 -07:00
John Schoenick
5cd4f01d85
makefile_base.mak: Use clang for CC/CXX on OS X
2018-09-06 15:25:43 -07:00
John Schoenick
53ae49fc44
makefile_base.mak: Proper platform-specific variable handling
...
Split variables section for platform-specific variables. Import OS X
values from build_proton, ensure they are quoted properly when defined
and passed to shell in recipes.
2018-09-06 15:25:43 -07:00
John Schoenick
fc98b7b36a
makefile_base.mak: Finish freetype build steps for OS X
2018-09-06 15:25:43 -07:00
John Schoenick
303c9d680c
makefile_base.mak: Don't run symlink-vrclient step in container
...
Unnecessary container annotation
2018-09-06 15:25:43 -07:00
John Schoenick
5934094828
makefile_base.mak: Export HOME in container invocation
...
This was causing weird bugs in docker-on-OS X which wasn't determining
home correctly. (Not really a supported setup)
2018-09-06 15:25:43 -07:00
John Schoenick
a556fa1983
makefile_base.mak: Fix nested make invoking wrong makefile
...
Effectively a no-op since outer makefile only sets variables we'd
inherit either way, but a silly landmine
2018-09-06 15:25:43 -07:00
John Schoenick
d751c57451
makefile_base.mak: Fix winemaker dependencies
...
This doesn't really need to be a dependency, but you'll get a cleaner
warning about your wine submodule not being setup
2018-09-06 15:25:43 -07:00
John Schoenick
09a672bd52
makefile_base.mak: Don't use 'undefine'
...
Breaks OS X/Homebrew make
2018-09-06 15:25:43 -07:00
John Schoenick
35e76391fe
configure.sh: Fix grammatical typo
2018-09-06 15:25:43 -07:00
John Schoenick
30ea538cef
build: Add --build-name to configure.sh step
2018-09-06 15:25:43 -07:00
John Schoenick
0b192a548a
build: Install proper license file for OS X builds
...
Pass OSX variable to make, conditionally select LICENSE.osx
2018-09-06 15:25:43 -07:00
John Schoenick
f5e8954c5f
makefile_base.mak: Comment expected settings from configure.sh
2018-09-06 15:25:43 -07:00
John Schoenick
154cda1b7f
build: Disable dxvk by default on OS X
2018-09-06 15:25:05 -07:00
John Schoenick
4b65a3531c
makefile_base.mak: Clean-up remaining FIXME/TODO comments
2018-08-27 17:01:23 -07:00
John Schoenick
7ff739f1d8
makefile_base.mak: Add LICENSE dist step
2018-08-27 17:01:23 -07:00
John Schoenick
94f38d6278
makefile_base.mak: Add make install target
2018-08-27 17:01:23 -07:00
John Schoenick
8a65ba1e7c
configure.sh: Improve help text
2018-08-27 17:01:23 -07:00
John Schoenick
055183eaa5
configure.sh: Remove --force
2018-08-27 17:01:23 -07:00
John Schoenick
3ccfeffa32
Add configure.sh / configuration step to generate final makefile
2018-08-27 17:01:23 -07:00
John Schoenick
8f26580178
Add steamrt-bootstrap.sh for use with steam-runtime setup scripts
2018-08-27 17:01:23 -07:00
John Schoenick
fdda818065
makefile_base.mak: Add nested make for better failure handling
2018-08-27 17:01:23 -07:00
John Schoenick
d92a0f1210
makefile_base.mak: Misc build step fixes
...
make all should succeed now
2018-08-27 17:01:22 -07:00
John Schoenick
2f7d77caae
makefile_base.mak: ffmpeg is optional, don't build by default
2018-08-27 17:01:22 -07:00
John Schoenick
b88db76760
makefile_base.mak: 'make all succeeded' output for meta targets
2018-08-27 17:01:22 -07:00
John Schoenick
432f8ec03b
makefile_base.mak: Fix intermediate targets
...
Cannot use multiple-target rules in this way unless they are pattern
rules
2018-08-27 17:01:22 -07:00
John Schoenick
dd1dcbbb8f
makefile_base.mak: Cleanup wine targets and winebuild dependencies
2018-08-27 17:01:22 -07:00
John Schoenick
3ebca56e77
makefile_base.mak: Fix docker not accepting SIGINT
2018-08-27 17:01:22 -07:00
John Schoenick
8b81f7c69e
makefile_base.mak: Include cmake, build for openal
...
Removes need for special cmake setup to get builds working, as Steam
Runtime currently doesn't provide cmake 3
2018-08-27 17:01:22 -07:00
John Schoenick
e0d5e7f9d2
makefile_base.mak: Initial support for docker builds
2018-08-27 17:01:22 -07:00
John Schoenick
23cdb57144
makefile_base.mak: Install openvr_api_dll in the dist step
2018-08-27 17:01:22 -07:00
John Schoenick
3bc14bd7f1
makefile_base.mak: Build the initial wine prefix in the dist step
2018-08-27 17:01:22 -07:00
John Schoenick
9a75ea7791
makefile_base.mak: Generate compatibilitytool.vdf from dist step
2018-08-27 17:01:22 -07:00
John Schoenick
8666551881
makefile_base.mak: Add initial dist step
2018-08-27 17:01:22 -07:00
John Schoenick
e95225687f
makefile_base.mak: Make depending on the makefile itself optional
...
Many of the configure steps below depend on the makefile itself, such
that they are dirtied by changing the recipes that create them. This
can be annoying when working on the makefile, allow disabling this via
make NO_MAKEFILE_DEPENDENCY=1
2018-08-27 17:01:19 -07:00