Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

depends: remove libsdl_image and libsdl2 #11881

Merged
merged 5 commits into from
Mar 22, 2017
Merged

depends: remove libsdl_image and libsdl2 #11881

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6b2f455
[cleanup] depends: remove libsdl_image
stefansaraev Mar 20, 2017
84f9b71
[cleanup] sdl2 is no more
stefansaraev Mar 20, 2017
8d4129a
[cmake] FindSdl.cmake: look for sdl1 only
stefansaraev Mar 20, 2017
b87db49
[cleanup] depends: remove libsdl2
stefansaraev Mar 20, 2017
65c1b41
remove more SDL references
Rechi Mar 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions xbmc/Application.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,8 @@

#include "input/KeyboardLayoutManager.h"

#if HAVE_SDL_VERSION == 1
#ifdef HAS_SDL
#include <SDL/SDL.h>
#elif HAVE_SDL_VERSION == 2
#include <SDL2/SDL.h>
#endif

#ifdef HAS_UPNP
Expand Down
6 changes: 0 additions & 6 deletions xbmc/video/Teletext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,6 @@
#include "filesystem/SpecialProtocol.h"
#include "guilib/GraphicContext.h"

#if HAVE_SDL_VERSION == 1
#include <SDL/SDL_stdinc.h>
#elif HAVE_SDL_VERSION == 2
#include <SDL2/SDL_stdinc.h>
#else

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

#define SDL_memset4(dst, val, len) \
do { \
uint32_t _count = (len); \
Expand All @@ -53,7 +48,6 @@ do { \
} \
} while(0)
#define SDL_memcpy4(dst, src, len) memcpy(dst, src, (len) << 2)
#endif

static const char *TeletextFont = "special://xbmc/media/Fonts/teletext.ttf";

Expand Down
4 changes: 0 additions & 4 deletions xbmc/windowing/WinEventsSDL.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,7 @@
#include "system.h"

#ifdef HAS_SDL
#if HAVE_SDL_VERSION == 1
#include <SDL/SDL_events.h>
#elif HAVE_SDL_VERSION == 2
#include <SDL/SDL_events.h>
#endif

#include "WinEvents.h"

Expand Down