diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/box2d.mk | 18 | ||||
-rw-r--r-- | src/glfw3.mk | 18 |
2 files changed, 11 insertions, 25 deletions
diff --git a/src/box2d.mk b/src/box2d.mk index d29c7de..737bd1f 100644 --- a/src/box2d.mk +++ b/src/box2d.mk @@ -2,27 +2,19 @@ PKG := box2d $(PKG)_WEBSITE := http://www.box2d.org/ -$(PKG)_DESCR := Box2D $(PKG)_IGNORE := $(PKG)_VERSION := 2.3.1 $(PKG)_CHECKSUM := 75d62738b13d2836cd56647581b6e574d4005a6e077ddefa5d727d445d649752 -$(PKG)_SUBDIR := Box2D-$($(PKG)_VERSION)/Box2D -$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := https://github.com/erincatto/Box2D/archive/v$($(PKG)_VERSION).tar.gz +$(PKG)_GH_CONF := erincatto/Box2D, v $(PKG)_DEPS := gcc -define $(PKG)_UPDATE - $(call MXE_GET_GITHUB_TAGS, erincatto/Box2D) | \ - $(SED) 's,^v,,g' -endef - define $(PKG)_BUILD - mkdir '$(1).build' - cd '$(1).build' && '$(TARGET)-cmake' . \ + cd '$(BUILD_DIR)' && $(TARGET)-cmake \ -DBOX2D_INSTALL=ON \ -DBOX2D_BUILD_EXAMPLES=OFF \ -DBOX2D_BUILD_STATIC=$(CMAKE_STATIC_BOOL) \ -DBOX2D_BUILD_SHARED=$(CMAKE_SHARED_BOOL) \ - '$(1)' - $(MAKE) -C '$(1).build' -j '$(JOBS)' install VERBOSE=1 + '$(SOURCE_DIR)/Box2D' + $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' VERBOSE=1 + $(MAKE) -C '$(BUILD_DIR)' -j 1 install VERBOSE=1 endef diff --git a/src/glfw3.mk b/src/glfw3.mk index 89f8312..f19c541 100644 --- a/src/glfw3.mk +++ b/src/glfw3.mk @@ -6,24 +6,19 @@ $(PKG)_DESCR := GLFW 3.x $(PKG)_IGNORE := $(PKG)_VERSION := 3.1.2 $(PKG)_CHECKSUM := 6ac642087682aaf7f8397761a41a99042b2c656498217a1c63ba9706d1eef122 -$(PKG)_SUBDIR := glfw-$($(PKG)_VERSION) -$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := https://github.com/glfw/glfw/archive/$($(PKG)_VERSION).tar.gz +$(PKG)_GH_CONF := glfw/glfw $(PKG)_DEPS := gcc -define $(PKG)_UPDATE - $(call MXE_GET_GITHUB_TAGS, glfw/glfw) -endef - define $(PKG)_BUILD - mkdir '$(1).build' - cd '$(1).build' && '$(TARGET)-cmake' '$(1)' \ + cd '$(BUILD_DIR)' && $(TARGET)-cmake \ -DGLFW_BUILD_EXAMPLES=FALSE \ -DGLFW_BUILD_TESTS=FALSE \ -DGLFW_BUILD_DOCS=FALSE \ -DGLFW_INSTALL_PKG_CONFIG=TRUE \ - -DGLFW_PKG_LIBS='-lopengl32 -lgdi32' - $(MAKE) -C '$(1).build' -j '$(JOBS)' install + -DGLFW_PKG_LIBS='-lopengl32 -lgdi32' \ + '$(SOURCE_DIR)' + $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' + $(MAKE) -C '$(BUILD_DIR)' -j 1 install # Windows convention: DLLs in bin/, not in lib/, import library is called "libglfw3.dll.a" $(if $(BUILD_SHARED), @@ -35,4 +30,3 @@ define $(PKG)_BUILD '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-glfw3.exe' \ `'$(TARGET)-pkg-config' glfw3 --cflags --libs` endef - |