diff --git a/programs/build_all.bat b/programs/build_all.bat index dce123a64..bdf251336 100644 --- a/programs/build_all.bat +++ b/programs/build_all.bat @@ -170,7 +170,7 @@ fasm media\iconedit\trunk\iconedit.asm %BIN%\iconedit fasm media\jpegview\trunk\jpegview.asm %BIN%\jpegview fasm media\midamp\trunk\midamp.asm %BIN%\midamp fasm media\midiplay\trunk\midiplay.asm %BIN%\midiplay -fasm media\mixer\trunk\mixer.asm %BIN%\mixer +rem fasm media\mixer\trunk\mixer.asm %BIN%\mixer fasm media\mv\trunk\mv.asm %BIN%\mv fasm media\pic4\trunk\pic4.asm %BIN%\pic4 @@ -382,7 +382,7 @@ kpack %BIN%\iconedit kpack %BIN%\jpegview kpack %BIN%\midamp kpack %BIN%\midiplay -kpack %BIN%\mixer +rem kpack %BIN%\mixer kpack %BIN%\mp3s kpack %BIN%\mv kpack %BIN%\pic4 diff --git a/programs/other/outdated/mixer/trunk/Tupfile.lua b/programs/other/outdated/mixer/Tupfile.lua similarity index 79% rename from programs/other/outdated/mixer/trunk/Tupfile.lua rename to programs/other/outdated/mixer/Tupfile.lua index c17e78e3d..e2b9d777b 100644 --- a/programs/other/outdated/mixer/trunk/Tupfile.lua +++ b/programs/other/outdated/mixer/Tupfile.lua @@ -1,5 +1,5 @@ if tup.getconfig("NO_FASM") ~= "" then return end -HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../.." or tup.getconfig("HELPERDIR") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") tup.include(HELPERDIR .. "/use_fasm.lua") add_include(tup.getvariantdir()) diff --git a/programs/other/outdated/mixer/trunk/build_en.bat b/programs/other/outdated/mixer/build_en.bat similarity index 100% rename from programs/other/outdated/mixer/trunk/build_en.bat rename to programs/other/outdated/mixer/build_en.bat diff --git a/programs/other/outdated/mixer/trunk/build_ru.bat b/programs/other/outdated/mixer/build_ru.bat similarity index 100% rename from programs/other/outdated/mixer/trunk/build_ru.bat rename to programs/other/outdated/mixer/build_ru.bat diff --git a/programs/other/outdated/mixer/trunk/mixer.asm b/programs/other/outdated/mixer/mixer.asm similarity index 98% rename from programs/other/outdated/mixer/trunk/mixer.asm rename to programs/other/outdated/mixer/mixer.asm index ef85f049d..9e604ccdf 100644 --- a/programs/other/outdated/mixer/trunk/mixer.asm +++ b/programs/other/outdated/mixer/mixer.asm @@ -1,3 +1,4 @@ +; SPDX-License-Identifier: NOASSERTION ; ; MIXER @@ -6,7 +7,7 @@ ; include 'lang.inc' -include '..\..\..\..\macros.inc' +include '..\..\..\macros.inc' use32