--- tscgame-git-3ae93772e.old/tsc/CMakeLists.txt +++ tscgame-git-3ae93772e/tsc/CMakeLists.txt @@ -111,12 +111,6 @@ find_package(PNG REQUIRED) find_package(PCRE REQUIRED) -if (USE_LIBXMLPP3) - find_package(LibXmlPP 3.0 REQUIRED) -else() - find_package(LibXmlPP 2.6 REQUIRED) -endif() - find_package(Boost 1.50.0 COMPONENTS filesystem chrono thread REQUIRED) set(Boost_COMPONENTS Boost::filesystem Boost::chrono Boost::thread) @@ -145,12 +139,22 @@ include_directories( ${SFML_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} - ${LibXmlPP_INCLUDE_DIRS} ${PodParser_INCLUDE_DIRS} ${CEGUI_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR} ${PCRE_INCLUDE_DIRS} ${MRuby_INCLUDE_DIR} + __META_PRODTREE__/gtk3-gtkmm/include/atkmm-1.6 + __META_PRODTREE__/gtk3-gtkmm/include/cairomm-1.0 + __META_PRODTREE__/gtk3-gtkmm/include/gdkmm-3.0 + __META_PRODTREE__/gtk3-gtkmm/include/giomm-2.4 + __META_PRODTREE__/gtk3-gtkmm/include/glibmm-2.4 + __META_PRODTREE__/gtk3-gtkmm/include/gtkmm-3.0 + __META_PRODTREE__/gtk3-gtkmm/include/pangomm-1.4 + __META_PRODTREE__/gtk3-gtkmm/lib/glibmm-2.4/include + __META_PRODTREE__/gtkcore/include/glib-2.0 + __META_PRODTREE__/libxmlpp/include/libxml++-2.6 + __META_PRODTREE__/libxmlpp/lib/libxml++-2.6/include ${X11_INCLUDE_DIR} ${PNG_INCLUDE_DIRS}) @@ -203,6 +207,15 @@ ${PNG_LIBRARIES} ${MRuby_LIBRARIES} ${LibXmlPP_LIBRARIES} + __META_PRODTREE__/cegui08/lib/libCEGUIOpenGLRenderer-0.so + __META_PRODTREE__/gtk3-gtkmm/lib/libglibmm-2.4.so + __META_PRODTREE__/libxmlpp/lib/libxml++-2.6.so + __META_PRODTREE__/xorg/lib/libepoxy.so.0 + __META_PRODTREE__/libxml2/lib/libxml2.so + __META_PRODTREE__/freetype2/lib/libfreetype.so + __META_PRODTREE__/fribidi/lib/libfribidi.so + __META_PRODTREE__/minizip-ng/lib/libminizip.so + __META_PRODTREE__/libglew/lib/libGLEW.so ${PCRE_LIBRARIES}) # Passing --as-needed to ld ensures that we get the Win32 ld's behaviour