diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2006-08-30 10:01:35 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2006-08-30 10:01:35 +0000 |
| commit | 46a890cad315b71773378b804b04a4a742f88817 (patch) | |
| tree | 05830f4ac4d46bdea42c5a434796625ebb0b9433 | |
| parent | 3303d9d7f5134659400c4b4dd5bae16435c56857 (diff) | |
Fixed typo in 'desktop-osx' install. Commented out unused variable.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5384 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | fluid/Makefile | 4 | ||||
| -rw-r--r-- | src/fl_font_mac.cxx | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/fluid/Makefile b/fluid/Makefile index bcf5149fc..f6fce38b5 100644 --- a/fluid/Makefile +++ b/fluid/Makefile @@ -99,12 +99,14 @@ install-linux: $(CP) x-fluid.desktop $(DESTDIR)/usr/share/mimelnk/application install-osx: + echo Installing Fluid in $(DESTDIR)/Applications... -$(MKDIR) $(DESTDIR)/Applications/fluid.app -$(MKDIR) $(DESTDIR)/Applications/fluid.app/Contents $(CP) fluid.app/Contents/Info.plist $(DESTDIR)/Applications/fluid.app/Contents/Info.plist $(CP) fluid.app/Contents/PkgInfo $(DESTDIR)/Applications/fluid.app/Contents/PkgInfo -$(MKDIR) $(DESTDIR)/Applications/fluid.app/Contents/MacOS - $(LN) $(bindir)/fluid $(DESTDIR)/Application/fluid.app/Contents/MacOS/fluid + -$(RM) $(DESTDIR)/Applications/fluid.app/Contents/MacOS/fluid + $(LN) $(bindir)/fluid $(DESTDIR)/Applications/fluid.app/Contents/MacOS/fluid -$(MKDIR) $(DESTDIR)/Applications/fluid.app/Contents/Resources $(CP) fluid.app/Contents/Resources/fluid.icns $(DESTDIR)/Applications/fluid.app/Contents/Resources diff --git a/src/fl_font_mac.cxx b/src/fl_font_mac.cxx index 42213825d..fb6e4422b 100644 --- a/src/fl_font_mac.cxx +++ b/src/fl_font_mac.cxx @@ -104,7 +104,7 @@ Fl_FontSize::Fl_FontSize(const char* name, int Size) { // The font "Apple Chancery" is a pretty extreme example of overlapping letters. float fa = -FixedToFloat(bAscent), fd = -FixedToFloat(bDescent); if (fa>0.0f && fd>0.0f) { - float f = Size/(fa+fd); + //float f = Size/(fa+fd); ascent = fa; //int(fa*f+0.5f); descent = fd; //Size - ascent; } |