Tweak hexdumped data to increase build portability.

Follow bin2coff layout for hexdumped data instead of trying to emulate
the objcopy layout (which seems to break for the android tools).

Only use the basename of the resource in hexdump / bin2coff.

Ifdef on HAVE_OBJCOPY instead of _WIN32.

Author: ccxvii

Makefile

@@ -92,6 +92,11 @@ $(OUT)/platform/x11/curl/%.o : platform/x11/%.c
 $(OUT)/platform/gl/%.o : platform/gl/%.c
 	$(CC_CMD) -Wall $(GLUT_CFLAGS)
 
+ifeq ($(HAVE_OBJCOPY),yes)
+  $(OUT)/source/fitz/noto.o : source/fitz/noto.c
+	$(CC_CMD) -Wall -Wdeclaration-after-statement -DHAVE_OBJCOPY $(THIRD_CFLAGS)
+endif
+
 $(OUT)/source/%.o : source/%.c
 	$(CC_CMD) -Wall -Wdeclaration-after-statement $(THIRD_CFLAGS)
 
@@ -144,7 +149,7 @@ generated/%.otf.c : %.otf $(HEXDUMP_EXE) ; $(QUIET_GEN) $(MKTGTDIR) ; $(HEXDUMP_
 generated/%.ttf.c : %.ttf $(HEXDUMP_EXE) ; $(QUIET_GEN) $(MKTGTDIR) ; $(HEXDUMP_EXE) -s $@ $<
 generated/%.ttc.c : %.ttc $(HEXDUMP_EXE) ; $(QUIET_GEN) $(MKTGTDIR) ; $(HEXDUMP_EXE) -s $@ $<
 
-ifeq ($(OS),Linux)
+ifeq ($(HAVE_OBJCOPY),yes)
   MUPDF_OBJ += $(FONT_BIN:%=$(OUT)/%.o)
   $(OUT)/%.cff.o : %.cff ; $(OBJCOPY_CMD)
   $(OUT)/%.otf.o : %.otf ; $(OBJCOPY_CMD)

Makerules

@@ -86,6 +86,8 @@ else ifeq ($(OS),MACOS)
   RANLIB = xcrun ranlib
 
 else ifeq ($(OS),Linux)
+  HAVE_OBJCOPY := yes
+
   ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes)
 	SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2)
 	SYS_FREETYPE_LIBS := $(shell pkg-config --libs freetype2)

platform/win32/bin2coff.rules

@@ -7,7 +7,7 @@
 		<CustomBuildRule
 			Name="bin2coff (ttf)"
 			DisplayName="bin2coff (ttf)"
-			CommandLine="Release\bin2coff.exe $(InputPath) $(IntDir)\$(InputName)_ttf.obj _binary_resources_fonts_$(InputName)_ttf $(PlatformName)"
+			CommandLine="Release\bin2coff.exe $(InputPath) $(IntDir)\$(InputName)_ttf.obj _binary_$(InputName)_ttf $(PlatformName)"
 			Outputs="$(IntDir)\$(InputName)_ttf.obj"
 			FileExtensions="*.ttf"
 			ExecutionDescription="Embedding TTF"
@@ -18,7 +18,7 @@
 		<CustomBuildRule
 			Name="bin2coff (otf)"
 			DisplayName="bin2coff (otf)"
-			CommandLine="Release\bin2coff.exe $(InputPath) $(IntDir)\$(InputName)_otf.obj _binary_resources_fonts_$(InputName)_otf $(PlatformName)"
+			CommandLine="Release\bin2coff.exe $(InputPath) $(IntDir)\$(InputName)_otf.obj _binary_$(InputName)_otf $(PlatformName)"
 			Outputs="$(IntDir)\$(InputName)_otf.obj"
 			FileExtensions="*.otf"
 			ExecutionDescription="Embedding OTF"
@@ -29,7 +29,7 @@
 		<CustomBuildRule
 			Name="bin2coff (cff)"
 			DisplayName="bin2coff (cff)"
-			CommandLine="Release\bin2coff.exe $(InputPath) $(IntDir)\$(InputName)_cff.obj _binary_resources_fonts_$(InputName)_cff $(PlatformName)"
+			CommandLine="Release\bin2coff.exe $(InputPath) $(IntDir)\$(InputName)_cff.obj _binary_$(InputName)_cff $(PlatformName)"
 			Outputs="$(IntDir)\$(InputName)_cff.obj"
 			FileExtensions="*.cff"
 			ExecutionDescription="Embedding CFF"
@@ -40,7 +40,7 @@
 		<CustomBuildRule
 			Name="bin2coff (ttc)"
 			DisplayName="bin2coff (ttc)"
-			CommandLine="Release\bin2coff.exe $(InputPath) $(IntDir)\$(InputName)_ttc.obj _binary_resources_fonts_$(InputName)_ttc $(PlatformName)"
+			CommandLine="Release\bin2coff.exe $(InputPath) $(IntDir)\$(InputName)_ttc.obj _binary_$(InputName)_ttc $(PlatformName)"
 			Outputs="$(IntDir)\$(InputName)_ttc.obj"
 			FileExtensions="*.ttc"
 			ExecutionDescription="Embedding TTC"

scripts/fontdump.nmake

@@ -37,7 +37,7 @@ main(int argc, char **argv)
 {
 	FILE *fo;
 	FILE *fi;
-	char filename[256];
+	char name[256];
 	char *basename;
 	char *p;
 	int i, optind, size;
@@ -81,16 +81,16 @@ main(int argc, char **argv)
 		else
 			basename = argv[i];
 
-		if (strlen(basename) >= sizeof(filename))
+		if (strlen(basename) >= sizeof(name))
 		{
 			fclose(fi);
 			fclose(fo);
 			fprintf(stderr, "hexdump: filename '%s' too long\n", basename);
 			return 1;
 		}
 
-		strcpy(filename, argv[i]);
-		for (p = filename; *p; ++p)
+		strcpy(name, basename);
+		for (p = name; *p; ++p)
 		{
 			if (*p == '/' || *p == '.' || *p == '\\' || *p == '-')
 				*p = '_';
@@ -100,11 +100,11 @@ main(int argc, char **argv)
 		size = ftell(fi);
 		fseek(fi, 0, SEEK_SET);
 
-		fprintf(fo, "const unsigned char _binary_%s_start[%d] =", filename, size);
+		fprintf(fo, "const unsigned char _binary_%s[%d] =", name, size);
 		fprintf(fo, string ? "\n" : " {\n");
 		hexdump(fo, fi);
 		fprintf(fo, string ? ";\n" : "};\n");
-		fprintf(fo, "const unsigned char _binary_%s_end;\n", filename);
+		fprintf(fo, "unsigned int _binary_%s_size = %d;\n", name, size);
 
 		fclose(fi);
 	}

scripts/hexdump.c

@@ -22,7 +22,7 @@ done
 
 for FILE in $FONTS
 do
-	NAME=$(echo _binary_$FILE | tr '/.-' '___')
+	NAME=$(echo _binary_$(basename $FILE) | tr '/.-' '___')
 	OBJ=$(echo generated/$FILE.obj)
 	OBJ64=$(echo generated/$FILE.x64.obj)
 	DIR=$(dirname $OBJ)

scripts/runfontdump.sh

@@ -45,20 +45,22 @@
 #define TOFU_EMOJI
 #endif
 
-#ifdef _WIN32
+#ifdef HAVE_OBJCOPY
 #define RETURN(FORGE,NAME) \
 	do { \
-	extern unsigned char _binary_resources_fonts_##NAME[]; \
-	extern unsigned int _binary_resources_fonts_##NAME##_size; \
-	return *size = _binary_resources_fonts_##NAME##_size, _binary_resources_fonts_##NAME; \
+	extern unsigned char _binary_resources_fonts_##FORGE##_##NAME##_start; \
+	extern unsigned char _binary_resources_fonts_##FORGE##_##NAME##_end; \
+	return *size = \
+		&_binary_resources_fonts_##FORGE##_##NAME##_end - \
+		&_binary_resources_fonts_##FORGE##_##NAME##_start, \
+		&_binary_resources_fonts_##FORGE##_##NAME##_start; \
 	} while (0)
 #else
 #define RETURN(FORGE,NAME) \
 	do { \
-	extern const unsigned char _binary_resources_fonts_##FORGE##_##NAME##_start[]; \
-	extern const unsigned char _binary_resources_fonts_##FORGE##_##NAME##_end; \
-	return *size = &_binary_resources_fonts_##FORGE##_##NAME##_end - _binary_resources_fonts_##FORGE##_##NAME##_start, \
-		_binary_resources_fonts_##FORGE##_##NAME##_start; \
+	extern unsigned char _binary_##NAME[]; \
+	extern unsigned int _binary_##NAME##_size; \
+	return *size = _binary_##NAME##_size, _binary_##NAME; \
 	} while (0)
 #endif