From a71ca3cb580851ae7a96db85a91e1ed626fc318d Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Tue, 21 Mar 2017 19:13:20 +1100 Subject: [PATCH] glm: use GH_CONF and BUILD_DIR/SOURCE_DIR --- src/glm.mk | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/src/glm.mk b/src/glm.mk index 1fd52822..b1022c20 100644 --- a/src/glm.mk +++ b/src/glm.mk @@ -6,24 +6,16 @@ $(PKG)_DESCR := GLM - OpenGL Mathematics $(PKG)_IGNORE := $(PKG)_VERSION := 0.9.7.6 $(PKG)_CHECKSUM := 872fdea580b69b752562adc60734d7472fd97d5724c4ead585564083deac3953 -$(PKG)_SUBDIR := glm-$($(PKG)_VERSION) -$(PKG)_FILE := $($(PKG)_VERSION).tar.gz -$(PKG)_URL := https://github.com/g-truc/glm/archive/$($(PKG)_VERSION).tar.gz +$(PKG)_GH_CONF := g-truc/glm $(PKG)_DEPS := gcc -define $(PKG)_UPDATE - $(call MXE_GET_GITHUB_TAGS, g-truc/glm) -endef - define $(PKG)_BUILD - mkdir '$(1).build' - - cd '$(1).build' && $(TARGET)-cmake '$(1)' - - $(MAKE) -C '$(1).build' -j '$(JOBS)' install + cd '$(BUILD_DIR)' && $(TARGET)-cmake \ + '$(SOURCE_DIR)' + $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' + $(MAKE) -C '$(BUILD_DIR)' -j 1 install '$(TARGET)-g++' \ -W -Wall -Werror -ansi -pedantic \ '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-glm.exe' endef -