blob: af509fd4e3272e996d5c79e3adc28b42f5bba9a9 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
--- ./builds/freetype.mk.orig 2018-04-22 04:41:36.000000000 -0500
+++ ./builds/freetype.mk 2018-09-13 14:34:39.641002962 -0500
@@ -248,20 +248,24 @@
$(FT_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
-# ftver component
+# COMMENTED OUT:
+# Otherwise having windres on the system causes a Windows-specific resource
+# file to be compiled, breaking the build.
#
-# The VERSIONINFO resource `ftver.rc' contains version and copyright
-# to be compiled by windres and tagged into DLL usually.
+## ftver component
+##
+## The VERSIONINFO resource `ftver.rc' contains version and copyright
+## to be compiled by windres and tagged into DLL usually.
+##
+#ifneq ($(RC),)
+# FTVER_SRC := $(BASE_DIR)/ftver.rc
+# FTVER_OBJ := $(OBJ_DIR)/ftver.$O
#
-ifneq ($(RC),)
- FTVER_SRC := $(BASE_DIR)/ftver.rc
- FTVER_OBJ := $(OBJ_DIR)/ftver.$O
-
- OBJECTS_LIST += $(FTVER_OBJ)
-
- $(FTVER_OBJ): $(FTVER_SRC)
- $(RC) -o $@ $<
-endif
+# OBJECTS_LIST += $(FTVER_OBJ)
+#
+# $(FTVER_OBJ): $(FTVER_SRC)
+# $(RC) -o $@ $<
+#endif
# All FreeType library objects.
|
