File pkgconfig-cegui.patch of Package smc

Overview Repositories Revisions Requests Users Attributes Meta

File pkgconfig-cegui.patch of Package smc (Revision 7f7dedf19a2f0bdb8547c991664fc5e4)

Currently displaying revision 7f7dedf19a2f0bdb8547c991664fc5e4 , Show latest

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-02 17:44:56.267802992 +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.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 17:27:47.364884218 +0200
@@ -21,8 +21,13 @@
 #include "../gui/hud.h"
 #include "../video/img_settings.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/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 17:47:47.416965288 +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-02 17:40:34.330024179 +0200
@@ -26,7 +26,11 @@
 #include "../core/sprite_manager.h"
 #include "../core/i18n.h"
 // 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-02 17:46:58.560633505 +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_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-02 17:44:39.099686400 +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-02 17:49:18.421583281 +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-02 17:50:46.858183840 +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 17:44:44.831725327 +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-02 17:48:27.645238471 +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 17:48:44.197350874 +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-02 17:50:26.142043158 +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 17:48:51.865402945 +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-02 17:41:23.010354760 +0200
@@ -27,7 +27,11 @@
 #include "boost/filesystem/convenience.hpp"
 namespace fs = boost::filesystem;
 // 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 17:47:39.416910963 +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/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-02 17:46:35.240475132 +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-02 17:46:24.960405318 +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 17:45:19.455960462 +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
 {
@@ -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 {}

Places

File pkgconfig-cegui.patch of Package smc (Revision 7f7dedf19a2f0bdb8547c991664fc5e4)

Places