From 762358225bfe054deb871cbd5faa190fff902fac Mon Sep 17 00:00:00 2001 From: maxcodehack Date: Sat, 9 Jan 2021 17:27:55 +0000 Subject: [PATCH] C--: clean tupfile.lua git-svn-id: svn://kolibrios.org@8531 a494cfbc-eb01-0410-851d-a64ba20cac60 --- ...efile_pyakov_ununtu32 => Makefile_pyakov_ubuntu32} | 0 programs/develop/cmm/Tupfile.lua | 11 +++-------- 2 files changed, 3 insertions(+), 8 deletions(-) rename programs/develop/cmm/{Makefile_pyakov_ununtu32 => Makefile_pyakov_ubuntu32} (100%) mode change 100644 => 100755 diff --git a/programs/develop/cmm/Makefile_pyakov_ununtu32 b/programs/develop/cmm/Makefile_pyakov_ubuntu32 old mode 100644 new mode 100755 similarity index 100% rename from programs/develop/cmm/Makefile_pyakov_ununtu32 rename to programs/develop/cmm/Makefile_pyakov_ubuntu32 diff --git a/programs/develop/cmm/Tupfile.lua b/programs/develop/cmm/Tupfile.lua index d4dbcd7df1..e69fc2bb4e 100644 --- a/programs/develop/cmm/Tupfile.lua +++ b/programs/develop/cmm/Tupfile.lua @@ -1,15 +1,10 @@ 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") -SDK_DIR = "../../../contrib/sdk" -LDFLAGS = LDFLAGS .. " -static -S -nostdlib -T" .. SDK_DIR .. "/sources/newlib/app-dynamic.lds --image-base 0 -L" .. SDK_DIR .. "/lib --stack 0x100000 " -LIBS = LIBS .. " -lgcc -ldll -lc.dll " -CFLAGS_cpp = CFLAGS_cpp .. " -Dstricmp=strcasecmp -Dstrnicmp=strncasecmp -fno-exceptions -D_KOS_ -U_Win32 -U_WIN32 -U__MINGW32__ -mno-ms-bitfields -Wno-write-strings " -INCLUDES = INCLUDES .. " -I" .. SDK_DIR .. "/sources/newlib/libc/include " - -tup.append_table(LIBDEPS, {SDK_DIR .. "/lib/"}) -tup.append_table(LIBDEPS, {SDK_DIR .. "/lib/"}) +LDFLAGS = LDFLAGS .. " --stack 0x100000" +CFLAGS = CFLAGS .. " -Dstricmp=strcasecmp -Dstrnicmp=strncasecmp -D_KOS_ -U_Win32 -U_WIN32 -U__MINGW32__" compile_gcc("*.cpp") link_gcc("cmm")