From 81a32da366069cadc788345d12e4d30d9dc7ca57 Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Sun, 27 Aug 2017 15:59:53 -0400 Subject: [PATCH] Fix GLEW in dep to use lib instead of lib64 install path --- README.md | 4 ++-- dep/Makefile | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 8faa417e..a2390194 100644 --- a/README.md +++ b/README.md @@ -9,9 +9,9 @@ *If the build fails for you, please report the issue with a detailed error message to help the portability of Rack.* Clone this repository and `cd` into it. -On Windows, use [MSYS2](http://www.msys2.org/) to set up a \*NIX shell. +On Windows, use [MSYS2](http://www.msys2.org/) and launch a mingw32/64 shell. -Clone submodules in `/ext`. +Clone submodules. git submodule update --init diff --git a/dep/Makefile b/dep/Makefile index 418afa57..f58e6384 100755 --- a/dep/Makefile +++ b/dep/Makefile @@ -35,9 +35,8 @@ $(glew): $(WGET) https://downloads.sourceforge.net/project/glew/glew/$(patsubst glew-%,%,$@)/$@.tgz $(UNTAR) $@.tgz $(MAKE) -C $@ - ln -s lib lib64 - $(MAKE) -C $@ GLEW_DEST="$(LOCAL)" install - rm lib64 + # On Linux, default lib path is lib64, so change it back to lib. + $(MAKE) -C $@ GLEW_DEST="$(LOCAL)" LIBDIR="$(LOCAL)/lib" install $(glfw): $(WGET) https://github.com/glfw/glfw/releases/download/$(patsubst glfw-%,%,$@)/$@.zip