diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | data/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | data/fonts/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | data/graphics/gui/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 12 |
5 files changed, 26 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2008-03-04 Bjørn Lindeijer <bjorn@lindeijer.nl> + + * src/CMakeLists.txt, data/graphics/gui/CMakeLists.txt, + data/fonts/CMakeLists.txt, data/CMakeLists.txt: Accepted patch by + roderic to fix building/installing with CMake. + 2008-03-03 Philipp Sehmisch <tmw@crushnet.org> * src/localplayer.h: Added natural HP regeneration diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 3c482b49..d5e9e88e 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -3,3 +3,4 @@ SET(DATA_DIR ${PKG_DATADIR}/data) ADD_SUBDIRECTORY(graphics) ADD_SUBDIRECTORY(help) ADD_SUBDIRECTORY(icons) +ADD_SUBDIRECTORY(fonts) diff --git a/data/fonts/CMakeLists.txt b/data/fonts/CMakeLists.txt new file mode 100644 index 00000000..dc22e031 --- /dev/null +++ b/data/fonts/CMakeLists.txt @@ -0,0 +1,6 @@ +SET (FILES + dejavusans.ttf + ) + +INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/fonts) + diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt index 649e0917..252348e5 100644 --- a/data/graphics/gui/CMakeLists.txt +++ b/data/graphics/gui/CMakeLists.txt @@ -9,6 +9,7 @@ SET (FILES checkbox.png close_button.png deepbox.png + equip_bg.png fixedfont.png hits_blue.png hits_red.png @@ -20,7 +21,6 @@ SET (FILES hscroll_right_highlight.png hscroll_right_pressed.png item_shortcut_bgr.png - mouse.png menuitemD.png menuitemF.png menuitemN.png diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4d774f1b..9cda186d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -91,6 +91,10 @@ SET(SRCS gui/gccontainer.h gui/gui.cpp gui/gui.h + gui/guildlistbox.cpp + gui/guildlistbox.h + gui/guildwindow.cpp + gui/guildwindow.h gui/hbox.cpp gui/hbox.h gui/help.cpp @@ -174,6 +178,8 @@ SET(SRCS gui/tabbedcontainer.h gui/textbox.cpp gui/textbox.h + gui/textdialog.cpp + gui/textdialog.h gui/textfield.cpp gui/textfield.h gui/trade.cpp @@ -203,6 +209,8 @@ SET(SRCS net/chathandler.h net/connection.cpp net/connection.h + net/guildhandler.cpp + net/guildhandler.h net/internal.cpp net/internal.h net/inventoryhandler.cpp @@ -236,6 +244,8 @@ SET(SRCS net/accountserver/internal.h net/chatserver/chatserver.cpp net/chatserver/chatserver.h + net/chatserver/guild.cpp + net/chatserver/guild.h net/chatserver/internal.cpp net/chatserver/internal.h net/gameserver/gameserver.cpp @@ -322,6 +332,8 @@ SET(SRCS graphics.cpp graphics.h guichanfwd.h + guild.cpp + guild.h imageparticle.cpp imageparticle.h inventory.cpp |