mirrors
/
fltk
mirror of https://github.com/fltk/fltk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Matthias Melcher 2006-08-30 10:01:35 +00:00
parent 3303d9d7f5
commit 46a890cad3
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fluid/Makefile
View File

@ -99,12 +99,14 @@ install-linux:
$(CP) x-fluid.desktop $(DESTDIR)/usr/share/mimelnk/application $(CP) x-fluid.desktop $(DESTDIR)/usr/share/mimelnk/application
install-osx: install-osx:
echo Installing Fluid in $(DESTDIR)/Applications...
-$(MKDIR) $(DESTDIR)/Applications/fluid.app -$(MKDIR) $(DESTDIR)/Applications/fluid.app
-$(MKDIR) $(DESTDIR)/Applications/fluid.app/Contents -$(MKDIR) $(DESTDIR)/Applications/fluid.app/Contents
$(CP) fluid.app/Contents/Info.plist $(DESTDIR)/Applications/fluid.app/Contents/Info.plist $(CP) fluid.app/Contents/Info.plist $(DESTDIR)/Applications/fluid.app/Contents/Info.plist
$(CP) fluid.app/Contents/PkgInfo $(DESTDIR)/Applications/fluid.app/Contents/PkgInfo $(CP) fluid.app/Contents/PkgInfo $(DESTDIR)/Applications/fluid.app/Contents/PkgInfo
-$(MKDIR) $(DESTDIR)/Applications/fluid.app/Contents/MacOS -$(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 -$(MKDIR) $(DESTDIR)/Applications/fluid.app/Contents/Resources
$(CP) fluid.app/Contents/Resources/fluid.icns $(DESTDIR)/Applications/fluid.app/Contents/Resources $(CP) fluid.app/Contents/Resources/fluid.icns $(DESTDIR)/Applications/fluid.app/Contents/Resources

2
src/fl_font_mac.cxx
View File

@ -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. // The font "Apple Chancery" is a pretty extreme example of overlapping letters.
float fa = -FixedToFloat(bAscent), fd = -FixedToFloat(bDescent); float fa = -FixedToFloat(bAscent), fd = -FixedToFloat(bDescent);
if (fa>0.0f && fd>0.0f) { if (fa>0.0f && fd>0.0f) {
float f = Size/(fa+fd); //float f = Size/(fa+fd);
ascent = fa; //int(fa*f+0.5f); ascent = fa; //int(fa*f+0.5f);
descent = fd; //Size - ascent; descent = fd; //Size - ascent;
} }