16

decompme · Sep 10, 2023 · 2651e74 · 2651e74
1 parent 825fbff
commit 2651e74
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/platforms/win9x/msvc4.2/Dockerfile b/platforms/win9x/msvc4.2/Dockerfile
@@ -10,8 +10,8 @@ RUN unzip master.zip
 RUN mkdir -p /platforms/win9x/msvc4.2/Bin
 RUN mkdir -p /platforms/win9x/msvc4.2/Include
 
-RUN cp -r MSVC400-master/bin/* /platforms/win9x/msvc4.2/Bin
-RUN cp -r MSVC400-master/include/* /platforms/win9x/msvc4.2/Include
+RUN cp -r MSVC420-master/bin/* /platforms/win9x/msvc4.2/Bin
+RUN cp -r MSVC420-master/include/* /platforms/win9x/msvc4.2/Include
 
 RUN chmod +x /platforms/win9x/msvc4.2/Bin/*
 

diff --git a/platforms/win9x/msvc7.0/Dockerfile b/platforms/win9x/msvc7.0/Dockerfile
@@ -3,13 +3,10 @@
 
 FROM alpine:3.18 as base
 
-# download zip first to allow for Docker caching
-RUN wget -O msvc7.0.tar.gz "https://github.com/roblabla/MSVC-7.0-Portable/releases/download/release/msvc7.0.tar.gz"
-RUN unzip msvc7.0.tar.gz
-
 RUN mkdir -p /platforms/win9x/msvc7.0
 
-RUN cp -r /* /platforms/win9x/msvc7.0
+RUN wget -O msvc7.0.tar.gz "https://github.com/roblabla/MSVC-7.0-Portable/releases/download/release/msvc7.0.tar.gz"
+RUN tar xvzf msvc7.0.tar.gz -C /platforms/win9x/msvc7.0
 
 RUN chmod +x /platforms/win9x/msvc7.0/*
 

diff --git a/values.yaml b/values.yaml
@@ -621,7 +621,7 @@ compilers:
  file: https://github.com/OmniBlade/decomp.me/releases/download/msvcwin9x/msvc6.6.tar.gz
  - id: msvc7.0
  platform: win9x
- template: common/zip
+ template: common/default
  file: https://github.com/roblabla/MSVC-7.0-Portable/releases/download/release/msvc7.0.tar.gz
  - id: msvc7.1
  platform: win9x
@@ -638,5 +638,5 @@ compilers:
  platform: win9x
  template: win9x/msvc
  file: https://github.com/itsmattkc/MSVC420/archive/refs/heads/master.zip
- bin_dir: MSVC400-master/bin
- include_dir: MSVC400-master/include
+ bin_dir: MSVC420-master/bin
+ include_dir: MSVC420-master/include