mirror of
				https://github.com/N64Recomp/N64ModernRuntime.git
				synced 2025-10-30 08:02:29 +00:00 
			
		
		
		
	Use prebuild image
This commit is contained in:
		
							parent
							
								
									02da48533c
								
							
						
					
					
						commit
						c9194895e0
					
				
					 3 changed files with 1 additions and 69 deletions
				
			
		|  | @ -1,12 +0,0 @@ | |||
| FROM mcr.microsoft.com/devcontainers/cpp:1-ubuntu-22.04 | ||||
| 
 | ||||
| RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ | ||||
|   && apt-get -y install --no-install-recommends ninja-build libsdl2-dev libgtk-3-dev lld llvm clang-15 | ||||
| 
 | ||||
| ARG INSTALL_SDL2_VERSION_FROM_SOURCE="2.26.1" | ||||
| 
 | ||||
| COPY ./install-sdl2.sh /tmp/ | ||||
| RUN if [ "${INSTALL_SDL2_VERSION_FROM_SOURCE}" != "none" ]; then \ | ||||
|   chmod +x /tmp/install-sdl2.sh && /tmp/install-sdl2.sh ${INSTALL_SDL2_VERSION_FROM_SOURCE}; \ | ||||
|   fi \ | ||||
|   && rm -f /tmp/install-sdl2.sh | ||||
|  | @ -1,8 +1,6 @@ | |||
| { | ||||
|   "name": "Zelda64Recomp", | ||||
|   "build": { | ||||
|     "dockerfile": "Dockerfile", | ||||
|   }, | ||||
|   "image": "dcvz/n64recomp:0.0.1-ubuntu-22.04", | ||||
| 
 | ||||
|   // Features to add to the dev container. More info: https://containers.dev/features. | ||||
|   // "features": {}, | ||||
|  |  | |||
|  | @ -1,54 +0,0 @@ | |||
| #!/usr/bin/env bash | ||||
| 
 | ||||
| set -e | ||||
| 
 | ||||
| SDL2_VERSION=${1:-"none"} | ||||
| 
 | ||||
| if [ "${SDL2_VERSION}" = "none" ]; then | ||||
|     echo "No SDL2 version specified, skipping SDL2 installation" | ||||
|     exit 0 | ||||
| fi | ||||
| 
 | ||||
| # Cleanup temporary directory and associated files when exiting the script. | ||||
| cleanup() { | ||||
|     EXIT_CODE=$? | ||||
|     set +e | ||||
|     if [[ -n "${TMP_DIR}" ]]; then | ||||
|         echo "Executing cleanup of tmp files" | ||||
|         rm -Rf "${TMP_DIR}" | ||||
|     fi | ||||
|     exit $EXIT_CODE | ||||
| } | ||||
| trap cleanup EXIT | ||||
| 
 | ||||
| echo "Installing CMake..." | ||||
| 
 | ||||
| architecture=$(dpkg --print-architecture) | ||||
| case "${architecture}" in | ||||
|     arm64) | ||||
|         ARCH=aarch64 ;; | ||||
|     amd64) | ||||
|         ARCH=x86_64 ;; | ||||
|     *) | ||||
|         echo "Unsupported architecture ${architecture}." | ||||
|         exit 1 | ||||
|         ;; | ||||
| esac | ||||
| 
 | ||||
| TMP_DIR=$(mktemp -d -t sdl2-XXXXXXXXXX) | ||||
| 
 | ||||
| echo "${TMP_DIR}" | ||||
| cd "${TMP_DIR}" | ||||
| 
 | ||||
| wget https://www.libsdl.org/release/SDL2-${SDL2_VERSION}.tar.gz | ||||
| tar -xzf SDL2-${SDL2_VERSION}.tar.gz | ||||
| cd SDL2-${SDL2_VERSION} | ||||
| ./configure | ||||
| make -j 10 | ||||
| sudo make install | ||||
| 
 | ||||
| if [ "$(uname -m)" == "x86_64" ]; then | ||||
|     sudo cp -av /usr/local/lib/libSDL* /lib/x86_64-linux-gnu/ | ||||
| else | ||||
|     sudo cp -av /usr/local/lib/libSDL* /usr/lib/aarch64-linux-gnu/ | ||||
| fi | ||||
		Loading…
	
	Add table
		
		Reference in a new issue
	
	 dcvz
						dcvz