Commit a68fda4a authored by Adrian Robert's avatar Adrian Robert

adding forgotten file src/nsfont.m for emacs.app merge

parent edfda783
2008-07-15 Adrian Robert <Adrian.B.Robert@gmail.com>
* Makefile.in: Correct additions for nsfont.o in last commit.
* nsfont.m: New file (forgot last commit).
2008-07-15 Adrian Robert <Adrian.B.Robert@gmail.com> 2008-07-15 Adrian Robert <Adrian.B.Robert@gmail.com>
Changes and additions for NeXTstep windowing system (Cocoa and Changes and additions for NeXTstep windowing system (Cocoa and
......
...@@ -535,7 +535,6 @@ emacsappsrc = ${srcdir}/../mac/Emacs.app/ ...@@ -535,7 +535,6 @@ emacsappsrc = ${srcdir}/../mac/Emacs.app/
NS_OBJ= nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o \ NS_OBJ= nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o \
fontset.o fringe.o image.o fontset.o fringe.o image.o
emacsapp = $(PWD)/../nextstep/build/Emacs.app/ emacsapp = $(PWD)/../nextstep/build/Emacs.app/
FONT_DRIVERS = nsfont.o
#ifdef GNUSTEP #ifdef GNUSTEP
emacsappsrc = ${srcdir}/../nextstep/GNUstep/Emacs.base emacsappsrc = ${srcdir}/../nextstep/GNUstep/Emacs.base
emacsbindir = $(emacsapp) emacsbindir = $(emacsapp)
...@@ -580,7 +579,7 @@ obj= dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \ ...@@ -580,7 +579,7 @@ obj= dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \
SOME_MACHINE_OBJECTS = dosfns.o msdos.o \ SOME_MACHINE_OBJECTS = dosfns.o msdos.o \
xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \ xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \
mac.o macterm.o macfns.o macmenu.o macselect.o fontset.o \ mac.o macterm.o macfns.o macmenu.o macselect.o fontset.o \
nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o \ nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o \
w32.o w32console.o w32fns.o w32heap.o w32inevt.o \ w32.o w32console.o w32fns.o w32heap.o w32inevt.o \
w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o $(FONT_DRIVERS) w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o $(FONT_DRIVERS)
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment