From 9e977128115211ab76b6bd23f354f5e4fc3fcb2f Mon Sep 17 00:00:00 2001 From: Bobby Dilley Date: Thu, 9 Jan 2025 11:03:03 +0000 Subject: [PATCH] Update docker and makefile --- Dockerfile | 9 +++++---- Makefile | 11 ----------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3f42b8e..74dc966 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,18 @@ -FROM debian:bullseye AS lindbergh-build +FROM ubuntu:22.04 AS lindbergh-build RUN dpkg --add-architecture i386 \ - && apt-get update \ - && apt-get install -y --no-install-recommends \ + && apt update \ + && apt install -y --no-install-recommends \ build-essential \ gcc-multilib \ freeglut3-dev:i386 \ libsdl2-dev:i386 \ libfaudio-dev:i386 \ - && apt-get clean \ + && apt clean \ && rm -rf /var/lib/apt/lists/* WORKDIR /lindbergh-loader + COPY . . RUN make diff --git a/Makefile b/Makefile index 06751f5..b639301 100644 --- a/Makefile +++ b/Makefile @@ -46,17 +46,6 @@ libposixtime.so: # Clean rule clean: - rm -f $(BUILD)/lindbergh.so - rm -f $(BUILD)/libsegaapi.so - rm -f $(BUILD)/lindbergh - rm -f src/lindbergh/*.o - rm -f src/libsegaapi/*.o - -#clean all rule -cleanall: rm -rf $(BUILD) rm -f src/lindbergh/*.o rm -f src/libsegaapi/*.o - rm -f src/libkswapapi/*.o - rm -f src/libxdiff/*.a - rm -f src/libxdiff/xdiff/*.o