diff options
Diffstat (limited to 'devel/kyra/files')
-rw-r--r-- | devel/kyra/files/patch-encoder__MakefileKyra | 11 | ||||
-rw-r--r-- | devel/kyra/files/patch-engine__MakefileKyra | 10 | ||||
-rw-r--r-- | devel/kyra/files/patch-engine_encoder.h | 11 | ||||
-rw-r--r-- | devel/kyra/files/patch-engine_imagetree.h | 11 | ||||
-rw-r--r-- | devel/kyra/files/patch-engine_namefield.h | 10 | ||||
-rw-r--r-- | devel/kyra/files/patch-grinliz_glperformance.h | 20 | ||||
-rw-r--r-- | devel/kyra/files/patch-guiExtended_progress.h | 20 | ||||
-rw-r--r-- | devel/kyra/files/patch-gui_eventmanager.h | 11 | ||||
-rw-r--r-- | devel/kyra/files/patch-guitest__guitest.cpp | 26 |
9 files changed, 0 insertions, 130 deletions
diff --git a/devel/kyra/files/patch-encoder__MakefileKyra b/devel/kyra/files/patch-encoder__MakefileKyra deleted file mode 100644 index d33e4ec639a0..000000000000 --- a/devel/kyra/files/patch-encoder__MakefileKyra +++ /dev/null @@ -1,11 +0,0 @@ ---- encoder/MakefileKyra.orig 2005-09-21 18:12:50 UTC -+++ encoder/MakefileKyra -@@ -110,7 +110,7 @@ OBJS := $(addsuffix .o,$(basename ${SRCS})) - # Output - #**************************************************************************** - --${OUTPUT}: ${OBJS} ${LIBS} -+${OUTPUT}: ${OBJS} ../engine/libkyra.a - ${LD} -o $@ ${LDFLAGS} ${OBJS} ${LIBS} ${EXTRA_LIBS} - - #**************************************************************************** diff --git a/devel/kyra/files/patch-engine__MakefileKyra b/devel/kyra/files/patch-engine__MakefileKyra deleted file mode 100644 index 886a268edf05..000000000000 --- a/devel/kyra/files/patch-engine__MakefileKyra +++ /dev/null @@ -1,10 +0,0 @@ ---- engine/MakefileKyra.orig 2006-07-21 01:54:05 UTC -+++ engine/MakefileKyra -@@ -130,6 +130,7 @@ SRCS := action.cpp \ - ../util/glstring.cpp \ - ../util/glisomath.cpp \ - ../../grinliz/gldebug.cpp \ -+ ../../grinliz/gldynamic.cpp \ - ../../grinliz/glperformance.cpp \ - ../../grinliz/glgeometry.cpp \ - ../../grinliz/glprime.cpp \ diff --git a/devel/kyra/files/patch-engine_encoder.h b/devel/kyra/files/patch-engine_encoder.h deleted file mode 100644 index f9fe5d6fad80..000000000000 --- a/devel/kyra/files/patch-engine_encoder.h +++ /dev/null @@ -1,11 +0,0 @@ ---- engine/encoder.h.orig 2005-03-31 01:02:36 UTC -+++ engine/encoder.h -@@ -148,7 +148,7 @@ class KrEncoder - GLASSERT( numRGBA >= numSegment ); - // GLASSERT( numSegment >= numLine ); - } -- void KrEncoder::Save(); -+ void Save(); - - KrResourceVault* GetVault() { return &vault; } - diff --git a/devel/kyra/files/patch-engine_imagetree.h b/devel/kyra/files/patch-engine_imagetree.h deleted file mode 100644 index 494f878687f3..000000000000 --- a/devel/kyra/files/patch-engine_imagetree.h +++ /dev/null @@ -1,11 +0,0 @@ ---- engine/imagetree.h.orig 2005-03-31 01:02:38 UTC -+++ engine/imagetree.h -@@ -190,7 +190,7 @@ class KrImageTree - void Clear( KrImNode* root ); // delete the entire tree - - // Recursive hit test walk. -- bool KrImageTree::HitTestRec( KrImNode* node, int x, int y, int flags, std::vector<KrImage*>* outputArray, int windowIndex ); -+ bool HitTestRec( KrImNode* node, int x, int y, int flags, std::vector<KrImage*>* outputArray, int windowIndex ); - - KrImNode* root; // The root to position the window - KrImNode* offsetRoot; // The root as returned to the client diff --git a/devel/kyra/files/patch-engine_namefield.h b/devel/kyra/files/patch-engine_namefield.h deleted file mode 100644 index 9f27cecc6ce3..000000000000 --- a/devel/kyra/files/patch-engine_namefield.h +++ /dev/null @@ -1,10 +0,0 @@ ---- engine/namefield.h.orig 2005-02-14 08:03:33 UTC -+++ engine/namefield.h -@@ -34,6 +34,7 @@ - #include "../../grinliz/gltypes.h" - #include "../util/gllist.h" - #include "SDL_endian.h" -+#include "SDL_rwops.h" - - - diff --git a/devel/kyra/files/patch-grinliz_glperformance.h b/devel/kyra/files/patch-grinliz_glperformance.h deleted file mode 100644 index 7089639e9723..000000000000 --- a/devel/kyra/files/patch-grinliz_glperformance.h +++ /dev/null @@ -1,20 +0,0 @@ ---- ../grinliz/glperformance.h.orig 2021-10-26 01:06:25.780070000 +0200 -+++ ../grinliz/glperformance.h 2021-10-26 01:16:02.969577000 +0200 -@@ -34,6 +34,8 @@ - #include "gltypes.h" - #include "gldebug.h" - -+#include <SDL/SDL_timer.h> -+ - namespace grinliz { - - const int GL_MAX_PROFILE_DATAITEM = 64; -@@ -91,7 +93,7 @@ - #else - inline U64 FastTime() - { -- #ifdef __GNUC__ -+ #if defined(__GNUC__) && (defined(__amd64__) || defined(__i386__)) - U64 val; - __asm__ __volatile__ ("rdtsc" : "=A" (val)); - return val; diff --git a/devel/kyra/files/patch-guiExtended_progress.h b/devel/kyra/files/patch-guiExtended_progress.h deleted file mode 100644 index e4c6ca345f13..000000000000 --- a/devel/kyra/files/patch-guiExtended_progress.h +++ /dev/null @@ -1,20 +0,0 @@ ---- guiExtended/progress.h.orig 2004-11-21 19:28:32 UTC -+++ guiExtended/progress.h -@@ -43,7 +43,7 @@ class KrProgress : public KrWidget (public) - /** if width of the resource is greater then its height then makes - a horizontal, else makes a vertical progress bar - */ -- KrProgress::KrProgress (int width, -+ KrProgress (int width, - int height, - KrRGBA FillColor, - KrRGBA ChangeColor, -@@ -53,7 +53,7 @@ class KrProgress : public KrWidget (public) - /** if width of the resource is greater then its height then makes - a horizontal, else makes a vertical progress bar - */ -- KrProgress::KrProgress (int width, -+ KrProgress (int width, - int height, - const KrScheme& scheme); - diff --git a/devel/kyra/files/patch-gui_eventmanager.h b/devel/kyra/files/patch-gui_eventmanager.h deleted file mode 100644 index 1c47d5083683..000000000000 --- a/devel/kyra/files/patch-gui_eventmanager.h +++ /dev/null @@ -1,11 +0,0 @@ ---- gui/eventmanager.h.orig 2005-04-01 04:08:57 UTC -+++ gui/eventmanager.h -@@ -80,7 +80,7 @@ class KrEventManager - int keysym; - KrWidget* target; - -- bool operator==( const Accel& rhs ) { return rhs.target == target; } -+ bool operator==( const Accel& rhs ) const { return rhs.target == target; } - }; - - KrEventManager(); diff --git a/devel/kyra/files/patch-guitest__guitest.cpp b/devel/kyra/files/patch-guitest__guitest.cpp deleted file mode 100644 index de9b79c958b2..000000000000 --- a/devel/kyra/files/patch-guitest__guitest.cpp +++ /dev/null @@ -1,26 +0,0 @@ ---- guitest/guitest.cpp.orig 2005-04-07 05:53:51 UTC -+++ guitest/guitest.cpp -@@ -96,19 +96,19 @@ class MyConsole : public KrConsole - switch ( event.type ) - { - case KrWidgetEvent::ACTIVATED: -- sprintf( buf, "ACTIVATED %s source=0x%x\n", source->WidgetType(), (unsigned)source ); -+ sprintf( buf, "ACTIVATED %s source=0x%x\n", source->WidgetType(), (uintptr_t)source ); - break; - - case KrWidgetEvent::DEACTIVATED: -- sprintf( buf, "DEACTIVATED %s source=0x%x\n", source->WidgetType(), (unsigned)source ); -+ sprintf( buf, "DEACTIVATED %s source=0x%x\n", source->WidgetType(), (uintptr_t)source ); - break; - - case KrWidgetEvent::COMMAND: -- sprintf( buf, "COMMAND %s source=0x%x command=%s arg=%s\n", source->WidgetType(), (unsigned)source, event.command.command, event.command.arg ); -+ sprintf( buf, "COMMAND %s source=0x%x command=%s arg=%s\n", source->WidgetType(), (uintptr_t)source, event.command.command, event.command.arg ); - break; - - case KrWidgetEvent::SELECTION: -- sprintf( buf, "SELECTION %s source=0x%x id=%d text=%s\n", source->WidgetType(), (unsigned)source, event.selection.index, event.selection.text ? event.selection.text : "(null)" ); -+ sprintf( buf, "SELECTION %s source=0x%x id=%d text=%s\n", source->WidgetType(), (uintptr_t)source, event.selection.index, event.selection.text ? event.selection.text : "(null)" ); - break; - - default: |