summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Steinbrink <B.Steinbrink@gmx.de>2007-01-05 12:11:30 +0000
committerBjörn Steinbrink <B.Steinbrink@gmx.de>2007-01-05 12:11:30 +0000
commit54777370421fb75c745845629e4084c4b1d2ca09 (patch)
tree96b666ca05304ad81416b4abe90375551101955b
parent45eb2a461c8c068810f0981a8dad5fcb9740f0d9 (diff)
downloadmana-54777370421fb75c745845629e4084c4b1d2ca09.tar.gz
mana-54777370421fb75c745845629e4084c4b1d2ca09.tar.bz2
mana-54777370421fb75c745845629e4084c4b1d2ca09.tar.xz
mana-54777370421fb75c745845629e4084c4b1d2ca09.zip
Synchronized build files.
-rw-r--r--ChangeLog7
-rw-r--r--src/CMakeLists.txt13
2 files changed, 19 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d0140359..c7c0b0f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2006-12-12 Eugenio Favalli <elvenprogrammer@gmail.com>
+2007-01-05 Björn Steinbrink <B.Steinbrink@gmx.de>
+
+ * src/CMakeLists.txt, data/graphics/images/ambient/Makefile.am,
+ data/graphics/sprites/CMakeLists.txt: Synchronized build files.
+
+2006-12-12 Eugenio Favalli <elvenprogrammer@gmail.com>
* tools/Purger.java: Removed purger tool.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 18804e73..4f56843e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -36,6 +36,19 @@ INCLUDE_DIRECTORIES(
${GUICHAN_INCLUDE_DIR}
)
+# Fix some stuff that gets not hidden by mainline modules
+MARK_AS_ADVANCED(PHYSFS_INCLUDE_DIR)
+MARK_AS_ADVANCED(PHYSFS_LIBRARY)
+MARK_AS_ADVANCED(SDLIMAGE_INCLUDE_DIR)
+MARK_AS_ADVANCED(SDLIMAGE_LIBRARY)
+MARK_AS_ADVANCED(SDLMAIN_LIBRARY)
+MARK_AS_ADVANCED(SDLMIXER_INCLUDE_DIR)
+MARK_AS_ADVANCED(SDLMIXER_LIBRARY)
+MARK_AS_ADVANCED(SDLNET_INCLUDE_DIR)
+MARK_AS_ADVANCED(SDLNET_LIBRARY)
+MARK_AS_ADVANCED(SDL_INCLUDE_DIR)
+MARK_AS_ADVANCED(SDL_LIBRARY)
+
SET(SRCS
gui/browserbox.cpp
gui/browserbox.h