liblaxjson rucksack: use new-style options

This commit is contained in:
Tony Theodore 2018-03-15 17:25:13 +11:00
parent a17f43d78c
commit d46c1f3141
2 changed files with 15 additions and 31 deletions

View File

@ -5,29 +5,20 @@ $(PKG)_WEBSITE := https://github.com/andrewrk/liblaxjson
$(PKG)_IGNORE := $(PKG)_IGNORE :=
$(PKG)_VERSION := 1.0.5 $(PKG)_VERSION := 1.0.5
$(PKG)_CHECKSUM := ffc495b5837e703b13af3f5a5790365dc3a6794f12f0fa93fb8593b162b0b762 $(PKG)_CHECKSUM := ffc495b5837e703b13af3f5a5790365dc3a6794f12f0fa93fb8593b162b0b762
$(PKG)_SUBDIR := liblaxjson-$($(PKG)_VERSION) $(PKG)_GH_CONF := andrewrk/liblaxjson/tags
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := https://github.com/andrewrk/liblaxjson/archive/$($(PKG)_VERSION).tar.gz
$(PKG)_DEPS := cc $(PKG)_DEPS := cc
define $(PKG)_UPDATE
$(WGET) -q -O- 'https://github.com/andrewrk/liblaxjson/releases' | \
$(SED) -n 's,.*/archive/\([0-9][^>]*\)\.tar.*,\1,p' | \
head -1
endef
define $(PKG)_BUILD define $(PKG)_BUILD
mkdir '$(1).build' cd '$(BUILD_DIR)' && $(TARGET)-cmake '$(SOURCE_DIR)'
cd '$(1).build' && '$(TARGET)-cmake' '$(1)'
'$(TARGET)-cmake' --build '$(1).build' -- -j '$(JOBS)' '$(TARGET)-cmake' --build '$(BUILD_DIR)' -- -j '$(JOBS)'
'$(TARGET)-cmake' \ '$(TARGET)-cmake' \
-DCMAKE_INSTALL_COMPONENT=$(if $(BUILD_STATIC),static,shared)-lib \ -DCMAKE_INSTALL_COMPONENT=$(if $(BUILD_STATIC),static,shared)-lib \
-P '$(1).build/cmake_install.cmake' -P '$(BUILD_DIR)/cmake_install.cmake'
'$(TARGET)-cmake' \ '$(TARGET)-cmake' \
-DCMAKE_INSTALL_COMPONENT=header \ -DCMAKE_INSTALL_COMPONENT=header \
-P '$(1).build/cmake_install.cmake' -P '$(BUILD_DIR)/cmake_install.cmake'
'$(TARGET)-gcc' \ '$(TARGET)-gcc' \
-W -Wall -Werror -ansi -pedantic -std=c99 \ -W -Wall -Werror -ansi -pedantic -std=c99 \

View File

@ -5,30 +5,23 @@ $(PKG)_WEBSITE := https://github.com/andrewrk/rucksack
$(PKG)_IGNORE := $(PKG)_IGNORE :=
$(PKG)_VERSION := 3.1.0 $(PKG)_VERSION := 3.1.0
$(PKG)_CHECKSUM := dcdaab57b06fdeb9be63ed0f2c2de78d0b1e79f7a896bb1e76561216a4458e3b $(PKG)_CHECKSUM := dcdaab57b06fdeb9be63ed0f2c2de78d0b1e79f7a896bb1e76561216a4458e3b
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_GH_CONF := andrewrk/rucksack/tags
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := https://github.com/andrewrk/rucksack/archive/$($(PKG)_VERSION).tar.gz
$(PKG)_DEPS := cc freeimage liblaxjson $(PKG)_DEPS := cc freeimage liblaxjson
define $(PKG)_UPDATE
$(WGET) -q -O- 'https://github.com/andrewrk/rucksack/releases' | \
$(SED) -n 's,.*/archive/\([0-9][^>]*\)\.tar.*,\1,p' | \
head -1
endef
define $(PKG)_BUILD define $(PKG)_BUILD
mkdir '$(1)/build' cd '$(BUILD_DIR)' && $(TARGET)-cmake '$(SOURCE_DIR)'
cd '$(1)/build' && '$(TARGET)-cmake' ..
$(MAKE) -C '$(1)/build' -j '$(JOBS)' \ $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' \
rucksack_static \ rucksack_$(if $(BUILD_STATIC),static,shared) \
rucksackspritesheet_static \ rucksackspritesheet_$(if $(BUILD_STATIC),static,shared) \
VERBOSE=1 VERBOSE=1
$(INSTALL) -d '$(PREFIX)/$(TARGET)/include/rucksack' $(INSTALL) -d '$(PREFIX)/$(TARGET)/include/rucksack'
$(INSTALL) -m644 '$(1)/src/rucksack.h' '$(PREFIX)/$(TARGET)/include/rucksack' $(INSTALL) -m644 '$(SOURCE_DIR)/src/rucksack.h' '$(PREFIX)/$(TARGET)/include/rucksack'
$(INSTALL) -m644 '$(1)/src/spritesheet.h' '$(PREFIX)/$(TARGET)/include/rucksack' $(INSTALL) -m644 '$(SOURCE_DIR)/src/spritesheet.h' '$(PREFIX)/$(TARGET)/include/rucksack'
$(INSTALL) -m644 '$(1)/build/lib'*.a '$(PREFIX)/$(TARGET)/lib/' $(INSTALL) -m644 -v '$(BUILD_DIR)/lib'*.a '$(PREFIX)/$(TARGET)/lib/'
$(if $(BUILD_SHARED),\
$(INSTALL) -m755 -v '$(BUILD_DIR)/lib'*.dll '$(PREFIX)/$(TARGET)/bin/')
'$(TARGET)-gcc' \ '$(TARGET)-gcc' \
-W -Wall -Werror -ansi -pedantic -std=c99 \ -W -Wall -Werror -ansi -pedantic -std=c99 \