diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2008-09-10 23:56:49 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2008-09-10 23:56:49 +0000 |
| commit | b6bde2e4569aa617c8a6af64947c688c624ed7f8 (patch) | |
| tree | 010d15843eb7d4faf7cd1b0cd44d5b9c00462a83 /src/Makefile | |
| parent | dfb50e85292687561927610e689eb5ab30d0ba26 (diff) | |
Merging the UTF8 patch, consisting of O'ksi'd s original 1.1.6 patch and additions by Ian. PLEASE BE AWARE that the patch in its current incarnation is a regression in many aspects and further work is required before we can announce Unicode support.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6212 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/Makefile b/src/Makefile index 96aacb913..f4ff7f9d4 100644 --- a/src/Makefile +++ b/src/Makefile @@ -153,7 +153,8 @@ CPPFILES = \ fl_show_colormap.cxx \ fl_symbols.cxx \ fl_vertex.cxx \ - screen_xywh.cxx + screen_xywh.cxx \ + fl_utf8.cxx FLCPPFILES = \ forms_compatability.cxx \ @@ -186,13 +187,22 @@ IMGCPPFILES = \ Fl_PNG_Image.cxx \ Fl_PNM_Image.cxx -CFILES = fl_call_main.c flstring.c scandir.c numericsort.c vsnprintf.c +CFILES = fl_call_main.c flstring.c scandir.c numericsort.c vsnprintf.c fl_utf.c + +UTF8CFILES = \ + xutf8/case.c \ + xutf8/is_right2left.c \ + xutf8/is_spacing.c \ + xutf8/keysym2Ucs.c \ + xutf8/utf8Input.c \ + xutf8/utf8Utils.c \ + xutf8/utf8Wrap.c ################################################################ include ../makeinclude -OBJECTS = $(CPPFILES:.cxx=.o) $(CFILES:.c=.o) +OBJECTS = $(CPPFILES:.cxx=.o) $(CFILES:.c=.o) $(UTF8CFILES:.c=.o) GLOBJECTS = $(GLCPPFILES:.cxx=.o) FLOBJECTS = $(FLCPPFILES:.cxx=.o) IMGOBJECTS = $(IMGCPPFILES:.cxx=.o) @@ -417,9 +427,9 @@ clean: libfltk_gl.dylib libfltk_images.dylib \ cmap core -depend: $(CPPFILES) $(FLCPPFILES) $(GLCPPFILES) $(IMGCPPFILES) $(CFILES) +depend: $(CPPFILES) $(FLCPPFILES) $(GLCPPFILES) $(IMGCPPFILES) $(CFILES) $(UTF8CFILES) makedepend -Y -I.. -f makedepend $(CPPFILES) $(FLCPPFILES) \ - $(GLCPPFILES) $(IMGCPPFILES) $(CFILES) + $(GLCPPFILES) $(IMGCPPFILES) $(CFILES) $(UTF8CFILES) # Automatically generated dependencies... include makedepend |