commit ecf18b68

Poul Sander · 2019-04-16 08:24
ecf18b681e55f305ab851a1182b977f9622e10a6 patch · browse files
parent a815ec9cf1d9e6b0a85d9b1a3427fc9c5d70ad1b

Windows build is now working

Changed files

M	extra/docker/Dockerfile.WindowsBuild before
M	src/saland/GameDraw.cpp before

diff --git a/extra/docker/Dockerfile.WindowsBuild b/extra/docker/Dockerfile.WindowsBuild index 51c741f..3bd6b01 100644 --- a/extra/docker/Dockerfile.WindowsBuild +++ b/extra/docker/Dockerfile.WindowsBuild

@@ -1,11 +1,14 @@

FROM sago007/docker_blockattack

-RUN apt-get update && apt-get install -y zip gettext mxe-i686-w64-mingw32.static-sdl2-gfx mxe-i686-w64-mingw32.static-libxml2 mxe-i686-w64-mingw32.static-box2d

+RUN apt-get update && apt-get install -y zip gettext mxe-i686-w64-mingw32.static-sdl2-gfx mxe-i686-w64-mingw32.static-libxml2 mxe-i686-w64-mingw32.static-box2d libutfcpp-dev

RUN mkdir -p /staging/saland

COPY . /staging/saland

+RUN cp -r /usr/include/utf8 /staging/saland/src/Libs/include/ && \

+cp /usr/include/utf8.h /staging/saland/src/Libs/include/

RUN cd /staging/saland && \

i686-w64-mingw32.static-cmake . && \

make

diff --git a/src/saland/GameDraw.cpp b/src/saland/GameDraw.cpp index 483c4d2..d9aef9d 100644 --- a/src/saland/GameDraw.cpp +++ b/src/saland/GameDraw.cpp

@@ -23,6 +23,7 @@ https://github.com/sago007/saland

#include "GameDraw.hpp"

#include <SDL2/SDL2_gfxPrimitives.h>

+#include <cmath>

static void Draw(SDL_Renderer* target, SDL_Texture* t, int x, int y, const SDL_Rect& part) {

SDL_Rect pos = {};