From acf47f3fc0f4f3f9e4a3a1a0db5f89a3db6577f8 Mon Sep 17 00:00:00 2001 From: Ivan Izaguirre Date: Sun, 4 Oct 2020 15:45:23 +0200 Subject: [PATCH] Add SDL2 runtime for windows --- dockerbuild/Dockerfile | 7 +++++-- dockerbuild/buildindocker.sh | 3 +++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dockerbuild/Dockerfile b/dockerbuild/Dockerfile index 6c0652e..a9446f6 100644 --- a/dockerbuild/Dockerfile +++ b/dockerbuild/Dockerfile @@ -1,14 +1,17 @@ -FROM golang:1.12 +FROM golang:1.15.2 LABEL MAINTAINER="Ivan Izaguirre " RUN apt-get update -RUN apt-get install -y libsdl2-dev mingw-w64 +RUN apt-get install -y libsdl2-dev mingw-w64 unzip RUN wget https://www.libsdl.org/release/SDL2-devel-2.0.12-mingw.tar.gz RUN tar -xzf SDL2-devel-2.0.12-mingw.tar.gz RUN cp -r SDL2-2.0.12/x86_64-w64-mingw32 /usr +RUN wget https://www.libsdl.org/release/SDL2-2.0.12-win32-x64.zip +RUN unzip SDL2-2.0.12-win32-x64.zip -d /sdl2runtime + COPY buildindocker.sh . RUN chmod +x buildindocker.sh diff --git a/dockerbuild/buildindocker.sh b/dockerbuild/buildindocker.sh index 8e41cb0..88d0d6e 100644 --- a/dockerbuild/buildindocker.sh +++ b/dockerbuild/buildindocker.sh @@ -25,3 +25,6 @@ cd /tmp/izapple2/izapple2sdl env CGO_ENABLED=1 CC=x86_64-w64-mingw32-gcc GOOS=windows CGO_LDFLAGS="-L/usr/x86_64-w64-mingw32/lib -lSDL2" CGO_FLAGS="-I/usr/x86_64-w64-mingw32/include -D_REENTRANT" go build -o izapple2sdl.exe . chown --reference /build izapple2sdl.exe cp izapple2sdl.exe /build + +# Copy SDL2 Runtime +cp /sdl2runtime/* /build