diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-01-22 02:20:43 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-01-22 02:20:43 +0300 |
| commit | e71376322cbe85d59ca7d1a9d7f2a3db9ae9b914 (patch) | |
| tree | 4e9f65c3ef67e6e06e1e1dca140e2d7ef6a22ff7 /src/Makefile.am | |
| parent | b6eb53b9abdf48b88cb1978b9af97f2a879d2717 (diff) | |
| parent | acc25a7dffefb8b8b4e8022af918794d26048453 (diff) | |
| download | plus-e71376322cbe85d59ca7d1a9d7f2a3db9ae9b914.tar.gz plus-e71376322cbe85d59ca7d1a9d7f2a3db9ae9b914.tar.bz2 plus-e71376322cbe85d59ca7d1a9d7f2a3db9ae9b914.tar.xz plus-e71376322cbe85d59ca7d1a9d7f2a3db9ae9b914.zip | |
Merge commit 'v1.2.1.22' into stripped
Conflicts:
data/fonts/mplus-1p-bold.ttf
data/fonts/mplus-1p-regular.ttf
src/CMakeLists.txt
src/Makefile.am
src/guichan/gui.cpp
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 6ab63bc70..1893adb80 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -362,8 +362,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ utils/mkdir.h \ utils/paths.cpp \ utils/paths.h \ - utils/sha256.cpp \ - utils/sha256.h \ + utils/process.cpp \ + utils/process.h \ utils/specialfolder.cpp \ utils/specialfolder.h \ utils/stringutils.cpp \ @@ -371,6 +371,10 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ utils/mutex.h \ utils/xml.cpp \ utils/xml.h \ + test/testlauncher.cpp \ + test/testlauncher.h \ + test/testmain.cpp \ + test/testmain.h \ actor.cpp \ actor.h \ actorsprite.cpp \ @@ -507,7 +511,9 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ if ENABLE_MANASERV manaplus_CXXFLAGS += -DMANASERV_SUPPORT -manaplus_SOURCES += net/manaserv/attributes.cpp \ +manaplus_SOURCES += utils/sha256.cpp \ + utils/sha256.h \ + net/manaserv/attributes.cpp \ net/manaserv/attributes.h \ net/manaserv/adminhandler.cpp \ net/manaserv/adminhandler.h \ |