From 66cbe9eee4aa97351cfd8269eec2b2ebd5762051 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Fri, 3 Apr 2015 15:30:56 +0200 Subject: [PATCH] removed os_version, since it is not used anymore (nw) --- makefile | 5 ++--- scripts/genie.lua | 8 -------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/makefile b/makefile index 0ded6f9519e..db0f8ff214b 100644 --- a/makefile +++ b/makefile @@ -102,7 +102,6 @@ endif ifeq ($(firstword $(filter Darwin,$(UNAME))),Darwin) OS := macosx GENIEOS := darwin -DARWIN_VERSION := $(shell sw_vers -productVersion) endif ifeq ($(firstword $(filter Haiku,$(UNAME))),Haiku) OS := haiku @@ -741,7 +740,7 @@ linux_x86_clang: generate $(PROJECTDIR)/gmake-linux-clang/Makefile #------------------------------------------------- $(PROJECTDIR)/gmake-osx/Makefile: makefile $(SCRIPTS) $(GENIE) - $(SILENT) $(GENIE) $(PARAMS) --gcc=osx --os_version=$(DARWIN_VERSION) --gcc_version=$(GCC_VERSION) gmake + $(SILENT) $(GENIE) $(PARAMS) --gcc=osx --gcc_version=$(GCC_VERSION) gmake .PHONY: macosx_x64 macosx_x64: generate $(PROJECTDIR)/gmake-osx/Makefile @@ -759,7 +758,7 @@ macosx_x86: generate $(PROJECTDIR)/gmake-osx/Makefile #------------------------------------------------- $(PROJECTDIR)/gmake-osx-clang/Makefile: makefile $(SCRIPTS) $(GENIE) - $(SILENT) $(GENIE) $(PARAMS) --gcc=osx-clang --os_version=$(DARWIN_VERSION) --gcc_version=$(CLANG_VERSION) gmake + $(SILENT) $(GENIE) $(PARAMS) --gcc=osx-clang --gcc_version=$(CLANG_VERSION) gmake .PHONY: macosx_x64_clang macosx_x64_clang: generate $(PROJECTDIR)/gmake-osx-clang/Makefile diff --git a/scripts/genie.lua b/scripts/genie.lua index 335062eee86..a54f0d4d2a7 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -101,12 +101,6 @@ newoption { description = "GCC compiler version", } -newoption { - trigger = "os_version", - description = "OS version", - value = "", -} - newoption { trigger = "CC", description = "CC replacement", @@ -199,8 +193,6 @@ newoption { } } -local os_version = str_to_version(_OPTIONS["os_version"]) - if not _OPTIONS["BIGENDIAN"] then _OPTIONS["BIGENDIAN"] = "0" end