diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-01-20 21:54:48 +0100 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-01-20 22:03:17 +0100 |
| commit | bb28230d1b9452efc941d8a6a169a6e21a6c58af (patch) | |
| tree | 4a526692d2cae54cb86b7adfc46e2952e7ccdc8c /rules/scummvm.make | |
| parent | fbbcc050b4b16db28fe040b58396a598623e1a00 (diff) | |
| download | ptxdist-bb28230d1b9452efc941d8a6a169a6e21a6c58af.tar.gz ptxdist-bb28230d1b9452efc941d8a6a169a6e21a6c58af.tar.xz | |
[scummvm] version bump to 1.0.0
...old version refuses to compile with gcc-4.4
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'rules/scummvm.make')
| -rw-r--r-- | rules/scummvm.make | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/rules/scummvm.make b/rules/scummvm.make index f9178b93a..a8883b59c 100644 --- a/rules/scummvm.make +++ b/rules/scummvm.make @@ -1,6 +1,6 @@ # -*-makefile-*- # -# Copyright (C) 2008 by Marc Kleine-Budde <mkl@pengutronix.de> +# Copyright (C) 2008, 2010 by Marc Kleine-Budde <mkl@pengutronix.de> # # See CREDITS for details about who has contributed to this project. # @@ -16,7 +16,7 @@ PACKAGES-$(PTXCONF_SCUMMVM) += scummvm # # Paths and names # -SCUMMVM_VERSION := 0.11.1 +SCUMMVM_VERSION := 1.0.0 SCUMMVM := scummvm-$(SCUMMVM_VERSION) SCUMMVM_SUFFIX := tar.bz2 SCUMMVM_URL := $(PTXCONF_SETUP_SFMIRROR)/scummvm/$(SCUMMVM).$(SCUMMVM_SUFFIX) @@ -35,24 +35,12 @@ $(SCUMMVM_SOURCE): # Prepare # ---------------------------------------------------------------------------- -SCUMMVM_PATH := PATH=$(CROSS_PATH) -SCUMMVM_ENV := $(CROSS_ENV) - -SCUMMVM_MAKEVARS := AS=$(CROSS_AS) - -# -# autoconf -# -SCUMMVM_AUTOCONF := \ +SCUMMVM_CONF_TOOL := autoconf +SCUMMVM_CONF_OPT := \ --host=$(PTXCONF_GNU_TARGET) \ --prefix=/usr -$(STATEDIR)/scummvm.prepare: - @$(call targetinfo) - cd $(SCUMMVM_DIR) && \ - $(SCUMMVM_PATH) $(SCUMMVM_ENV) \ - ./configure $(SCUMMVM_AUTOCONF) - @$(call touch) +SCUMMVM_MAKE_OPT := $(CROSS_ENV_AS) $(CROSS_ENV_RANLIB) AR="$(CROSS_AR) cru" # ---------------------------------------------------------------------------- # Target-Install @@ -72,9 +60,9 @@ $(STATEDIR)/scummvm.targetinstall: @$(call install_copy, scummvm, 0, 0, 0755, -, /usr/bin/scummvm) - @$(call install_copy, scummvm, 0, 0, 0644, -, /usr/share/scummvm/classic080.ini) - @$(call install_copy, scummvm, 0, 0, 0644, -, /usr/share/scummvm/modern.ini) - @$(call install_copy, scummvm, 0, 0, 0644, -, /usr/share/scummvm/modern.zip) + @cd $(SCUMMVM_PKGDIR) && pwd && find usr/share/scummvm -type f | while read file; do \ + $(call install_copy, scummvm, 0, 0, 0644, -, /$$file); \ + done @$(call install_finish, scummvm) |