Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: m-labs/misp
base: cc56326
...
head fork: m-labs/misp
compare: b26d67c
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 4 files changed
  • 0 commit comments
  • 1 contributor
Showing with 50 additions and 6 deletions.
  1. +1 −1  Makefile
  2. +3 −2 README
  3. +46 −0 libfreetype/Makefile
  4. +0 −3  liblua/Makefile
View
2  Makefile
@@ -2,7 +2,7 @@ MISPDIR=.
include $(MISPDIR)/common.mak
OBJECTS=crt0.o isr.o luainit.o main.o
-OURLIBS=m mm yaffs2 glue lua lfs
+OURLIBS=m mm yaffs2 glue lua lfs freetype
CFLAGS+=-I$(MISPDIR)/libm/include -I$(MISPDIR)/libmm/include -I$(MISPDIR)/libglue/include -I$(LUADIR)/src -I$(MISPDIR)/liblfs/include
View
5 README
@@ -10,8 +10,9 @@
2. Download source code of external libs and set environment variables
to the root of each source distribution, as follows:
M2DIR milkymist-ng http://milkymist.org
- LUADIR Lua (5.2.0) http://www.lua.org/
- YAFFSDIR YAFFS http://www.yaffs.net/
+ LUADIR Lua (5.2.0) http://lua.org
+ YAFFSDIR YAFFS http://yaffs.net
+ FTDIR Freetype (2.4.9) http://freetype.org
The CRTDIR environment variable is still needed (and is the only one
which should not point to the root of the source distribution, but to
where the .a binary is located)
View
46 libfreetype/Makefile
@@ -0,0 +1,46 @@
+MISPDIR=..
+include $(MISPDIR)/common.mak
+
+CFLAGS+=-I$(FTDIR)/include -include $(FTDIR)/include/freetype/internal/internal.h
+
+FTSRC=$(FTDIR)/src
+
+OBJECTS=ftadvanc.o ftcalc.o ftdbgmem.o ftgloadr.o ftobjs.o ftoutln.o ftrfork.o ftsnames.o ftstream.o fttrigon.o ftutil.o
+OBJECTS+=ftbbox.o ftfstype.o ftgasp.o ftglyph.o ftgxval.o ftlcdfil.o ftmm.o ftotval.o ftstroke.o ftbitmap.o ftsynth.o
+OBJECTS+=ftsystem.o ftdebug.o ftinit.o
+%.o: $(FTSRC)/base/%.c
+ $(compile-dep)
+
+OBJECTS+=ttdriver.o ttgload.o ttgxvar.o ttinterp.o ttobjs.o ttpic.o ttpload.o
+%.o: $(FTSRC)/truetype/%.c
+ $(compile-dep)
+
+OBJECTS+=afangles.o afcjk.o afdummy.o afglobal.o afhints.o afindic.o aflatin.o afloader.o afmodule.o afpic.o afwarp.o
+%.o: $(FTSRC)/autofit/%.c
+ $(compile-dep)
+
+OBJECTS+=ftraster.o ftrend1.o rastpic.o
+%.o: $(FTSRC)/raster/%.c
+ $(compile-dep)
+
+OBJECTS+=ftgrays.o ftsmooth.o ftspic.o
+%.o: $(FTSRC)/smooth/%.c
+ $(compile-dep)
+
+OBJECTS+=ftcbasic.o ftccache.o ftccmap.o ftcglyph.o ftcimage.o ftcmanag.o ftcmru.o ftcsbits.o
+%.o: $(FTSRC)/cache/%.c
+ $(compile-dep)
+
+all: libfreetype.a
+
+# pull in dependency info for *existing* .o files
+-include $(OBJECTS:.o=.d)
+
+libfreetype.a: $(OBJECTS)
+ $(AR) clr libfreetype.a $(OBJECTS)
+ $(RANLIB) libfreetype.a
+
+.PHONY: clean
+
+clean:
+ rm -f $(OBJECTS) $(OBJECTS:.o=.d) libfreetype.a .*~ *~
View
3  liblua/Makefile
@@ -5,9 +5,6 @@ CFLAGS+=-I. -DLUA_IEEEENDIAN=1 -Dstrcoll=strcmp
OBJECTS=lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o lundump.o lvm.o lzio.o lbaselib.o lbitlib.o lcorolib.o ldblib.o lmathlib.o lstrlib.o ltablib.o loadlib.o lauxlib.o
-# later:
-#OBJECTS+=liolib.o
-
all: liblua.a
# pull in dependency info for *existing* .o files

No commit comments for this range

Something went wrong with that request. Please try again.