diff options
| author | Philipp Sehmisch <tmw@crushnet.org> | 2006-11-26 10:27:02 +0000 |
|---|---|---|
| committer | Philipp Sehmisch <tmw@crushnet.org> | 2006-11-26 10:27:02 +0000 |
| commit | 5bc5329f8ade88b1fd4d06c8bd226f1bf9db34c1 (patch) | |
| tree | cb5b8f2f25cbb93ce32fc1db2a12f03584bb9f5c | |
| parent | 78f7e290e46e6084bc51023ae3c8619b0695b7b6 (diff) | |
| download | mana-5bc5329f8ade88b1fd4d06c8bd226f1bf9db34c1.tar.gz mana-5bc5329f8ade88b1fd4d06c8bd226f1bf9db34c1.tar.bz2 mana-5bc5329f8ade88b1fd4d06c8bd226f1bf9db34c1.tar.xz mana-5bc5329f8ade88b1fd4d06c8bd226f1bf9db34c1.zip | |
Updated Makefiles and CMake Lists
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | data/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | data/Makefile.am | 3 | ||||
| -rw-r--r-- | data/graphics/images/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | data/graphics/images/Makefile.am | 1 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | src/Makefile.am | 9 |
7 files changed, 25 insertions, 12 deletions
@@ -1,4 +1,4 @@ -2006-11-26 Philipp Sehmisch <tmw@crushnet.org> +2006-11-26 Philipp Sehmisch <tmw@crushnet.org> * src/being.cpp, src/being.h, src/engine.cpp, src/main.cpp, src/player.cpp, src/player.h, src/resources/equipmentdb.h, src/resources/equipmentdb.cpp, @@ -15,7 +15,10 @@ data/equipment.xml: Added and defined male and female leather shirt as proof of concept of the gender specific equipment. - * data/graphics/tiles/desert_x2.png: Added new cactus by Yosuhara. + * data/graphics/images/Makefile.am, data/graphics/sprites/Makefile.am, + data/Makefile.am, src/Makefile.am, data/graphics/images/CMakeLists.txt, + data/graphics/sprites/CMakeLists.txt, data/CMakeLists.txt, src/CMakeLists.txt: + Updated Makefiles and CMake Lists. 2006-11-24 Philipp Sehmisch <tmw@crushnet.org> diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 36259082..e60bfe30 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -7,7 +7,8 @@ ADD_SUBDIRECTORY(maps) ADD_SUBDIRECTORY(sfx) SET(FILES + equipment.xml items.xml ) -INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}) +INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR})
\ No newline at end of file diff --git a/data/Makefile.am b/data/Makefile.am index 7d16a1fc..ed080d08 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -4,7 +4,8 @@ SUBDIRS = graphics help icons maps sfx tmwdatadir = $(pkgdatadir)/data tmwdata_DATA = \ + equipment.xml \ items.xml EXTRA_DIST = \ - $(tmwdata_DATA) + $(tmwdata_DATA)
\ No newline at end of file diff --git a/data/graphics/images/CMakeLists.txt b/data/graphics/images/CMakeLists.txt index dec22826..2566cf3d 100644 --- a/data/graphics/images/CMakeLists.txt +++ b/data/graphics/images/CMakeLists.txt @@ -1,6 +1,7 @@ ADD_SUBDIRECTORY(ambient) SET (FILES + error.png login_wallpaper.png minimap_new_1-1.png minimap_new_2-1.png diff --git a/data/graphics/images/Makefile.am b/data/graphics/images/Makefile.am index cc71b18a..00d9ed7e 100644 --- a/data/graphics/images/Makefile.am +++ b/data/graphics/images/Makefile.am @@ -3,6 +3,7 @@ SUBDIRS = ambient imagesdir = $(pkgdatadir)/data/graphics/images images_DATA = \ + error.png \ login_wallpaper.png \ minimap_new_1-1.png \ minimap_new_2-1.png \ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 51b68935..c663cedf 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -199,14 +199,17 @@ SET(SRCS net/tradehandler.h resources/ambientoverlay.cpp resources/ambientoverlay.h + resources/equipmentdb.cpp + resources/equipmentdb.h + resources/equipmentinfo.h resources/image.cpp resources/image.h resources/imagewriter.cpp resources/imagewriter.h - resources/iteminfo.h - resources/iteminfo.cpp - resources/itemmanager.cpp - resources/itemmanager.h + resources/itemdb.cpp + resources/itemdb.h + resources/iteminfo.h + resources/iteminfo.cpp resources/mapreader.cpp resources/mapreader.h resources/music.h @@ -308,4 +311,4 @@ TARGET_LINK_LIBRARIES(tmw INSTALL(TARGETS tmw RUNTIME DESTINATION ${PKG_BINDIR}) -SET_TARGET_PROPERTIES(tmw PROPERTIES COMPILE_FLAGS "${FLAGS}") +SET_TARGET_PROPERTIES(tmw PROPERTIES COMPILE_FLAGS "${FLAGS}")
\ No newline at end of file diff --git a/src/Makefile.am b/src/Makefile.am index 8715bac6..d9e6f907 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -161,14 +161,17 @@ tmw_SOURCES = graphic/imagerect.h \ net/tradehandler.h \ resources/ambientoverlay.cpp \ resources/ambientoverlay.h \ + resources/equipmentdb.cpp \ + resources/equipmentdb.h \ + resources/equipmentinfo.h \ resources/image.cpp \ resources/image.h \ resources/imagewriter.cpp \ resources/imagewriter.h \ + resources/itemdb.cpp \ + resources/itemdb.h \ resources/iteminfo.h \ resources/iteminfo.cpp \ - resources/itemmanager.cpp \ - resources/itemmanager.h \ resources/mapreader.cpp \ resources/mapreader.h \ resources/music.h \ @@ -261,4 +264,4 @@ INCLUDES = \ tmw_LDFLAGS = $(all_libraries) $(LIBSDL_RPATH) `pkg-config --libs libxml-2.0` tmw_CXXFLAGS = -Wall -Werror $(OPENGL_CFLAGS) $(LIBSDL_CFLAGS) `pkg-config --cflags libxml-2.0` $(CURL_CFLAGS) tmw_LDADD = $(LIBSDL_LIBS) -lguichan_sdl $(OPENGL_LIBS) $(CURL_LIBS) -tmw_TARGET = tmw +tmw_TARGET = tmw
\ No newline at end of file |