diff --git a/scripts/genie.lua b/scripts/genie.lua index 0673238a681..2d5ef09ad80 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -267,10 +267,35 @@ configuration { "Debug", "vs*" } configuration {} ---postcompiletasks { --- "gawk -f ../../../../../scripts/depfilter.awk $(@:%.o=%.d) > $(@:%.o=%.dep)", --- "mv $(@:%.o=%.dep) $(@:%.o=%.d)", ---} +local AWK = "" +if (os.is("windows")) then + AWK_TEST = backtick("awk --version 2> NUL") + if (AWK_TEST~='') then + AWK = "awk" + else + AWK_TEST = backtick("gawk --version 2> NUL") + if (AWK_TEST~='') then + AWK = "gawk" + end + end +else + AWK_TEST = backtick("awk --version 2> /dev/null") + if (AWK_TEST~='') then + AWK = "awk" + else + AWK_TEST = backtick("gawk --version 2> /dev/null") + if (AWK_TEST~='') then + AWK = "gawk" + end + end +end + +if (AWK~='') then + postcompiletasks { + AWK .. " -f ../../../../../scripts/depfilter.awk $(@:%.o=%.d) > $(@:%.o=%.dep)", + "mv $(@:%.o=%.dep) $(@:%.o=%.d)", + } +end msgcompile ("Compiling $(subst ../,,$<)...") diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua index 6c427d54bf2..a0e0026bf4d 100644 --- a/scripts/src/osd/modules.lua +++ b/scripts/src/osd/modules.lua @@ -103,7 +103,6 @@ function osdmodulesbuild() local MOC = "" if (os.is("windows")) then - print("windows") MOC = "moc" else MOCTST = backtick("which moc-qt4 2>/dev/null")