From 652a44c8441cada6a882b91bdd66eeb434b2f0ce Mon Sep 17 00:00:00 2001 From: Romain Goyet Date: Fri, 20 Sep 2019 11:07:37 +0200 Subject: [PATCH] [ion/sdl/windows] Fix the build --- ion/src/sdl/windows/Makefile | 1 + ion/src/sdl/windows/images.cpp | 4 +++- ion/src/sdl/windows/language.cpp | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ion/src/sdl/windows/Makefile b/ion/src/sdl/windows/Makefile index 22a4354b5..b0bf1a69f 100644 --- a/ion/src/sdl/windows/Makefile +++ b/ion/src/sdl/windows/Makefile @@ -1,5 +1,6 @@ ion_src += $(addprefix ion/src/sdl/windows/, \ images.cpp \ + language.cpp \ resources.rc \ ) ion_src += $(addprefix ion/src/sdl/shared/, \ diff --git a/ion/src/sdl/windows/images.cpp b/ion/src/sdl/windows/images.cpp index d970c8c6d..d95f828b9 100644 --- a/ion/src/sdl/windows/images.cpp +++ b/ion/src/sdl/windows/images.cpp @@ -1,3 +1,5 @@ +#include "../shared/platform.h" + #include #include #include @@ -32,7 +34,7 @@ HRESULT CreateStreamOnResource(const char * name, LPSTREAM * stream) { return hr; } -extern "C" SDL_Texture * loadImage(SDL_Renderer * renderer, const char * identifier) { +SDL_Texture * IonSDLPlatformLoadImage(SDL_Renderer * renderer, const char * identifier) { Gdiplus::GdiplusStartupInput gdiplusStartupInput; ULONG_PTR gdiplusToken; Gdiplus::GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, nullptr); diff --git a/ion/src/sdl/windows/language.cpp b/ion/src/sdl/windows/language.cpp index 86fff97cd..9b3d41744 100644 --- a/ion/src/sdl/windows/language.cpp +++ b/ion/src/sdl/windows/language.cpp @@ -1,7 +1,8 @@ #include "../shared/platform.h" + #include -const char * IonSDLPlatformGetLanguageCode() { +char * IonSDLPlatformGetLanguageCode() { /* Per documentation, the maximum number of characters allowed for the * language string is nine, including a terminating null character. */ static char buffer[9] = {0};