From 23d59ab1adf3d25d51f1b26c665dc29115bc911d Mon Sep 17 00:00:00 2001 From: turbocat Date: Tue, 26 Apr 2022 05:31:32 +0000 Subject: [PATCH] SDL: remove mentions of menuetos in video src git-svn-id: svn://kolibrios.org@9787 a494cfbc-eb01-0410-851d-a64ba20cac60 --- contrib/sdk/sources/SDL-1.2.2_newlib/src/Tupfile.lua | 2 +- .../sdk/sources/SDL-1.2.2_newlib/src/video/SDL_sysvideo.h | 4 ++-- contrib/sdk/sources/SDL-1.2.2_newlib/src/video/SDL_video.c | 2 +- .../SDL_menuetevents.c => kolibrios/SDL_kolibri_events.c} | 2 +- .../SDL_menuetvideo.c => kolibrios/SDL_kolibri_video.c} | 4 ++-- .../SDL_menuetvideo.h => kolibrios/SDL_kolibri_video.h} | 6 +++--- 6 files changed, 10 insertions(+), 10 deletions(-) rename contrib/sdk/sources/SDL-1.2.2_newlib/src/video/{menuetos/SDL_menuetevents.c => kolibrios/SDL_kolibri_events.c} (96%) rename contrib/sdk/sources/SDL-1.2.2_newlib/src/video/{menuetos/SDL_menuetvideo.c => kolibrios/SDL_kolibri_video.c} (95%) rename contrib/sdk/sources/SDL-1.2.2_newlib/src/video/{menuetos/SDL_menuetvideo.h => kolibrios/SDL_kolibri_video.h} (79%) diff --git a/contrib/sdk/sources/SDL-1.2.2_newlib/src/Tupfile.lua b/contrib/sdk/sources/SDL-1.2.2_newlib/src/Tupfile.lua index 062f872dd1..24748fd940 100755 --- a/contrib/sdk/sources/SDL-1.2.2_newlib/src/Tupfile.lua +++ b/contrib/sdk/sources/SDL-1.2.2_newlib/src/Tupfile.lua @@ -20,7 +20,7 @@ FOLDERS = { "timer/", "timer/dummy/", "video/", - "video/menuetos/", + "video/kolibrios/", "SYSCALL/src/" } diff --git a/contrib/sdk/sources/SDL-1.2.2_newlib/src/video/SDL_sysvideo.h b/contrib/sdk/sources/SDL-1.2.2_newlib/src/video/SDL_sysvideo.h index 59b86154a0..5063a7689e 100755 --- a/contrib/sdk/sources/SDL-1.2.2_newlib/src/video/SDL_sysvideo.h +++ b/contrib/sdk/sources/SDL-1.2.2_newlib/src/video/SDL_sysvideo.h @@ -387,7 +387,7 @@ extern VideoBootStrap QZ_bootstrap; extern VideoBootStrap CGX_bootstrap; #endif #ifdef ENABLE_KOLIBRIOS -extern VideoBootStrap mosvideo_bootstrab; +extern VideoBootStrap kos_video_bootstrab; #endif /* This is the current video device */ extern SDL_VideoDevice *current_video; @@ -396,4 +396,4 @@ extern SDL_VideoDevice *current_video; #define SDL_ShadowSurface (current_video->shadow) #define SDL_PublicSurface (current_video->visible) -#endif /* _SDL_sysvideo_h */ +#endif /* _SDL_sysvideo_h */ \ No newline at end of file diff --git a/contrib/sdk/sources/SDL-1.2.2_newlib/src/video/SDL_video.c b/contrib/sdk/sources/SDL-1.2.2_newlib/src/video/SDL_video.c index b824c1880b..ee0bcbaf99 100755 --- a/contrib/sdk/sources/SDL-1.2.2_newlib/src/video/SDL_video.c +++ b/contrib/sdk/sources/SDL-1.2.2_newlib/src/video/SDL_video.c @@ -97,7 +97,7 @@ static VideoBootStrap *bootstrap[] = { &ph_bootstrap, #endif #ifdef ENABLE_KOLIBRIOS - &mosvideo_bootstrab, + &kos_video_bootstrab, #endif NULL }; diff --git a/contrib/sdk/sources/SDL-1.2.2_newlib/src/video/menuetos/SDL_menuetevents.c b/contrib/sdk/sources/SDL-1.2.2_newlib/src/video/kolibrios/SDL_kolibri_events.c similarity index 96% rename from contrib/sdk/sources/SDL-1.2.2_newlib/src/video/menuetos/SDL_menuetevents.c rename to contrib/sdk/sources/SDL-1.2.2_newlib/src/video/kolibrios/SDL_kolibri_events.c index 2f288d438a..e2706d27dd 100755 --- a/contrib/sdk/sources/SDL-1.2.2_newlib/src/video/menuetos/SDL_menuetevents.c +++ b/contrib/sdk/sources/SDL-1.2.2_newlib/src/video/kolibrios/SDL_kolibri_events.c @@ -7,7 +7,7 @@ #include "SDL_sysevents.h" #include "SDL_sysvideo.h" #include "SDL_events_c.h" -#include "SDL_menuetvideo.h" +#include "SDL_kolibri_video.h" extern void kos_SDL_RepaintWnd(void); diff --git a/contrib/sdk/sources/SDL-1.2.2_newlib/src/video/menuetos/SDL_menuetvideo.c b/contrib/sdk/sources/SDL-1.2.2_newlib/src/video/kolibrios/SDL_kolibri_video.c similarity index 95% rename from contrib/sdk/sources/SDL-1.2.2_newlib/src/video/menuetos/SDL_menuetvideo.c rename to contrib/sdk/sources/SDL-1.2.2_newlib/src/video/kolibrios/SDL_kolibri_video.c index 30d2c83e4c..b0e0d42f9b 100755 --- a/contrib/sdk/sources/SDL-1.2.2_newlib/src/video/menuetos/SDL_menuetvideo.c +++ b/contrib/sdk/sources/SDL-1.2.2_newlib/src/video/kolibrios/SDL_kolibri_video.c @@ -7,7 +7,7 @@ #include "SDL_mouse.h" #include "SDL_sysvideo.h" #include "SDL_pixels_c.h" -#include "SDL_menuetvideo.h" +#include "SDL_kolibri_video.h" #include static SDL_VideoDevice * vm_suf=NULL; @@ -279,7 +279,7 @@ static SDL_VideoDevice *kos_CreateDevice(int indx) return dev; } -VideoBootStrap mosvideo_bootstrab = { +VideoBootStrap kos_video_bootstrab = { "kolibrios", "KolibriOS Device Driver", kos_Available, kos_CreateDevice, }; diff --git a/contrib/sdk/sources/SDL-1.2.2_newlib/src/video/menuetos/SDL_menuetvideo.h b/contrib/sdk/sources/SDL-1.2.2_newlib/src/video/kolibrios/SDL_kolibri_video.h similarity index 79% rename from contrib/sdk/sources/SDL-1.2.2_newlib/src/video/menuetos/SDL_menuetvideo.h rename to contrib/sdk/sources/SDL-1.2.2_newlib/src/video/kolibrios/SDL_kolibri_video.h index 23037c935e..0f2b231e3b 100755 --- a/contrib/sdk/sources/SDL-1.2.2_newlib/src/video/menuetos/SDL_menuetvideo.h +++ b/contrib/sdk/sources/SDL-1.2.2_newlib/src/video/kolibrios/SDL_kolibri_video.h @@ -1,5 +1,5 @@ -#ifndef _SDL_menuetvideo_h -#define _SDL_menuetvideo_h +#ifndef _SDL_kolibri_video_h +#define _SDL_kolibri_video_h #include "SDL_mouse.h" #include "SDL_sysvideo.h" @@ -17,4 +17,4 @@ struct SDL_PrivateVideoData { void kos_InitOSKeymap(_THIS); void kos_PumpEvents(_THIS); -#endif +#endif \ No newline at end of file