Skip to content

Update ZenLib #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Update ZenLib #6

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
69a85e1
Update ZenLib
frabert Apr 15, 2019
7b6e854
Update AppVeyor build script
frabert Apr 15, 2019
164a41b
Update bs::f prebuilt binaries' URL
frabert Apr 15, 2019
a4fe6a2
Change vcpkg triplet
frabert Apr 15, 2019
56be73b
Build shared libs, copy dependencies
frabert Apr 15, 2019
3b4628d
Use static vcpkg libraries, do not push artifacts
frabert Apr 16, 2019
0984e22
Add instructions to README
frabert Apr 20, 2019
cd54dd6
Add automated build script
frabert Apr 20, 2019
1e0b875
Mention build script on README
frabert Apr 20, 2019
c3e9e7a
Merge remote-tracking branch 'origin/master' into update-zenlib
frabert Apr 20, 2019
18d4c86
Update ZenLib, removed GLM mentions
frabert Apr 20, 2019
ac9e65a
Merge branch 'master' into update-zenlib
frabert Apr 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ Most modern Linux distros provide a way to install them via the native package
manager. Ubuntu 18.04+ is known to ship recent enough versions, older distros do not
and installing from source may be necessary.

On Windows, just double-click on `build.bat`. It will manage everything automatically.

Dependencies on Windows are best managed using [vcpkg](https://github.com/Microsoft/vcpkg), you can
find instructions on how to build it on the official repository. Once vcpkg is installed, you should
install the following packages `physfs glm libsquish` by running
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wait, do we actually still depend on glm? That was a dependency of REGoth, but I got rid of it in ZenLib, or so I thought.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh really? Then we might not need it anymore... I should probably update the ZenLib cmake

Expand Down
11 changes: 11 additions & 0 deletions build.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
set CURRENT_DIR=%~dp0
git clone https://github.com/Microsoft/vcpkg.git
cd vcpkg
call bootstrap-vcpkg.bat
set VCPKG_ROOT=%CURRENT_DIR%\vcpkg
vcpkg.exe install --triplet x64-windows-static glm physfs libsquish
cd ..
mkdir build
cd build
cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static "-DCMAKE_TOOLCHAIN_FILE=%CURRENT_DIR%\vcpkg\scripts\buildsystems\vcpkg.cmake" -DBSZENLIB_DOWNLOAD_BSF_BINARIES=ON -G "Visual Studio 15 2017 Win64" ..
cmake --build . -j 8