Fixes for Vita Docker build, attempted fix for Android build

RossMeikleham · Jul 9, 2023 · 2fb5128 · 2fb5128
1 parent 45cae63
commit 2fb5128
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/build/Android/Dockerfile b/build/Android/Dockerfile
@@ -9,6 +9,10 @@ ENV LC_ALL C.UTF-8
 
 ENV ANDROID_HOME /opt/android-sdk-linux
 
+RUN sed -i s/deb.debian.org/archive.debian.org/g /etc/apt/sources.list
+RUN sed -i 's|security.debian.org|archive.debian.org|g' /etc/apt/sources.list 
+RUN sed -i '/stretch-updates/d' /etc/apt/sources.list 
+
 RUN dpkg --add-architecture i386 \
   && apt-get update && apt-get install -y --no-install-recommends expect \
     libncurses5:i386 \

diff --git a/build/Vita/CMakeLists.txt b/build/Vita/CMakeLists.txt
@@ -50,8 +50,9 @@ target_link_libraries(${SHORT_NAME}
   SDL2_image
   png
   jpeg
+  bz2
   freetype
-  z
+  z 
   vita2d
   SceDisplay_stub
   SceCtrl_stub

diff --git a/build/Vita/Dockerfile b/build/Vita/Dockerfile
@@ -1,4 +1,4 @@
-from gnuton/vitasdk-docker:latest
+from gnuton/vitasdk-docker:20220207
 
 ENV VITASDK /usr/local/vitasdk