From 04aac33ae531ab9a1ecaee6bdb7d55c9fa4d7f8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 27 Aug 2025 14:20:24 +0200
Subject: [PATCH] Remove nasm leftover

---
 .gitlab/ci/jobs/alpine-3-gcc-makefile.yml | 2 +-
 .gitlab/ci/jobs/alpine-3-gcc.yml          | 2 +-
 .gitlab/ci/templates/srb2ci.yml           | 2 +-
 SRB2_common.props                         | 9 ++-------
 debian-template/README.source             | 1 -
 debian-template/control                   | 3 +--
 6 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/.gitlab/ci/jobs/alpine-3-gcc-makefile.yml b/.gitlab/ci/jobs/alpine-3-gcc-makefile.yml
index 13bcea0702..ed5aef410f 100644
--- a/.gitlab/ci/jobs/alpine-3-gcc-makefile.yml
+++ b/.gitlab/ci/jobs/alpine-3-gcc-makefile.yml
@@ -50,7 +50,7 @@ Alpine 3 GCC Makefile:
     - - |
           # apk_common
           echo -e "\e[0Ksection_start:`date +%s`:apk_common[collapsed=true]\r\e[0KInstalling common packages"
-      - apk add make git ccache nasm
+      - apk add make git ccache
       - |
           # apk_common
           echo -e "\e[0Ksection_end:`date +%s`:apk_common\r\e[0K"
diff --git a/.gitlab/ci/jobs/alpine-3-gcc.yml b/.gitlab/ci/jobs/alpine-3-gcc.yml
index 5d828ce58b..23de762120 100644
--- a/.gitlab/ci/jobs/alpine-3-gcc.yml
+++ b/.gitlab/ci/jobs/alpine-3-gcc.yml
@@ -50,7 +50,7 @@ Alpine 3 GCC:
     - - |
           # apk_common
           echo -e "\e[0Ksection_start:`date +%s`:apk_common[collapsed=true]\r\e[0KInstalling common packages"
-      - apk add cmake make git ccache nasm
+      - apk add cmake make git ccache
       - |
           # apk_common
           echo -e "\e[0Ksection_end:`date +%s`:apk_common\r\e[0K"
diff --git a/.gitlab/ci/templates/srb2ci.yml b/.gitlab/ci/templates/srb2ci.yml
index 7650486146..63a27cc440 100644
--- a/.gitlab/ci/templates/srb2ci.yml
+++ b/.gitlab/ci/templates/srb2ci.yml
@@ -85,7 +85,7 @@
     - - |
           # apt_common
           echo -e "\e[0Ksection_start:`date +%s`:apt_common[collapsed=true]\r\e[0KInstalling common packages"
-      - apt-get install make git ccache nasm cmake ca-certificates
+      - apt-get install make git ccache cmake ca-certificates
       - |
           # apt_common
           echo -e "\e[0Ksection_end:`date +%s`:apt_common\r\e[0K"
diff --git a/SRB2_common.props b/SRB2_common.props
index 6a0d53484f..55cf6cf528 100644
--- a/SRB2_common.props
+++ b/SRB2_common.props
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros" />
@@ -28,11 +28,6 @@
     <Link>
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
-    <CustomBuild>
-      <Command>nasm -g -o $(IntDir)%(Filename).obj -f win32 "%(FullPath)"</Command>
-      <Message>Compiling %(Filename).nas with NASM...</Message>
-      <Outputs>$(IntDir)%(Filename).obj;%(Outputs)</Outputs>
-    </CustomBuild>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(PlatformTarget)'!='x86'">
     <CustomBuild>
@@ -40,4 +35,4 @@
     </CustomBuild>
   </ItemDefinitionGroup>
   <ItemGroup />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/debian-template/README.source b/debian-template/README.source
index f63a42cac6..acd47d2f1b 100644
--- a/debian-template/README.source
+++ b/debian-template/README.source
@@ -9,7 +9,6 @@ GNU/Linux
 Dependencies:
   SDL 1.2.7 or better (from libsdl.org)
   SDL_Mixer 1.2.2(.7 for file-less music playback) (from libsdl.org)
-  Nasm (use NOASM=1 if you don't have it or have an non-i386 system, I think)
   libPNG 1.2.7
   Zlib 1.2.3
   The Xiph.org libogg and libvorbis libraries
diff --git a/debian-template/control b/debian-template/control
index 88334f132e..8729a6ac07 100644
--- a/debian-template/control
+++ b/debian-template/control
@@ -13,8 +13,7 @@ Build-Depends: debhelper (>= 7.0.50~),
  libopenmpt-dev,
  libcurl4-openssl-dev,
  libglu1-dev | libglu-dev,
- libosmesa6-dev | libgl-dev,
- nasm [i386]
+ libosmesa6-dev | libgl-dev
 Standards-Version: 3.8.4
 Homepage: ${PACKAGE_WEBSITE}