diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e00c70..637642b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,6 +38,7 @@ link_libraries ( ) include_directories(${SDL_INCLUDE_DIR} ${RUBY_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/lib + ${CMAKE_CURRENT_SOURCE_DIR}/lib/video ${CMAKE_CURRENT_SOURCE_DIR}/lib/gui ${CMAKE_CURRENT_SOURCE_DIR}/lib/generator ${CMAKE_CURRENT_SOURCE_DIR}/lib/sound @@ -78,7 +79,13 @@ SET(CMAKE_SWIG_FLAGS "") #set_target_properties(example PROPERTIES PREFIX "") -FILE(GLOB MYLIB_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} lib/*.cc lib/*.c lib/gui/*.cc lib/sound/*.cc +FILE(GLOB MYLIB_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + lib/*.cc + lib/*.c + lib/video/*.c + lib/video/*.cc + lib/gui/*.cc + lib/sound/*.cc lib/3dengine/*.cc lib/generator/*.cc lib/game/*.cc @@ -89,7 +96,11 @@ FILE(GLOB MYLIB_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} lib/*.cc lib/*.c li lib/game/path/*.cc lib/game/widgets/*.cc ) -FILE(GLOB MYLIB_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} lib/*.h lib/gui/*.h lib/sound/*.h +FILE(GLOB MYLIB_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + lib/*.h + lib/video/*.h + lib/gui/*.h + lib/sound/*.h lib/3dengine/*.h lib/game/*.h lib/players/*.h diff --git a/lib/ag_config.cc b/lib/ag_config.cc index 96c8c35..3425547 100644 --- a/lib/ag_config.cc +++ b/lib/ag_config.cc @@ -2,46 +2,44 @@ #include "ag_xml.h" #include "ag_fs.h" -// TODO: AGConfig should switch to a ruby-based configuration (maybe YAML) // TODO: commenting should be possible !! (no overwriting) AGConfig::AGConfig() - { - Document doc("config.xml"); +{ + Document doc("config.xml"); - Node &root=doc.root(); - AGString comment; - for(Node::iterator i=root.begin();i!=root.end();i++) + Node &root=doc.root(); + AGString comment; + for(Node::iterator i=root.begin();i!=root.end();i++) + { + if((*i)->get("name")=="") + { + AGString c=(*i)->getContent(); + if(c.substr(0,4)=="