summaryrefslogtreecommitdiff
path: root/src/CMakeLists.txt
diff options
context:
space:
mode:
authorReid <reidyaro@gmail.com>2012-01-25 22:05:36 +0100
committerReid <reidyaro@gmail.com>2012-01-25 22:05:36 +0100
commit8b612abb42853a22c1a9545e2c9280d154646543 (patch)
treef466167087c2b2de4b8aa9e6d1d1986f72f84147 /src/CMakeLists.txt
parenta913dd41df61760de6ece552f941e002251ff54c (diff)
parentd340b5a27a8f3b05d1764da9c114f5f59bd0cd46 (diff)
downloadplus-8b612abb42853a22c1a9545e2c9280d154646543.tar.gz
plus-8b612abb42853a22c1a9545e2c9280d154646543.tar.bz2
plus-8b612abb42853a22c1a9545e2c9280d154646543.tar.xz
plus-8b612abb42853a22c1a9545e2c9280d154646543.zip
Merge branch 'master' of gitorious.org:manaplus/manaplus
Diffstat (limited to 'src/CMakeLists.txt')
-rw-r--r--src/CMakeLists.txt14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d281151e2..d2c003559 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -443,6 +443,8 @@ SET(SRCS
resources/wallpaper.h
utils/base64.cpp
utils/base64.h
+ utils/checkutils.cpp
+ utils/checkutils.h
utils/copynpaste.cpp
utils/copynpaste.h
utils/dtor.h
@@ -450,8 +452,10 @@ SET(SRCS
utils/mathutils.h
utils/paths.cpp
utils/paths.h
- utils/sha256.cpp
- utils/sha256.h
+ utils/physfsrwops.cpp
+ utils/physfsrwops.h
+ utils/process.cpp
+ utils/process.h
utils/stringutils.cpp
utils/stringutils.h
utils/mutex.h
@@ -459,6 +463,10 @@ SET(SRCS
utils/mkdir.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
@@ -794,6 +802,8 @@ SET(SRCS_MANASERV
enet/utility.h
enet/win32.c
enet/win32.h
+ utils/sha256.cpp
+ utils/sha256.h
net/manaserv/attributes.cpp
net/manaserv/attributes.h
net/manaserv/adminhandler.cpp