Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:susnux:branches:games
smc
pkgconfig-cegui.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File pkgconfig-cegui.patch of Package smc
diff -Nur smc-1.9/configure.ac new/configure.ac --- smc-1.9/configure.ac 2021-05-01 20:49:57.025152603 +0200 +++ new/configure.ac 2021-05-02 16:45:38.427763606 +0200 @@ -53,7 +53,9 @@ AC_MSG_ERROR([SDL_ttf library not found])) # Check for the CEGUI library -PKG_CHECK_MODULES(CEGUI, CEGUI-OPENGL >= 0.5.0) +PKG_CHECK_MODULES([CEGUI], [CEGUI-OPENGL >= 0.5.0],, [ + PKG_CHECK_MODULES([CEGUI], [CEGUI-0-OPENGL >= 0.5.0], [AC_DEFINE([HAVE_CEGUI_08], [], [CEGUI 0.8 is installed with its new file locations])]) +]) CPPFLAGS="$CPPFLAGS $CEGUI_CFLAGS" LIBS="$LIBS $CEGUI_LIBS" diff -Nur smc-1.9/src/audio/random_sound.cpp new/src/audio/random_sound.cpp --- smc-1.9/src/audio/random_sound.cpp 2009-04-24 19:55:24.000000000 +0200 +++ new/src/audio/random_sound.cpp 2021-05-03 10:01:04.375871430 +0200 @@ -21,8 +21,12 @@ #include "../input/mouse.h" #include "../core/math/utilities.h" #include "../core/i18n.h" -// CEGUI +// CEGUI +#ifdef HAVE_CEGUI_08 +#include "CEGUI/XMLAttributes.h" +#else #include "CEGUIXMLAttributes.h" +#endif namespace SMC { diff -Nur smc-1.9/src/core/editor.cpp new/src/core/editor.cpp --- smc-1.9/src/core/editor.cpp 2021-05-01 20:50:11.053242803 +0200 +++ new/src/core/editor.cpp 2021-05-03 10:01:04.291870287 +0200 @@ -34,9 +34,13 @@ // boost filesystem #include "boost/filesystem/convenience.hpp" namespace fs = boost::filesystem; -// CEGUI -#include "CEGUIXMLParser.h" - +// CEGUI +#ifdef HAVE_CEGUI_08 +#include "CEGUI/XMLParser.h" +#else +#include "CEGUIXMLParser.h" +#endif + namespace SMC { @@ -80,7 +84,7 @@ void cEditor_Item_Object :: Init( void ) { - // CEGUI settings + // CEGUI settings list_text->setTextColours( Get_Massive_Type_Color( sprite_obj->m_massive_type ).Get_cegui_Color() ); list_text->setSelectionColours( CEGUI::colour( 0.33f, 0.33f, 0.33f ) ); list_text->setSelectionBrushImage( "TaharezLook", "ListboxSelectionBrush" ); diff -Nur smc-1.9/src/core/editor.h new/src/core/editor.h --- smc-1.9/src/core/editor.h 2021-05-01 20:50:11.053242803 +0200 +++ new/src/core/editor.h 2021-05-02 18:03:30.463562087 +0200 @@ -20,9 +20,14 @@ #include "../objects/sprite.h" #include "../gui/hud.h" #include "../video/img_settings.h" -// CEGUI +// CEGUI +#ifdef HAVE_CEGUI_08 +#include "CEGUI/XMLHandler.h" +#include "CEGUI/XMLAttributes.h" +#else #include "CEGUIXMLHandler.h" #include "CEGUIXMLAttributes.h" +#endif namespace SMC { @@ -145,7 +150,7 @@ // ##### Main Menu // Add Menu Entry - void Add_Menu_Object( const std::string &name, std::string tags, CEGUI::colour normal_color = CEGUI::colour( 1, 1, 1 ) ); + void Add_Menu_Object( const std::string &name, std::string tags, CEGUI::Colour normal_color = CEGUI::Colour( 1, 1, 1 ) ); // Set Active Menu Entry virtual void Activate_Menu_Item( cEditor_Menu_Object *entry ); diff -Nur smc-1.9/src/core/game_core.cpp new/src/core/game_core.cpp --- smc-1.9/src/core/game_core.cpp 2021-05-01 20:50:11.053242803 +0200 +++ new/src/core/game_core.cpp 2021-05-03 10:01:04.287870232 +0200 @@ -163,7 +163,7 @@ box_editbox->setText( reinterpret_cast<const CEGUI::utf8*>(default_text.c_str()) ); box_editbox->setTooltipText( reinterpret_cast<const CEGUI::utf8*>(title_text.c_str()) ); box_editbox->activate(); - box_editbox->setCaratIndex( default_text.length() ); + box_editbox->setCaretIndex( default_text.length() ); finished = 0; @@ -1790,7 +1790,7 @@ // set new text editbox->setText( new_text.insert( beg, clipboard_text ) ); // set new carat index - editbox->setCaratIndex( editbox->getCaratIndex() + clipboard_text.length() ); + editbox->setCaretIndex( editbox->getCaretIndex() + clipboard_text.length() ); } // Editbox else if( type.find( "/Editbox" ) != CEGUI::String::npos ) @@ -1814,7 +1814,7 @@ // set new text editbox->setText( new_text.insert( beg, clipboard_text ) ); // set new carat index - editbox->setCaratIndex( editbox->getCaratIndex() + clipboard_text.length() ); + editbox->setCaretIndex( editbox->getCaretIndex() + clipboard_text.length() ); } else { diff -Nur smc-1.9/src/enemies/bosses/turtle_boss.cpp new/src/enemies/bosses/turtle_boss.cpp --- smc-1.9/src/enemies/bosses/turtle_boss.cpp 2009-04-30 06:06:04.000000000 +0200 +++ new/src/enemies/bosses/turtle_boss.cpp 2021-05-03 10:01:04.299870395 +0200 @@ -23,8 +23,12 @@ #include "../../video/gl_surface.h" #include "../../core/sprite_manager.h" #include "../../core/i18n.h" -// CEGUI +// CEGUI +#ifdef HAVE_CEGUI_08 +#include "CEGUI/XMLAttributes.h" +#else #include "CEGUIXMLAttributes.h" +#endif namespace SMC { diff -Nur smc-1.9/src/enemies/eato.cpp new/src/enemies/eato.cpp --- smc-1.9/src/enemies/eato.cpp 2009-08-04 16:35:16.000000000 +0200 +++ new/src/enemies/eato.cpp 2021-05-03 10:01:04.295870342 +0200 @@ -23,8 +23,12 @@ // boost filesystem #include "boost/filesystem/convenience.hpp" namespace fs = boost::filesystem; -// CEGUI +// CEGUI +#ifdef HAVE_CEGUI_08 +#include "CEGUI/XMLAttributes.h" +#else #include "CEGUIXMLAttributes.h" +#endif namespace SMC { diff -Nur smc-1.9/src/enemies/flyon.cpp new/src/enemies/flyon.cpp --- smc-1.9/src/enemies/flyon.cpp 2009-08-11 11:36:08.000000000 +0200 +++ new/src/enemies/flyon.cpp 2021-05-03 10:01:04.311870559 +0200 @@ -26,8 +26,12 @@ // boost filesystem #include "boost/filesystem/convenience.hpp" namespace fs = boost::filesystem; -// CEGUI +// CEGUI +#ifdef HAVE_CEGUI_08 +#include "CEGUI/XMLAttributes.h" +#else #include "CEGUIXMLAttributes.h" +#endif namespace SMC { diff -Nur smc-1.9/src/enemies/furball.cpp new/src/enemies/furball.cpp --- smc-1.9/src/enemies/furball.cpp 2009-04-30 05:58:48.000000000 +0200 +++ new/src/enemies/furball.cpp 2021-05-03 10:01:04.307870504 +0200 @@ -19,8 +19,12 @@ #include "../gui/hud.h" #include "../core/i18n.h" #include "../video/animation.h" -// CEGUI +// CEGUI +#ifdef HAVE_CEGUI_08 +#include "CEGUI/XMLAttributes.h" +#else #include "CEGUIXMLAttributes.h" +#endif namespace SMC { diff -Nur smc-1.9/src/enemies/gee.cpp new/src/enemies/gee.cpp --- smc-1.9/src/enemies/gee.cpp 2009-08-04 19:32:38.000000000 +0200 +++ new/src/enemies/gee.cpp 2021-05-03 10:01:04.311870559 +0200 @@ -20,8 +20,12 @@ #include "../gui/hud.h" #include "../input/mouse.h" #include "../core/i18n.h" -// CEGUI +// CEGUI +#ifdef HAVE_CEGUI_08 +#include "CEGUI/XMLAttributes.h" +#else #include "CEGUIXMLAttributes.h" +#endif namespace SMC { diff -Nur smc-1.9/src/enemies/krush.cpp new/src/enemies/krush.cpp --- smc-1.9/src/enemies/krush.cpp 2009-04-29 12:03:54.000000000 +0200 +++ new/src/enemies/krush.cpp 2021-05-03 10:01:04.311870559 +0200 @@ -21,8 +21,12 @@ #include "../video/gl_surface.h" #include "../user/savegame.h" #include "../core/i18n.h" -// CEGUI +// CEGUI +#ifdef HAVE_CEGUI_08 +#include "CEGUI/XMLAttributes.h" +#else #include "CEGUIXMLAttributes.h" +#endif namespace SMC { diff -Nur smc-1.9/src/enemies/rokko.cpp new/src/enemies/rokko.cpp --- smc-1.9/src/enemies/rokko.cpp 2009-04-28 03:51:22.000000000 +0200 +++ new/src/enemies/rokko.cpp 2021-05-03 10:01:04.303870450 +0200 @@ -22,8 +22,12 @@ #include "../video/renderer.h" #include "../input/mouse.h" #include "../core/i18n.h" -// CEGUI +// CEGUI +#ifdef HAVE_CEGUI_08 +#include "CEGUI/XMLAttributes.h" +#else #include "CEGUIXMLAttributes.h" +#endif namespace SMC { diff -Nur smc-1.9/src/enemies/spika.cpp new/src/enemies/spika.cpp --- smc-1.9/src/enemies/spika.cpp 2009-04-30 06:13:54.000000000 +0200 +++ new/src/enemies/spika.cpp 2021-05-03 10:01:04.311870559 +0200 @@ -22,8 +22,12 @@ #include "../core/sprite_manager.h" #include "../core/i18n.h" #include "../enemies/bosses/turtle_boss.h" -// CEGUI +// CEGUI +#ifdef HAVE_CEGUI_08 +#include "CEGUI/XMLAttributes.h" +#else #include "CEGUIXMLAttributes.h" +#endif namespace SMC { diff -Nur smc-1.9/src/enemies/spikeball.cpp new/src/enemies/spikeball.cpp --- smc-1.9/src/enemies/spikeball.cpp 2009-04-30 06:23:42.000000000 +0200 +++ new/src/enemies/spikeball.cpp 2021-05-03 10:01:04.307870504 +0200 @@ -19,8 +19,13 @@ #include "../gui/hud.h" #include "../core/i18n.h" #include "../video/animation.h" -// CEGUI +// CEGUI +#ifdef HAVE_CEGUI_08 +#include "CEGUI/XMLAttributes.h" +#else #include "CEGUIXMLAttributes.h" +#endif + namespace SMC { diff -Nur smc-1.9/src/enemies/static.cpp new/src/enemies/static.cpp --- smc-1.9/src/enemies/static.cpp 2009-08-13 21:20:00.000000000 +0200 +++ new/src/enemies/static.cpp 2021-05-03 10:01:04.307870504 +0200 @@ -22,8 +22,13 @@ #include "../core/sprite_manager.h" #include "../core/i18n.h" #include "../objects/path.h" -// CEGUI +// CEGUI +#ifdef HAVE_CEGUI_08 +#include "CEGUI/XMLAttributes.h" +#else #include "CEGUIXMLAttributes.h" +#endif + namespace SMC { diff -Nur smc-1.9/src/enemies/thromp.cpp new/src/enemies/thromp.cpp --- smc-1.9/src/enemies/thromp.cpp 2009-08-04 16:27:12.000000000 +0200 +++ new/src/enemies/thromp.cpp 2021-05-03 10:01:04.299870395 +0200 @@ -28,8 +28,12 @@ // boost filesystem #include "boost/filesystem/convenience.hpp" namespace fs = boost::filesystem; -// CEGUI +// CEGUI +#ifdef HAVE_CEGUI_08 +#include "CEGUI/XMLAttributes.h" +#else #include "CEGUIXMLAttributes.h" +#endif namespace SMC { diff -Nur smc-1.9/src/enemies/turtle.cpp new/src/enemies/turtle.cpp --- smc-1.9/src/enemies/turtle.cpp 2009-08-08 06:19:02.000000000 +0200 +++ new/src/enemies/turtle.cpp 2021-05-03 10:01:04.303870450 +0200 @@ -24,8 +24,12 @@ #include "../user/savegame.h" #include "../core/sprite_manager.h" #include "../core/i18n.h" -// CEGUI +// CEGUI +#ifdef HAVE_CEGUI_08 +#include "CEGUI/XMLAttributes.h" +#else #include "CEGUIXMLAttributes.h" +#endif namespace SMC { diff -Nur smc-1.9/src/gui/menu.cpp new/src/gui/menu.cpp --- smc-1.9/src/gui/menu.cpp 2009-08-13 16:40:08.000000000 +0200 +++ new/src/gui/menu.cpp 2021-05-03 10:01:04.283870178 +0200 @@ -25,8 +25,12 @@ #include "../level/level.h" #include "../overworld/overworld.h" #include "../user/preferences.h" -// CEGUI +// CEGUI +#ifdef HAVE_CEGUI_08 +#include "CEGUI/XMLAttributes.h" +#else #include "CEGUIXMLAttributes.h" +#endif namespace SMC { diff -Nur smc-1.9/src/gui/menu_data.h new/src/gui/menu_data.h --- smc-1.9/src/gui/menu_data.h 2009-04-14 20:24:52.000000000 +0200 +++ new/src/gui/menu_data.h 2021-05-02 18:03:30.459562059 +0200 @@ -98,7 +98,7 @@ virtual void Exit( void ); // Get all levels from the given directory - void Get_Levels( std::string dir, CEGUI::colour color ); + void Get_Levels( std::string dir, CEGUI::Colour color ); /* Load the Selected Listbox item * and exit if successful diff -Nur smc-1.9/src/level/global_effect.cpp new/src/level/global_effect.cpp --- smc-1.9/src/level/global_effect.cpp 2009-08-07 03:17:40.000000000 +0200 +++ new/src/level/global_effect.cpp 2021-05-03 10:01:04.339870940 +0200 @@ -19,8 +19,13 @@ #include "../core/camera.h" #include "../core/game_core.h" #include "../video/gl_surface.h" -// CEGUI +// CEGUI +#ifdef HAVE_CEGUI_08 +#include "CEGUI/XMLAttributes.h" +#else #include "CEGUIXMLAttributes.h" +#endif + namespace SMC { diff -Nur smc-1.9/src/level/level.cpp new/src/level/level.cpp --- smc-1.9/src/level/level.cpp 2009-08-16 18:46:36.000000000 +0200 +++ new/src/level/level.cpp 2021-05-03 10:01:04.335870885 +0200 @@ -54,8 +54,12 @@ #include "../objects/path.h" #include "../core/filesystem/filesystem.h" #include "../core/filesystem/resource_manager.h" -// CEGUI +// CEGUI +#ifdef HAVE_CEGUI_08 +#include "CEGUI/XMLParser.h" +#else #include "CEGUIXMLParser.h" +#endif namespace SMC { diff -Nur smc-1.9/src/level/level.h new/src/level/level.h --- smc-1.9/src/level/level.h 2009-08-16 18:46:36.000000000 +0200 +++ new/src/level/level.h 2021-05-02 18:03:30.471562145 +0200 @@ -23,10 +23,14 @@ #include "../level/level_manager.h" #include "../objects/level_entry.h" #include "../audio/random_sound.h" -// CEGUI +// CEGUI +#ifdef HAVE_CEGUI_08 +#include "CEGUI/XMLHandler.h" +#include "CEGUI/XMLAttributes.h" +#else #include "CEGUIXMLHandler.h" #include "CEGUIXMLAttributes.h" - +#endif namespace SMC { diff -Nur smc-1.9/src/objects/bonusbox.cpp new/src/objects/bonusbox.cpp --- smc-1.9/src/objects/bonusbox.cpp 2009-04-29 11:13:44.000000000 +0200 +++ new/src/objects/bonusbox.cpp 2021-05-03 10:01:04.355871158 +0200 @@ -25,8 +25,12 @@ #include "../objects/goldpiece.h" #include "../core/sprite_manager.h" #include "../core/i18n.h" -// CEGUI +// CEGUI +#ifdef HAVE_CEGUI_08 +#include "CEGUI/XMLAttributes.h" +#else #include "CEGUIXMLAttributes.h" +#endif namespace SMC { diff -Nur smc-1.9/src/objects/box.cpp new/src/objects/box.cpp --- smc-1.9/src/objects/box.cpp 2009-07-04 09:05:02.000000000 +0200 +++ new/src/objects/box.cpp 2021-05-03 10:01:04.359871212 +0200 @@ -27,8 +27,12 @@ #include "../core/i18n.h" #include "../enemies/turtle.h" #include "../enemies/bosses/turtle_boss.h" -// CEGUI +// CEGUI +#ifdef HAVE_CEGUI_08 +#include "CEGUI/XMLAttributes.h" +#else #include "CEGUIXMLAttributes.h" +#endif namespace SMC { diff -Nur smc-1.9/src/objects/level_entry.cpp new/src/objects/level_entry.cpp --- smc-1.9/src/objects/level_entry.cpp 2009-08-04 15:44:52.000000000 +0200 +++ new/src/objects/level_entry.cpp 2021-05-03 10:01:04.343870995 +0200 @@ -24,8 +24,13 @@ #include "../video/renderer.h" #include "../level/level.h" #include "../core/i18n.h" -// CEGUI +// CEGUI +#ifdef HAVE_CEGUI_08 +#include "CEGUI/XMLAttributes.h" +#else #include "CEGUIXMLAttributes.h" +#endif + namespace SMC { diff -Nur smc-1.9/src/objects/level_exit.cpp new/src/objects/level_exit.cpp --- smc-1.9/src/objects/level_exit.cpp 2009-08-04 15:44:52.000000000 +0200 +++ new/src/objects/level_exit.cpp 2021-05-03 10:01:04.363871266 +0200 @@ -26,8 +26,12 @@ #include "../level/level.h" #include "../core/i18n.h" #include "../core/filesystem/filesystem.h" -// CEGUI +// CEGUI +#ifdef HAVE_CEGUI_08 +#include "CEGUI/XMLAttributes.h" +#else #include "CEGUIXMLAttributes.h" +#endif namespace SMC { diff -Nur smc-1.9/src/objects/star.cpp new/src/objects/star.cpp --- smc-1.9/src/objects/star.cpp 2009-04-18 18:30:16.000000000 +0200 +++ new/src/objects/star.cpp 2021-05-03 10:01:04.347871049 +0200 @@ -18,8 +18,12 @@ #include "../core/framerate.h" #include "../video/animation.h" #include "../core/i18n.h" -// CEGUI +// CEGUI +#ifdef HAVE_CEGUI_08 +#include "CEGUI/XMLAttributes.h" +#else #include "CEGUIXMLAttributes.h" +#endif namespace SMC { diff -Nur smc-1.9/src/overworld/overworld.cpp new/src/overworld/overworld.cpp --- smc-1.9/src/overworld/overworld.cpp 2009-08-16 18:51:16.000000000 +0200 +++ new/src/overworld/overworld.cpp 2021-05-03 10:01:04.315870613 +0200 @@ -30,9 +30,14 @@ #include "../core/i18n.h" #include "../core/filesystem/filesystem.h" #include "../core/filesystem/resource_manager.h" -// CEGUI -#include "CEGUIXMLParser.h" +// CEGUI +#ifdef HAVE_CEGUI_08 +#include "CEGUI/XMLHandler.h" +#include "CEGUI/XMLAttributes.h" +#else +#include "CEGUIXMLHandler.h" #include "CEGUIXMLAttributes.h" +#endif namespace SMC { diff -Nur smc-1.9/src/overworld/overworld.h new/src/overworld/overworld.h --- smc-1.9/src/overworld/overworld.h 2009-08-16 18:51:18.000000000 +0200 +++ new/src/overworld/overworld.h 2021-05-02 18:03:30.471562145 +0200 @@ -23,9 +23,14 @@ #include "../overworld/world_sprite_manager.h" #include "../gui/hud.h" #include "../audio/random_sound.h" -// CEGUI +// CEGUI +#ifdef HAVE_CEGUI_08 +#include "CEGUI/XMLHandler.h" +#include "CEGUI/XMLAttributes.h" +#else #include "CEGUIXMLHandler.h" #include "CEGUIXMLAttributes.h" +#endif namespace SMC { diff -Nur smc-1.9/src/overworld/world_layer.cpp new/src/overworld/world_layer.cpp --- smc-1.9/src/overworld/world_layer.cpp 2009-08-16 18:15:56.000000000 +0200 +++ new/src/overworld/world_layer.cpp 2021-05-03 10:01:04.315870613 +0200 @@ -18,8 +18,12 @@ #include "../core/game_core.h" #include "../overworld/overworld.h" #include "../core/i18n.h" -// CEGUI +// CEGUI +#ifdef HAVE_CEGUI_08 +#include "CEGUI/XMLParser.h" +#else #include "CEGUIXMLParser.h" +#endif namespace SMC { diff -Nur smc-1.9/src/overworld/world_layer.h new/src/overworld/world_layer.h --- smc-1.9/src/overworld/world_layer.h 2009-08-09 04:49:54.000000000 +0200 +++ new/src/overworld/world_layer.h 2021-05-02 18:03:30.467562117 +0200 @@ -20,9 +20,14 @@ #include "../objects/movingsprite.h" #include "../core/obj_manager.h" #include "../overworld/world_waypoint.h" -// CEGUI +// CEGUI +#ifdef HAVE_CEGUI_08 +#include "CEGUI/XMLHandler.h" +#include "CEGUI/XMLAttributes.h" +#else #include "CEGUIXMLHandler.h" #include "CEGUIXMLAttributes.h" +#endif namespace SMC { diff -Nur smc-1.9/src/overworld/world_manager.cpp new/src/overworld/world_manager.cpp --- smc-1.9/src/overworld/world_manager.cpp 2021-05-01 20:50:02.973190849 +0200 +++ new/src/overworld/world_manager.cpp 2021-05-03 10:01:04.315870613 +0200 @@ -21,8 +21,12 @@ // boost filesystem #include "boost/filesystem/convenience.hpp" namespace fs = boost::filesystem; -// CEGUI +// CEGUI +#ifdef HAVE_CEGUI_08 +#include "CEGUI/XMLParser.h" +#else #include "CEGUIXMLParser.h" +#endif namespace SMC { diff -Nur smc-1.9/src/overworld/world_manager.h new/src/overworld/world_manager.h --- smc-1.9/src/overworld/world_manager.h 2009-02-18 05:10:14.000000000 +0100 +++ new/src/overworld/world_manager.h 2021-05-02 18:03:30.467562117 +0200 @@ -19,9 +19,14 @@ #include "../core/globals.h" #include "../core/obj_manager.h" #include "../core/camera.h" -// CEGUI +// CEGUI +#ifdef HAVE_CEGUI_08 +#include "CEGUI/XMLHandler.h" +#include "CEGUI/XMLAttributes.h" +#else #include "CEGUIXMLHandler.h" #include "CEGUIXMLAttributes.h" +#endif namespace SMC { diff -Nur smc-1.9/src/user/preferences.cpp new/src/user/preferences.cpp --- smc-1.9/src/user/preferences.cpp 2009-05-12 10:21:26.000000000 +0200 +++ new/src/user/preferences.cpp 2021-05-03 10:01:04.343870995 +0200 @@ -26,8 +26,12 @@ // boost filesystem #include "boost/filesystem/convenience.hpp" namespace fs = boost::filesystem; -// CEGUI +// CEGUI +#ifdef HAVE_CEGUI_08 +#include "CEGUI/XMLParser.h" +#else #include "CEGUIXMLParser.h" +#endif namespace SMC { diff -Nur smc-1.9/src/user/preferences.h new/src/user/preferences.h --- smc-1.9/src/user/preferences.h 2009-04-12 16:32:24.000000000 +0200 +++ new/src/user/preferences.h 2021-05-02 18:03:30.475562173 +0200 @@ -19,9 +19,14 @@ #include "../core/globals.h" // SDL #include "SDL.h" -// CEGUI +// CEGUI +#ifdef HAVE_CEGUI_08 +#include "CEGUI/XMLHandler.h" +#include "CEGUI/XMLAttributes.h" +#else #include "CEGUIXMLHandler.h" #include "CEGUIXMLAttributes.h" +#endif namespace SMC { diff -Nur smc-1.9/src/user/savegame.cpp new/src/user/savegame.cpp --- smc-1.9/src/user/savegame.cpp 2009-08-16 18:14:58.000000000 +0200 +++ new/src/user/savegame.cpp 2021-05-03 10:01:04.343870995 +0200 @@ -24,8 +24,12 @@ #include "../core/i18n.h" #include "../core/filesystem/filesystem.h" #include "../core/filesystem/resource_manager.h" -// CEGUI +// CEGUI +#ifdef HAVE_CEGUI_08 +#include "CEGUI/XMLParser.h" +#else #include "CEGUIXMLParser.h" +#endif namespace SMC { diff -Nur smc-1.9/src/user/savegame.h new/src/user/savegame.h --- smc-1.9/src/user/savegame.h 2009-08-09 05:07:10.000000000 +0200 +++ new/src/user/savegame.h 2021-05-02 18:03:30.475562173 +0200 @@ -17,9 +17,14 @@ #define SMC_SAVEGAME_H #include "../objects/sprite.h" -// CEGUI +// CEGUI +#ifdef HAVE_CEGUI_08 +#include "CEGUI/XMLHandler.h" +#include "CEGUI/XMLAttributes.h" +#else #include "CEGUIXMLHandler.h" #include "CEGUIXMLAttributes.h" +#endif namespace SMC { diff -Nur smc-1.9/src/video/animation.cpp new/src/video/animation.cpp --- smc-1.9/src/video/animation.cpp 2009-05-01 14:05:06.000000000 +0200 +++ new/src/video/animation.cpp 2021-05-03 10:01:04.367871321 +0200 @@ -21,8 +21,12 @@ #include "../core/math/utilities.h" #include "../core/i18n.h" #include "../core/filesystem/filesystem.h" -// CEGUI +// CEGUI +#ifdef HAVE_CEGUI_08 +#include "CEGUI/XMLAttributes.h" +#else #include "CEGUIXMLAttributes.h" +#endif namespace SMC { diff -Nur smc-1.9/src/video/video.cpp new/src/video/video.cpp --- smc-1.9/src/video/video.cpp 2021-05-01 20:50:11.057242829 +0200 +++ new/src/video/video.cpp 2021-05-03 10:01:04.371871376 +0200 @@ -28,11 +28,16 @@ #include "../core/math/size.h" #include "../core/filesystem/filesystem.h" #include "../core/filesystem/resource_manager.h" -// SDL -#include "SDL_opengl.h" -// CEGUI -#include "CEGUIDefaultResourceProvider.h" -#include "CEGUIDefaultLogger.h" +// CEGUI +#ifdef HAVE_CEGUI_08 +#include "CEGUI/DefaultResourceProvider.h" +#include "CEGUI/DefaultLogger.h" +#else +#include "CEGUIDefaultResourceProvider.h" +#include "CEGUIDefaultLogger.h" +#endif +// SDL +#include "SDL_opengl.h" // boost filesystem #include "boost/filesystem/convenience.hpp" namespace fs = boost::filesystem; diff -Nur smc-1.9/src/video/video.h new/src/video/video.h --- smc-1.9/src/video/video.h 2021-05-01 20:50:11.057242829 +0200 +++ new/src/video/video.h 2021-05-02 18:03:30.483562231 +0200 @@ -17,13 +17,18 @@ #define SMC_VIDEO_H #include "../core/globals.h" -// SDL -// also includes SDL.h -#include "SDL_image.h" -#include "SDL_opengl.h" -// CEGUI -#include "CEGUI.h" +// CEGUI +#ifdef HAVE_CEGUI_08 +#include <CEGUI/CEGUI.h> +#include <CEGUI/RendererModules/OpenGL/GLRenderer.h> +#else +#include "CEGUI.h" #include <RendererModules/OpenGL/CEGUIOpenGLRenderer.h> +#endif +// SDL +// also includes SDL.h +#include "SDL_image.h" +#include "SDL_opengl.h" namespace SMC { @@ -41,7 +46,7 @@ // Returns a matching Color value SDL_Color Get_SDL_Color( void ) const; - CEGUI::colour Get_cegui_Color( void ) const; + CEGUI::Colour Get_cegui_Color( void ) const; // += operator inline void operator += ( const Color &c ) @@ -130,7 +135,7 @@ }; /* *** *** *** *** *** *** *** CEGUI renderer fake classes *** *** *** *** *** *** *** *** *** *** */ -// CEGUI 0.7.x requires more 'fake' classes than the 0.6.x version did... +// CEGUI 0.7.x requires more 'fake' classes than the 0.6.x version did... class cFake_GeometryBuffer : public CEGUI::GeometryBuffer { void draw() const {}
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
