0009702: Android Makefile build not copying required tilemaps during build process

Viewing Issue Simple Details [ Jump to Notes ] [ Wiki ]

[ View Advanced ] [ Issue History ] [ Print ]

Category

Severity

Reproducibility

Date Submitted

Last Update

0009702

[DCSS] Patches

minor

always

2015-05-03 22:35

2015-05-05 11:21

Reporter

miserium

View Status

public

Assigned To

neil

Priority

normal

Resolution

done

Status

closed

Product Branch

0.17 ancient branch

Summary

0009702: Android Makefile build not copying required tilemaps during build process

Description

There is a target in the makefile of "dat/tiles/%.png" that is supposed to copy (and if available, pngcrush) the generated, combined png tiles in the rltiles directory into the dat/tiles/ directory. This includes floor.png, main.png, etc.

There is a also a build target of "install-data" that has the dat/tiles png files as a dependency. The problem is, this is only if TILES_ANY is defined, which is defined if TILES is defined. The ANDROID option defines TILES, but the problem is that it happens too late in the Makefile. As a result, while the tilemaps are built in rltiles, they are never copied to dat/tiles, which in turn means they never get copied to the assets directory for the Android build.

The attached patch defines TILES_ANY if ANDROID is defined farther up in the Makefile so that the files are copied over.

Additional Information

Tags

No tags attached.

Attached Files

0001-Modified-the-Makefile-for-Android-builds-so-that-it-.patch [^] (767 bytes) 2015-05-03 22:35 [Show Content] [Hide Content]

From dfb8163029c05d70a2c5f2ac5ac3d1bfd4352314 Mon Sep 17 00:00:00 2001
From: miserium <newtzie@gmail.com>
Date: Sun, 3 May 2015 16:22:05 -0400
Subject: [PATCH] Modified the Makefile for Android builds so that it correctly
 copies the generated tilemaps to the dat/tiles directory during the build.

---
 crawl-ref/source/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/crawl-ref/source/Makefile b/crawl-ref/source/Makefile
index 94f9e8b..5849a9e 100644
--- a/crawl-ref/source/Makefile
+++ b/crawl-ref/source/Makefile
@@ -304,6 +304,10 @@ TILES_ANY = YesPlease
 OBJECTS += $(TILES_OBJECTS) $(WEBTILES_OBJECTS)
 endif

+ifdef ANDROID
+TILES_ANY = YesPlease
+endif
+
 #
 # Check for an Apple-released compiler.
 #
-- 
2.1.4

Relationships

Notes
(0029006) neil (administrator) 2015-05-04 20:56	Applied in trunk (0.17-a0-929-gfed7cf2), thanks!

Issue History
Date Modified	Username	Field	Change
2015-05-03 22:35	miserium	New Issue
2015-05-03 22:35	miserium	File Added: 0001-Modified-the-Makefile-for-Android-builds-so-that-it-.patch
2015-05-04 20:56	neil	Note Added: 0029006
2015-05-04 20:56	neil	Status	new => resolved
2015-05-04 20:56	neil	Fixed in Branch	=> 0.17 development branch
2015-05-04 20:56	neil	Resolution	open => done
2015-05-04 20:56	neil	Assigned To	=> neil
2015-05-05 11:21	miserium	Status	resolved => closed

Mantis 1.1.8[^]