summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Theodore <tonyt@logyst.com>2017-03-21 08:13:20 (GMT)
committerTony Theodore <tonyt@logyst.com>2017-03-21 08:13:20 (GMT)
commita71ca3cb580851ae7a96db85a91e1ed626fc318d (patch)
tree463e6565228ed5e6f0bd72e65e1af9303bf2613e
parent8e8639965197d80794696693a5e6bdd9e57a851e (diff)
downloadmxe-a71ca3cb580851ae7a96db85a91e1ed626fc318d.zip
mxe-a71ca3cb580851ae7a96db85a91e1ed626fc318d.tar.gz
mxe-a71ca3cb580851ae7a96db85a91e1ed626fc318d.tar.bz2
glm: use GH_CONF and BUILD_DIR/SOURCE_DIR
-rw-r--r--src/glm.mk18
1 files changed, 5 insertions, 13 deletions
diff --git a/src/glm.mk b/src/glm.mk
index 1fd5282..b1022c2 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
-