OvmfPkg: QemuVideoDxe: filter BOCHS modes vs. available frame buffer size

[mirror_edk2.git] / ArmPlatformPkg / Scripts / Makefile

diff --git a/ArmPlatformPkg/Scripts/Makefile b/ArmPlatformPkg/Scripts/Makefile
index 31bed296463ceb9f2cc4d45df627b59dd3ed19f9..f933755b5193a071251280f9828a98ef1e3ff0fe 100644 (file)
--- a/ArmPlatformPkg/Scripts/Makefile
+++ b/ArmPlatformPkg/Scripts/Makefile
@@ -1,5 +1,5 @@
 #/* @file\r
-#  Copyright (c) 2011-2012, ARM Limited. All rights reserved.\r
+#  Copyright (c) 2011-2014, ARM Limited. All rights reserved.\r
 #  \r
 #  This program and the accompanying materials                          \r
 #  are licensed and made available under the terms and conditions of the BSD License         \r
@@ -25,8 +25,8 @@ ifeq ($(EDK2_DSC),"")
 endif\r
 \r
 ifeq ("$(OS)","Windows_NT")\r
-WORKSPACE?=$(PWD)\r
-EDK_TOOLS_PATH ?= $(WORKSPACE)\BaseTools\r
+export WORKSPACE?=$(PWD)\r
+export EDK_TOOLS_PATH ?= $(WORKSPACE)\BaseTools\r
 endif\r
 \r
 SHELL := /bin/bash\r
@@ -41,10 +41,9 @@ EDK2_CONF = Conf/BuildEnv.sh Conf/build_rule.txt Conf/target.txt Conf/tools_def.
 \r
 all: $(EDK2_CONF)\r
 ifeq ("$(OS)","Windows_NT")\r
-       echo %PATH%\r
-       build -a $(EDK2_ARCH) -p $(EDK2_PKG) -t $(EDK2_TOOLCHAIN) -b $(EDK2_BUILD) $(EDK2_MACROS)\r
+       build -a $(EDK2_ARCH) -p $(EDK2_DSC) -t $(EDK2_TOOLCHAIN) -b $(EDK2_BUILD) $(EDK2_MACROS)\r
 else\r
-       . ./edksetup.sh `pwd`/BaseTools; build -a $(EDK2_ARCH) -p $(EDK2_DSC) -t $(EDK2_TOOLCHAIN) -b $(EDK2_BUILD) $(EDK2_MACROS)\r
+       . ./edksetup.sh; build -a $(EDK2_ARCH) -p $(EDK2_DSC) -t $(EDK2_TOOLCHAIN) -b $(EDK2_BUILD) $(EDK2_MACROS)\r
 endif\r
 \r
 $(EDK2_CONF):\r
@@ -54,13 +53,13 @@ ifeq ("$(OS)","Windows_NT")
        copy $(EDK_TOOLS_PATH)\Conf\target.template Conf\target.txt\r
        copy $(EDK_TOOLS_PATH)\Conf\tools_def.template Conf\tools_def.txt\r
 else\r
-       . ./edksetup.sh `pwd`/BaseTools; $(MAKE) -C BaseTools\r
+       . ./edksetup.sh; $(MAKE) -C BaseTools\r
 endif\r
 \r
 clean:\r
 ifeq ("$(OS)","Windows_NT")\r
-       build -a $(EDK2_ARCH) -p $(EDK2_PKG) -t $(EDK2_TOOLCHAIN) -b $(EDK2_BUILD) $(EDK2_MACROS) cleanall\r
+       build -a $(EDK2_ARCH) -p $(EDK2_DSC) -t $(EDK2_TOOLCHAIN) -b $(EDK2_BUILD) $(EDK2_MACROS) cleanall\r
 else\r
-       . ./edksetup.sh `pwd`/BaseTools; build -a $(EDK2_ARCH) -p $(EDK2_DSC) -t $(EDK2_TOOLCHAIN) -b $(EDK2_BUILD) $(EDK2_MACROS) cleanall; \\r
+       . ./edksetup.sh; build -a $(EDK2_ARCH) -p $(EDK2_DSC) -t $(EDK2_TOOLCHAIN) -b $(EDK2_BUILD) $(EDK2_MACROS) cleanall; \\r
        rm -Rf $(EDK2_CONF) Conf/.cache\r
 endif\r