diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-02-16 22:17:22 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-02-16 22:17:22 +0300 |
| commit | 6e6c5b2ba399e0ed364ada843c4c759ee54de219 (patch) | |
| tree | 562e6a840c856ba8c4d35c6806020289c65d54d2 /src/CMakeLists.txt | |
| parent | 82ac4641828ec7387863bb18cf4493190c4cc68f (diff) | |
| download | manaverse-6e6c5b2ba399e0ed364ada843c4c759ee54de219.tar.gz manaverse-6e6c5b2ba399e0ed364ada843c4c759ee54de219.tar.bz2 manaverse-6e6c5b2ba399e0ed364ada843c4c759ee54de219.tar.xz manaverse-6e6c5b2ba399e0ed364ada843c4c759ee54de219.zip | |
combine font classes in one.
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 41f99a646..ed80c00cb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -364,8 +364,8 @@ SET(SRCS gui/widgets/tabs/setup_visual.cpp gui/widgets/tabs/setup_visual.h gui/setupactiondata.h - gui/sdlfont.cpp - gui/sdlfont.h + gui/font.cpp + gui/font.h gui/windows/shopwindow.cpp gui/windows/shopwindow.h gui/windows/shortcutwindow.cpp @@ -774,7 +774,6 @@ SET(SRCS events/event.h gui/base/focushandler.hpp listeners/focuslistener.h - gui/base/font.hpp gui/base/gui.hpp gui/base/input.hpp events/inputguievent.h @@ -807,7 +806,6 @@ SET(SRCS gui/base/cliprectangle.cpp gui/base/color.cpp gui/base/focushandler.cpp - gui/base/font.cpp gui/base/gui.cpp gui/base/key.cpp gui/base/keyinput.cpp |