From 4ca88acc2557afd27512af0ea797f30f8054c686 Mon Sep 17 00:00:00 2001 From: maxcodehack Date: Wed, 6 Jan 2021 13:31:58 +0000 Subject: [PATCH] - SDL Demo - fix Tupfile.lua - Move sysxtree and mfar to outdated git-svn-id: svn://kolibrios.org@8524 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/demos/SDL/Tupfile.lua | 5 +---- .../{fs => other/outdated}/mfar/trunk/build_en.bat | 0 .../{fs => other/outdated}/mfar/trunk/build_ru.bat | 0 .../{fs => other/outdated}/mfar/trunk/macros.inc | 0 .../{fs => other/outdated}/mfar/trunk/menuet.inc | 0 .../{fs => other/outdated}/mfar/trunk/mf-copy.inc | 0 .../{fs => other/outdated}/mfar/trunk/mf-lang.inc | 0 .../{fs => other/outdated}/mfar/trunk/mf-sort.inc | 0 programs/{fs => other/outdated}/mfar/trunk/mfar.asm | 0 programs/{fs => other/outdated}/mfar/trunk/mfar.inc | 0 .../{fs => other/outdated}/mfar/trunk/readme.txt | 0 .../outdated}/sysxtree/trunk/Tupfile.lua | 0 .../{fs => other/outdated}/sysxtree/trunk/ascgl.inc | 0 .../outdated}/sysxtree/trunk/ascgml.inc | 0 .../{fs => other/outdated}/sysxtree/trunk/ascl.inc | 0 .../{fs => other/outdated}/sysxtree/trunk/ascml.inc | 0 .../outdated}/sysxtree/trunk/build_en.bat | 0 .../outdated}/sysxtree/trunk/build_ru.bat | 0 .../outdated}/sysxtree/trunk/gif_lite.inc | 0 .../outdated}/sysxtree/trunk/systr12.GIF | Bin .../outdated}/sysxtree/trunk/sysxtree.asm | 0 .../{fs => other/outdated}/sysxtree/trunk/xtree.bmp | Bin .../{fs => other/outdated}/sysxtree/trunk/xtree.ico | Bin .../outdated}/sysxtree/trunk/xtreeinf.txt | 0 .../outdated}/sysxtree/trunk/xtreinfo.txt | 0 25 files changed, 1 insertion(+), 4 deletions(-) rename programs/{fs => other/outdated}/mfar/trunk/build_en.bat (100%) rename programs/{fs => other/outdated}/mfar/trunk/build_ru.bat (100%) rename programs/{fs => other/outdated}/mfar/trunk/macros.inc (100%) rename programs/{fs => other/outdated}/mfar/trunk/menuet.inc (100%) rename programs/{fs => other/outdated}/mfar/trunk/mf-copy.inc (100%) rename programs/{fs => other/outdated}/mfar/trunk/mf-lang.inc (100%) rename programs/{fs => other/outdated}/mfar/trunk/mf-sort.inc (100%) rename programs/{fs => other/outdated}/mfar/trunk/mfar.asm (100%) rename programs/{fs => other/outdated}/mfar/trunk/mfar.inc (100%) rename programs/{fs => other/outdated}/mfar/trunk/readme.txt (100%) rename programs/{fs => other/outdated}/sysxtree/trunk/Tupfile.lua (100%) rename programs/{fs => other/outdated}/sysxtree/trunk/ascgl.inc (100%) rename programs/{fs => other/outdated}/sysxtree/trunk/ascgml.inc (100%) rename programs/{fs => other/outdated}/sysxtree/trunk/ascl.inc (100%) rename programs/{fs => other/outdated}/sysxtree/trunk/ascml.inc (100%) rename programs/{fs => other/outdated}/sysxtree/trunk/build_en.bat (100%) rename programs/{fs => other/outdated}/sysxtree/trunk/build_ru.bat (100%) rename programs/{fs => other/outdated}/sysxtree/trunk/gif_lite.inc (100%) rename programs/{fs => other/outdated}/sysxtree/trunk/systr12.GIF (100%) rename programs/{fs => other/outdated}/sysxtree/trunk/sysxtree.asm (100%) rename programs/{fs => other/outdated}/sysxtree/trunk/xtree.bmp (100%) rename programs/{fs => other/outdated}/sysxtree/trunk/xtree.ico (100%) rename programs/{fs => other/outdated}/sysxtree/trunk/xtreeinf.txt (100%) rename programs/{fs => other/outdated}/sysxtree/trunk/xtreinfo.txt (100%) diff --git a/programs/demos/SDL/Tupfile.lua b/programs/demos/SDL/Tupfile.lua index eccf1a0200..691e47c518 100755 --- a/programs/demos/SDL/Tupfile.lua +++ b/programs/demos/SDL/Tupfile.lua @@ -2,12 +2,9 @@ if tup.getconfig("NO_GCC") ~= "" then return end HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") tup.include(HELPERDIR .. "/use_gcc.lua") tup.include(HELPERDIR .. "/use_newlib.lua") -tup.include(HELPERDIR .. "/use_sound.lua") +tup.include(HELPERDIR .. "/use_sdl_newlib.lua") CFLAGS = CFLAGS .. " -std=c99" -INCLUDES = INCLUDES .. " -I../../../contrib/sdk/sources/SDL-1.2.2_newlib/include" -table.insert(LIBDEPS, "../../../contrib/sdk/lib/") -LIBS = "-lSDLn " .. LIBS -- Subsystem native LDFLAGS = LDFLAGS .. " --subsystem native" diff --git a/programs/fs/mfar/trunk/build_en.bat b/programs/other/outdated/mfar/trunk/build_en.bat similarity index 100% rename from programs/fs/mfar/trunk/build_en.bat rename to programs/other/outdated/mfar/trunk/build_en.bat diff --git a/programs/fs/mfar/trunk/build_ru.bat b/programs/other/outdated/mfar/trunk/build_ru.bat similarity index 100% rename from programs/fs/mfar/trunk/build_ru.bat rename to programs/other/outdated/mfar/trunk/build_ru.bat diff --git a/programs/fs/mfar/trunk/macros.inc b/programs/other/outdated/mfar/trunk/macros.inc similarity index 100% rename from programs/fs/mfar/trunk/macros.inc rename to programs/other/outdated/mfar/trunk/macros.inc diff --git a/programs/fs/mfar/trunk/menuet.inc b/programs/other/outdated/mfar/trunk/menuet.inc similarity index 100% rename from programs/fs/mfar/trunk/menuet.inc rename to programs/other/outdated/mfar/trunk/menuet.inc diff --git a/programs/fs/mfar/trunk/mf-copy.inc b/programs/other/outdated/mfar/trunk/mf-copy.inc similarity index 100% rename from programs/fs/mfar/trunk/mf-copy.inc rename to programs/other/outdated/mfar/trunk/mf-copy.inc diff --git a/programs/fs/mfar/trunk/mf-lang.inc b/programs/other/outdated/mfar/trunk/mf-lang.inc similarity index 100% rename from programs/fs/mfar/trunk/mf-lang.inc rename to programs/other/outdated/mfar/trunk/mf-lang.inc diff --git a/programs/fs/mfar/trunk/mf-sort.inc b/programs/other/outdated/mfar/trunk/mf-sort.inc similarity index 100% rename from programs/fs/mfar/trunk/mf-sort.inc rename to programs/other/outdated/mfar/trunk/mf-sort.inc diff --git a/programs/fs/mfar/trunk/mfar.asm b/programs/other/outdated/mfar/trunk/mfar.asm similarity index 100% rename from programs/fs/mfar/trunk/mfar.asm rename to programs/other/outdated/mfar/trunk/mfar.asm diff --git a/programs/fs/mfar/trunk/mfar.inc b/programs/other/outdated/mfar/trunk/mfar.inc similarity index 100% rename from programs/fs/mfar/trunk/mfar.inc rename to programs/other/outdated/mfar/trunk/mfar.inc diff --git a/programs/fs/mfar/trunk/readme.txt b/programs/other/outdated/mfar/trunk/readme.txt similarity index 100% rename from programs/fs/mfar/trunk/readme.txt rename to programs/other/outdated/mfar/trunk/readme.txt diff --git a/programs/fs/sysxtree/trunk/Tupfile.lua b/programs/other/outdated/sysxtree/trunk/Tupfile.lua similarity index 100% rename from programs/fs/sysxtree/trunk/Tupfile.lua rename to programs/other/outdated/sysxtree/trunk/Tupfile.lua diff --git a/programs/fs/sysxtree/trunk/ascgl.inc b/programs/other/outdated/sysxtree/trunk/ascgl.inc similarity index 100% rename from programs/fs/sysxtree/trunk/ascgl.inc rename to programs/other/outdated/sysxtree/trunk/ascgl.inc diff --git a/programs/fs/sysxtree/trunk/ascgml.inc b/programs/other/outdated/sysxtree/trunk/ascgml.inc similarity index 100% rename from programs/fs/sysxtree/trunk/ascgml.inc rename to programs/other/outdated/sysxtree/trunk/ascgml.inc diff --git a/programs/fs/sysxtree/trunk/ascl.inc b/programs/other/outdated/sysxtree/trunk/ascl.inc similarity index 100% rename from programs/fs/sysxtree/trunk/ascl.inc rename to programs/other/outdated/sysxtree/trunk/ascl.inc diff --git a/programs/fs/sysxtree/trunk/ascml.inc b/programs/other/outdated/sysxtree/trunk/ascml.inc similarity index 100% rename from programs/fs/sysxtree/trunk/ascml.inc rename to programs/other/outdated/sysxtree/trunk/ascml.inc diff --git a/programs/fs/sysxtree/trunk/build_en.bat b/programs/other/outdated/sysxtree/trunk/build_en.bat similarity index 100% rename from programs/fs/sysxtree/trunk/build_en.bat rename to programs/other/outdated/sysxtree/trunk/build_en.bat diff --git a/programs/fs/sysxtree/trunk/build_ru.bat b/programs/other/outdated/sysxtree/trunk/build_ru.bat similarity index 100% rename from programs/fs/sysxtree/trunk/build_ru.bat rename to programs/other/outdated/sysxtree/trunk/build_ru.bat diff --git a/programs/fs/sysxtree/trunk/gif_lite.inc b/programs/other/outdated/sysxtree/trunk/gif_lite.inc similarity index 100% rename from programs/fs/sysxtree/trunk/gif_lite.inc rename to programs/other/outdated/sysxtree/trunk/gif_lite.inc diff --git a/programs/fs/sysxtree/trunk/systr12.GIF b/programs/other/outdated/sysxtree/trunk/systr12.GIF similarity index 100% rename from programs/fs/sysxtree/trunk/systr12.GIF rename to programs/other/outdated/sysxtree/trunk/systr12.GIF diff --git a/programs/fs/sysxtree/trunk/sysxtree.asm b/programs/other/outdated/sysxtree/trunk/sysxtree.asm similarity index 100% rename from programs/fs/sysxtree/trunk/sysxtree.asm rename to programs/other/outdated/sysxtree/trunk/sysxtree.asm diff --git a/programs/fs/sysxtree/trunk/xtree.bmp b/programs/other/outdated/sysxtree/trunk/xtree.bmp similarity index 100% rename from programs/fs/sysxtree/trunk/xtree.bmp rename to programs/other/outdated/sysxtree/trunk/xtree.bmp diff --git a/programs/fs/sysxtree/trunk/xtree.ico b/programs/other/outdated/sysxtree/trunk/xtree.ico similarity index 100% rename from programs/fs/sysxtree/trunk/xtree.ico rename to programs/other/outdated/sysxtree/trunk/xtree.ico diff --git a/programs/fs/sysxtree/trunk/xtreeinf.txt b/programs/other/outdated/sysxtree/trunk/xtreeinf.txt similarity index 100% rename from programs/fs/sysxtree/trunk/xtreeinf.txt rename to programs/other/outdated/sysxtree/trunk/xtreeinf.txt diff --git a/programs/fs/sysxtree/trunk/xtreinfo.txt b/programs/other/outdated/sysxtree/trunk/xtreinfo.txt similarity index 100% rename from programs/fs/sysxtree/trunk/xtreinfo.txt rename to programs/other/outdated/sysxtree/trunk/xtreinfo.txt