summaryrefslogtreecommitdiff
path: root/Build/source/libs/luafontforge
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/libs/luafontforge')
-rw-r--r--Build/source/libs/luafontforge/Makefile6
-rw-r--r--Build/source/libs/luafontforge/fontforge/Unicode/Makefile6
-rw-r--r--Build/source/libs/luafontforge/fontforge/fontforge/Makefile6
-rw-r--r--Build/source/libs/luafontforge/fontforge/fontforge/namelist.c2
-rw-r--r--Build/source/libs/luafontforge/fontforge/inc/basics.h6
5 files changed, 13 insertions, 13 deletions
diff --git a/Build/source/libs/luafontforge/Makefile b/Build/source/libs/luafontforge/Makefile
index 84564f19ad2..a160ab19650 100644
--- a/Build/source/libs/luafontforge/Makefile
+++ b/Build/source/libs/luafontforge/Makefile
@@ -4,8 +4,8 @@ srcdir=../../../libs/luafontforge
FF_LIB=ffdummies.o luafflib.o
-_CFLAGS=-Wall -DFONTFORGE_CONFIG_NO_WINDOWING_UI=1 -DLUA_FF_LIB=1 $(XCFLAGS)
-CFLAGS = -g -O2
+_CFLAGS=-DFONTFORGE_CONFIG_NO_WINDOWING_UI=1 -DLUA_FF_LIB=1 $(XCFLAGS)
+#CFLAGS = -g -O2
.PHONY: newfile
@@ -17,7 +17,7 @@ fontforge: $(FF_LIB) newfile
ranlib libff.a
%.o: $(srcdir)/src/%.c
- gcc $(_CFLAGS) $(CFLAGS) -I$(srcdir)/../lua51 -I$(srcdir)/fontforge/inc -I$(srcdir)/fontforge/fontforge -c $< -o $@
+ $(CC) $(_CFLAGS) $(CFLAGS) -I$(srcdir)/../lua51 -I$(srcdir)/fontforge/inc -I$(srcdir)/fontforge/fontforge -c $< -o $@
clean:
rm -f libff.a $(FF_LIB)
diff --git a/Build/source/libs/luafontforge/fontforge/Unicode/Makefile b/Build/source/libs/luafontforge/fontforge/Unicode/Makefile
index 8e215835910..7538627cb5d 100644
--- a/Build/source/libs/luafontforge/fontforge/Unicode/Makefile
+++ b/Build/source/libs/luafontforge/fontforge/Unicode/Makefile
@@ -2,12 +2,12 @@
top_srcdir = ../../../../libs/luafontforge/fontforge
srcdir = $(top_srcdir)/Unicode
-CC = gcc
+#CC = gcc
OBJECTS = alphabet.o char.o memory.o cjk.o ustring.o gwwiconv.o
-_CFLAGS = -I$(top_srcdir)/inc -Wall -DLUA_FF_LIB=1 $(XCFLAGS)
-CFLAGS = -g -O2
+_CFLAGS = -I$(top_srcdir)/inc -DLUA_FF_LIB=1 $(XCFLAGS)
+#CFLAGS = -g -O2
all: $(OBJECTS)
diff --git a/Build/source/libs/luafontforge/fontforge/fontforge/Makefile b/Build/source/libs/luafontforge/fontforge/fontforge/Makefile
index d0e7b983446..3113228c30a 100644
--- a/Build/source/libs/luafontforge/fontforge/fontforge/Makefile
+++ b/Build/source/libs/luafontforge/fontforge/fontforge/Makefile
@@ -2,7 +2,7 @@
top_srcdir = ../../../../libs/luafontforge/fontforge
srcdir = $(top_srcdir)/fontforge
-CC = gcc
+#CC = gcc
AR = ar cru
RANLIB = ranlib
@@ -14,7 +14,7 @@ OBJECTS =autohint.o charview.o fontinfo.o \
stemdb.o lookups.o featurefile.o \
tottf.o tottfgpos.o tottfvar.o splinesave.o
-_CFLAGS = -I$(top_srcdir)/inc -I$(srcdir) -I. -Wall $(XCFLAGS) \
+_CFLAGS = -I$(top_srcdir)/inc -I$(srcdir) -I. $(XCFLAGS) \
-DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 \
-DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 \
-DHAVE_INTTYPES_H=1 -DHAVE_UNISTD_H=1 -D_NO_PYTHON=1 -DHAVE_LANGINFO_H=1 \
@@ -22,7 +22,7 @@ _CFLAGS = -I$(top_srcdir)/inc -I$(srcdir) -I. -Wall $(XCFLAGS) \
-DNODYNAMIC=1 -D_NO_FREETYPE=1 -D_NO_LIBUNINAMESLIST=1 \
-DFONTFORGE_CONFIG_NO_WINDOWING_UI=1 -DLUA_FF_LIB=1 -UHAVE_LIBINTL_H
-CFLAGS = -g -O2
+#CFLAGS = -g -O2
all: $(OBJECTS)
diff --git a/Build/source/libs/luafontforge/fontforge/fontforge/namelist.c b/Build/source/libs/luafontforge/fontforge/fontforge/namelist.c
index ebc1fc8e4cf..c290afaa8ab 100644
--- a/Build/source/libs/luafontforge/fontforge/fontforge/namelist.c
+++ b/Build/source/libs/luafontforge/fontforge/fontforge/namelist.c
@@ -43,7 +43,7 @@ static struct psaltnames {
char *name;
int unicode;
int provenance; /* 1=> Adobe PUA, 2=>AMS PUA, 3=>TeX */
-} psaltnames[];
+} psaltnames[5487];
static NameList agl_sans, agl, adobepua, greeksc, tex, ams;
NameList *namelist_for_new_fonts = &agl;
diff --git a/Build/source/libs/luafontforge/fontforge/inc/basics.h b/Build/source/libs/luafontforge/fontforge/inc/basics.h
index 04c2fcf54a2..eb3781df017 100644
--- a/Build/source/libs/luafontforge/fontforge/inc/basics.h
+++ b/Build/source/libs/luafontforge/fontforge/inc/basics.h
@@ -45,11 +45,11 @@
#define forever for (;;)
-typedef int32_t int32;
+/* typedef int32_t int32; */
typedef uint32_t uint32;
-typedef int16_t int16;
+/* typedef int16_t int16; */
typedef uint16_t uint16;
-typedef int8_t int8;
+/* typedef int8_t int8; */
typedef uint8_t uint8;
/* An integral type which can hold a pointer */