From 5b8f4f3207c4e68c21e6e10579be7ef28f46b963 Mon Sep 17 00:00:00 2001 From: Georgy Chirkov Date: Sat, 12 Sep 2015 17:19:19 +0300 Subject: [PATCH 1/3] Update README.md --- README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/README.md b/README.md index a4c17bf..2a11669 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,16 @@ Features: * kerning support * selection of characters set from the char map +how to compile on Mac?: + +* `brew update && brew upgrade` +* `brew install qt freetype` install dependencies +* `brew install git` *optionally* install git (if it was not installed) +* `git clone git@github.com:yura415/fontbuilder.git` +* `cd fontbuilder` +* `qmake && make` +* it will create new .app file in bin/ folder + what next?: * export of font description into the formats of popular game frameworks (CEGUI,HGE,PopCapFramework) From 61ee2513975b2317c55d9a3331b7e026a5479396 Mon Sep 17 00:00:00 2001 From: Georgy Chirkov Date: Sat, 12 Sep 2015 17:19:59 +0300 Subject: [PATCH 2/3] Update FontBuilder.pro --- FontBuilder.pro | 54 ++++++++++++++++--------------------------------- 1 file changed, 17 insertions(+), 37 deletions(-) diff --git a/FontBuilder.pro b/FontBuilder.pro index 73b0aeb..17a765e 100644 --- a/FontBuilder.pro +++ b/FontBuilder.pro @@ -65,10 +65,7 @@ SOURCES += src/main.cpp \ src/exporters/nglexporter.cpp \ src/exporters/luaexporter.cpp \ src/fontdrawwidget.cpp \ - src/fontloader.cpp \ - src/exporters/sparrowexporter.cpp \ - src/exporters/simpleexporter.cpp \ - src/layouters/boxlayouteroptimized.cpp + src/fontloader.cpp HEADERS += src/fontbuilder.h \ src/colorbutton.h \ src/fontselectframe.h \ @@ -103,10 +100,7 @@ HEADERS += src/fontbuilder.h \ src/exporters/nglexporter.h \ src/exporters/luaexporter.h \ src/fontdrawwidget.h \ - src/fontloader.h \ - src/exporters/sparrowexporter.h \ - src/exporters/simpleexporter.h \ - src/layouters/boxlayouteroptimized.h + src/fontloader.h FORMS += src/fontbuilder.ui \ src/fontselectframe.ui \ src/fontoptionsframe.ui \ @@ -117,13 +111,8 @@ FORMS += src/fontbuilder.ui \ src/charmapdialog.ui TRANSLATIONS = fontbuilder_en.ts \ fontbuilder_ru.ts - QT += xml -greaterThan(QT_MAJOR_VERSION, 4) { - QT += widgets -} - DESTDIR = bin OBJECTS_DIR = .obj MOC_DIR = .obj @@ -131,30 +120,21 @@ UI_DIR = .obj TARGET = FontBuilder INCLUDEPATH+=src/ -FREETYPE2CONFIG = $$(FREETYPE2CONFIG) -isEmpty(FREETYPE2CONFIG) { - mac { - INCLUDEPATH += ../include - INCLUDEPATH += ../include/freetype2 - LIBS += -L../lib -lfreetype -lz - # macports support - INCLUDEPATH += /opt/local/include /opt/local/include/freetype2 - LIBS += -L/opt/local/lib - } - win32 { - INCLUDEPATH += ../include - INCLUDEPATH += ../include/freetype2 - LIBS += -L../lib \ - -lfreetype - } - linux*|freebsd* { - CONFIG += link_pkgconfig - PKGCONFIG += freetype2 - } -} else { - message("configured freetype2 config: $$FREETYPE2CONFIG" ) - INCLUDEPATH+=$$system("$$FREETYPE2CONFIG --prefix")/include/freetype2 - LIBS += $$system("$$FREETYPE2CONFIG --libs") +mac { + INCLUDEPATH += /usr/local/include/ + INCLUDEPATH += /usr/local/include/freetype2 + INCLUDEPATH += /usr/local/include/freetype2/config + LIBS += -L../lib -lfreetype -lz +} +win32 { + INCLUDEPATH += ../include + INCLUDEPATH += ../include/freetype2 + LIBS += -L../lib \ + -lfreetype +} +linux*|freebsd* { + CONFIG += link_pkgconfig + PKGCONFIG += freetype2 } OTHER_FILES += fontbuilder_ru.ts \ fontbuilder_en.ts From 7aac5cc98f1a0fa6c5960d82a360b3e0e7913c43 Mon Sep 17 00:00:00 2001 From: Georgy Date: Sat, 12 Sep 2015 17:33:19 +0300 Subject: [PATCH 3/3] Update FontBuilder.pro (reverted from commit 61ee2513975b2317c55d9a3331b7e026a5479396) --- FontBuilder.pro | 54 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 37 insertions(+), 17 deletions(-) diff --git a/FontBuilder.pro b/FontBuilder.pro index 17a765e..73b0aeb 100644 --- a/FontBuilder.pro +++ b/FontBuilder.pro @@ -65,7 +65,10 @@ SOURCES += src/main.cpp \ src/exporters/nglexporter.cpp \ src/exporters/luaexporter.cpp \ src/fontdrawwidget.cpp \ - src/fontloader.cpp + src/fontloader.cpp \ + src/exporters/sparrowexporter.cpp \ + src/exporters/simpleexporter.cpp \ + src/layouters/boxlayouteroptimized.cpp HEADERS += src/fontbuilder.h \ src/colorbutton.h \ src/fontselectframe.h \ @@ -100,7 +103,10 @@ HEADERS += src/fontbuilder.h \ src/exporters/nglexporter.h \ src/exporters/luaexporter.h \ src/fontdrawwidget.h \ - src/fontloader.h + src/fontloader.h \ + src/exporters/sparrowexporter.h \ + src/exporters/simpleexporter.h \ + src/layouters/boxlayouteroptimized.h FORMS += src/fontbuilder.ui \ src/fontselectframe.ui \ src/fontoptionsframe.ui \ @@ -111,8 +117,13 @@ FORMS += src/fontbuilder.ui \ src/charmapdialog.ui TRANSLATIONS = fontbuilder_en.ts \ fontbuilder_ru.ts + QT += xml +greaterThan(QT_MAJOR_VERSION, 4) { + QT += widgets +} + DESTDIR = bin OBJECTS_DIR = .obj MOC_DIR = .obj @@ -120,21 +131,30 @@ UI_DIR = .obj TARGET = FontBuilder INCLUDEPATH+=src/ -mac { - INCLUDEPATH += /usr/local/include/ - INCLUDEPATH += /usr/local/include/freetype2 - INCLUDEPATH += /usr/local/include/freetype2/config - LIBS += -L../lib -lfreetype -lz -} -win32 { - INCLUDEPATH += ../include - INCLUDEPATH += ../include/freetype2 - LIBS += -L../lib \ - -lfreetype -} -linux*|freebsd* { - CONFIG += link_pkgconfig - PKGCONFIG += freetype2 +FREETYPE2CONFIG = $$(FREETYPE2CONFIG) +isEmpty(FREETYPE2CONFIG) { + mac { + INCLUDEPATH += ../include + INCLUDEPATH += ../include/freetype2 + LIBS += -L../lib -lfreetype -lz + # macports support + INCLUDEPATH += /opt/local/include /opt/local/include/freetype2 + LIBS += -L/opt/local/lib + } + win32 { + INCLUDEPATH += ../include + INCLUDEPATH += ../include/freetype2 + LIBS += -L../lib \ + -lfreetype + } + linux*|freebsd* { + CONFIG += link_pkgconfig + PKGCONFIG += freetype2 + } +} else { + message("configured freetype2 config: $$FREETYPE2CONFIG" ) + INCLUDEPATH+=$$system("$$FREETYPE2CONFIG --prefix")/include/freetype2 + LIBS += $$system("$$FREETYPE2CONFIG --libs") } OTHER_FILES += fontbuilder_ru.ts \ fontbuilder_en.ts